Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-14 12:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Hide some ifdefs to make it more readible

Browse Source
This commit is contained in:
Eric Andersen 2001-11-17 07:27:14 +00:00
parent 9c6b5fcb0a
commit fedce06b7f
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
init/init.c
View File

@ -127,6 +127,12 @@ static const int RB_AUTOBOOT = 0x01234567;
//static const int MAXENV = 16; /* Number of env. vars */ //static const int MAXENV = 16; /* Number of env. vars */
static const int LOG = 0x1; static const int LOG = 0x1;
static const int CONSOLE = 0x2; static const int CONSOLE = 0x2;
#if defined BB_FEATURE_EXTRA_QUIET
static const int MAYBE_CONSOLE = 0x0;
#else
#define MAYBE_CONSOLE CONSOLE
#endif
/* Allowed init action types */ /* Allowed init action types */
typedef enum { typedef enum {
@ -186,6 +192,11 @@ static void loop_forever(void)
/* Print a message to the specified device. /* Print a message to the specified device.
* Device may be bitwise-or'd from LOG | CONSOLE */ * Device may be bitwise-or'd from LOG | CONSOLE */
#ifdef DEBUG_INIT
static inline messageND(int device, char *fmt, ...) { }
#else
#define messageND message
#endif
static void message(int device, char *fmt, ...) static void message(int device, char *fmt, ...)
__attribute__ ((format (printf, 2, 3))); __attribute__ ((format (printf, 2, 3)));
static void message(int device, char *fmt, ...) static void message(int device, char *fmt, ...)
@ -539,19 +550,15 @@ static pid_t run(char *command, char *terminal, int get_enter)
* be allowed to start a shell or whatever an init script * be allowed to start a shell or whatever an init script
* specifies. * specifies.
*/ */
#ifdef DEBUG_INIT messageND(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\n",
message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\n",
cmd[0], getpid(), terminal); cmd[0], getpid(), terminal);
#endif
write(fileno(stdout), press_enter, sizeof(press_enter) - 1); write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
getc(stdin); getc(stdin);
} }
#ifdef DEBUG_INIT
/* Log the process name and args */ /* Log the process name and args */
message(LOG, "Starting pid %d, console %s: '%s'\n", messageND(LOG, "Starting pid %d, console %s: '%s'\n",
getpid(), terminal, command); getpid(), terminal, command);
#endif
#if defined CONFIG_FEATURE_INIT_COREDUMPS #if defined CONFIG_FEATURE_INIT_COREDUMPS
if (stat (CORE_ENABLE_FLAG_FILE, &sb) == 0) { if (stat (CORE_ENABLE_FLAG_FILE, &sb) == 0) {
@ -937,22 +944,7 @@ extern int init_main(int argc, char **argv)
putenv("PATH="_PATH_STDPATH); putenv("PATH="_PATH_STDPATH);
/* Hello world */ /* Hello world */
#ifndef DEBUG_INIT message(MAYBE_CONSOLE|LOG, "init started: %s\n", full_version);
message(
#if ! defined CONFIG_FEATURE_EXTRA_QUIET
CONSOLE|
#endif
LOG,
"init started: %s\n", full_version);
#else
message(
#if ! defined CONFIG_FEATURE_EXTRA_QUIET
CONSOLE|
#endif
LOG,
"init(%d) started: %s\n", getpid(), full_version);
#endif
/* Make sure there is enough memory to do something useful. */ /* Make sure there is enough memory to do something useful. */
check_memory(); check_memory();
@ -1032,8 +1024,7 @@ extern int init_main(int argc, char **argv)
for (a = initActionList; a; a = a->nextPtr) { for (a = initActionList; a; a = a->nextPtr) {
if (a->pid == wpid) { if (a->pid == wpid) {
a->pid = 0; a->pid = 0;
message(LOG, message(LOG, "Process '%s' (pid %d) exited. Scheduling it for restart.\n",
"Process '%s' (pid %d) exited. Scheduling it for restart.\n",
a->process, wpid); a->process, wpid);
} }
} }