diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 12:13:01 +0300 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 12:13:01 +0300 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /init | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) |
Major coreutils update.
Diffstat (limited to 'init')
-rw-r--r-- | init/halt.c | 2 | ||||
-rw-r--r-- | init/init.c | 26 | ||||
-rw-r--r-- | init/mesg.c | 4 | ||||
-rw-r--r-- | init/poweroff.c | 2 | ||||
-rw-r--r-- | init/reboot.c | 4 | ||||
-rw-r--r-- | init/start_stop_daemon.c | 22 |
6 files changed, 30 insertions, 30 deletions
diff --git a/init/halt.c b/init/halt.c index 3d4725f09..7e663227c 100644 --- a/init/halt.c +++ b/init/halt.c @@ -32,7 +32,7 @@ extern int halt_main(int argc, char **argv) if (!pid || *pid<=0) { pid = find_pid_by_name("linuxrc"); if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + bb_error_msg_and_die("no process killed"); } return(kill(*pid, SIGUSR1)); #else diff --git a/init/init.c b/init/init.c index 258a7fa6b..be91d6a8f 100644 --- a/init/init.c +++ b/init/init.c @@ -247,14 +247,14 @@ static void message(int device, const char *fmt, ...) if (log_fd < 0) { if ((log_fd = device_open(log, O_RDWR | O_NDELAY | O_NOCTTY)) < 0) { log_fd = -2; - error_msg("Bummer, can't write to log on %s!", log); + bb_error_msg("Bummer, can't write to log on %s!", log); device = CONSOLE; } else { fcntl(log_fd, F_SETFD, FD_CLOEXEC); } } if ((device & LOG) && (log_fd >= 0)) { - full_write(log_fd, msg, l); + bb_full_write(log_fd, msg, l); } #endif @@ -263,12 +263,12 @@ static void message(int device, const char *fmt, ...) O_WRONLY | O_NOCTTY | O_NDELAY); /* Always send console messages to /dev/console so people will see them. */ if (fd >= 0) { - full_write(fd, msg, l); + bb_full_write(fd, msg, l); close(fd); #ifdef DEBUG_INIT /* all descriptors may be closed */ } else { - error_msg("Bummer, can't print: "); + bb_error_msg("Bummer, can't print: "); va_start(arguments, fmt); vfprintf(stderr, fmt, arguments); va_end(arguments); @@ -323,7 +323,7 @@ static int check_free_memory(void) unsigned int result, u, s = 10; if (sysinfo(&info) != 0) { - perror_msg("Error checking free memory"); + bb_perror_msg("Error checking free memory"); return -1; } @@ -564,11 +564,11 @@ static pid_t run(const struct init_action *a) ++cmdpath; /* find the last component in the command pathname */ - s = get_last_path_component(cmdpath); + s = bb_get_last_path_component(cmdpath); /* make a new argv[0] */ if ((cmd[0] = malloc(strlen(s) + 2)) == NULL) { - message(LOG | CONSOLE, memory_exhausted); + message(LOG | CONSOLE, bb_msg_memory_exhausted); cmd[0] = cmdpath; } else { cmd[0][0] = '-'; @@ -589,7 +589,7 @@ static pid_t run(const struct init_action *a) messageD(LOG, "Waiting for enter to start '%s'" "(pid %d, terminal %s)\n", cmdpath, getpid(), a->terminal); - full_write(1, press_enter, sizeof(press_enter) - 1); + bb_full_write(1, press_enter, sizeof(press_enter) - 1); while(read(0, &c, 1) == 1 && c != '\n') ; } @@ -1017,7 +1017,7 @@ extern int init_main(int argc, char **argv) if (!pid || *pid <= 0) { pid = find_pid_by_name("linuxrc"); if (!pid || *pid <= 0) - error_msg_and_die("no process killed"); + bb_error_msg_and_die("no process killed"); } return kill(*pid, SIGHUP); } @@ -1025,10 +1025,10 @@ extern int init_main(int argc, char **argv) /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ if (getpid() != 1 #ifdef CONFIG_FEATURE_INITRD - && strstr(applet_name, "linuxrc") == NULL + && strstr(bb_applet_name, "linuxrc") == NULL #endif ) { - show_usage(); + bb_show_usage(); } /* Set up sig handlers -- be sure to * clear all of these in run() */ @@ -1068,10 +1068,10 @@ extern int init_main(int argc, char **argv) const char * const *e; /* Make sure environs is set to something sane */ for(e = environment; *e; e++) - putenv(*e); + putenv((char *) *e); } /* Hello world */ - message(MAYBE_CONSOLE | LOG, "init started: %s", full_version); + message(MAYBE_CONSOLE | LOG, "init started: %s", bb_msg_full_version); /* Make sure there is enough memory to do something useful. */ check_memory(); diff --git a/init/mesg.c b/init/mesg.c index f9b46e029..7b8acf657 100644 --- a/init/mesg.c +++ b/init/mesg.c @@ -52,7 +52,7 @@ extern int mesg_main(int argc, char *argv[]) return EXIT_SUCCESS; } } - perror_msg_and_die("%s", tty); + bb_perror_msg_and_die("%s", tty); } - show_usage(); + bb_show_usage(); } diff --git a/init/poweroff.c b/init/poweroff.c index 27468bac0..aca6e2f25 100644 --- a/init/poweroff.c +++ b/init/poweroff.c @@ -32,7 +32,7 @@ extern int poweroff_main(int argc, char **argv) if (!pid || *pid<=0) { pid = find_pid_by_name("linuxrc"); if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + bb_error_msg_and_die("no process killed"); } return(kill(*pid, SIGUSR2)); #else diff --git a/init/reboot.c b/init/reboot.c index 872d9e741..8c380fa6a 100644 --- a/init/reboot.c +++ b/init/reboot.c @@ -52,7 +52,7 @@ extern int reboot_main(int argc, char **argv) break; default: - show_usage(); + bb_show_usage(); break; } } @@ -99,7 +99,7 @@ extern int reboot_main(int argc, char **argv) if (!pid || *pid<=0) pid = find_pid_by_name("linuxrc"); if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + bb_error_msg_and_die("no process killed"); fflush(stdout); return(kill(*pid, SIGTERM)); } diff --git a/init/start_stop_daemon.c b/init/start_stop_daemon.c index 576526183..a1c2c21c2 100644 --- a/init/start_stop_daemon.c +++ b/init/start_stop_daemon.c @@ -74,7 +74,7 @@ parse_options(int argc, char * const *argv) break; case 's': if (sscanf(optarg, "%d", &signal_nr) != 1) - error_msg_and_die ("-s takes a numeric argument"); + bb_error_msg_and_die ("-s takes a numeric argument"); break; case 'u': userspec = optarg; @@ -86,21 +86,21 @@ parse_options(int argc, char * const *argv) fork_before_exec = 1; break; default: - show_usage(); + bb_show_usage(); } } if (start == stop) - error_msg_and_die ("need one of -S or -K"); + bb_error_msg_and_die ("need one of -S or -K"); if (!execname && !userspec) - error_msg_and_die ("need at least one of -x or -u"); + bb_error_msg_and_die ("need at least one of -x or -u"); if (!startas) startas = execname; if (start && !startas) - error_msg_and_die ("-S needs -x or -a"); + bb_error_msg_and_die ("-S needs -x or -a"); } @@ -185,7 +185,7 @@ do_procfs(void) procdir = opendir("/proc"); if (!procdir) - perror_msg_and_die ("opendir /proc"); + bb_perror_msg_and_die ("opendir /proc"); foundany = 0; while ((entry = readdir(procdir)) != NULL) { @@ -196,7 +196,7 @@ do_procfs(void) } closedir(procdir); if (!foundany) - error_msg_and_die ("nothing in /proc - not mounted?"); + bb_error_msg_and_die ("nothing in /proc - not mounted?"); } @@ -214,7 +214,7 @@ do_stop(void) else if (userspec) sprintf(what, "process(es) owned by `%s'", userspec); else - error_msg_and_die ("internal error, please report"); + bb_error_msg_and_die ("internal error, please report"); if (!found) { printf("no %s found; none killed.\n", what); @@ -225,7 +225,7 @@ do_stop(void) p->pid = -p->pid; killed++; } else { - perror_msg("warning: failed to kill %d:", p->pid); + bb_perror_msg("warning: failed to kill %d:", p->pid); } } if (killed) { @@ -262,10 +262,10 @@ start_stop_daemon_main(int argc, char **argv) *--argv = startas; if (fork_before_exec) { if (daemon(0, 0) == -1) - perror_msg_and_die ("unable to fork"); + bb_perror_msg_and_die ("unable to fork"); } setsid(); execv(startas, argv); - perror_msg_and_die ("unable to start %s", startas); + bb_perror_msg_and_die ("unable to start %s", startas); } |