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 /debianutils | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) |
Major coreutils update.
Diffstat (limited to 'debianutils')
-rw-r--r-- | debianutils/mktemp.c | 2 | ||||
-rw-r--r-- | debianutils/readlink.c | 2 | ||||
-rw-r--r-- | debianutils/run_parts.c | 6 | ||||
-rw-r--r-- | debianutils/start_stop_daemon.c | 22 | ||||
-rw-r--r-- | debianutils/which.c | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index bc47d0af0..9d8de2174 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c @@ -32,7 +32,7 @@ extern int mktemp_main(int argc, char **argv) { if (argc != 2 && (argc != 3 || strcmp(argv[1], "-q"))) - show_usage(); + bb_show_usage(); if(mkstemp(argv[argc-1]) < 0) return EXIT_FAILURE; (void) puts(argv[argc-1]); diff --git a/debianutils/readlink.c b/debianutils/readlink.c index da5259038..d8d7e8c2d 100644 --- a/debianutils/readlink.c +++ b/debianutils/readlink.c @@ -32,7 +32,7 @@ int readlink_main(int argc, char **argv) /* no options, no getopt */ if (argc != 2) - show_usage(); + bb_show_usage(); buf = xreadlink(argv[1]); if (!buf) diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index a6ad81096..a941e1fc8 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c @@ -78,7 +78,7 @@ int run_parts_main(int argc, char **argv) { const unsigned int mask = (unsigned int) strtol(optarg, NULL, 8); if (mask > 07777) { - perror_msg_and_die("bad umask value"); + bb_perror_msg_and_die("bad umask value"); } umask(mask); } @@ -90,13 +90,13 @@ int run_parts_main(int argc, char **argv) args[argcount++] = optarg; break; default: - show_usage(); + bb_show_usage(); } } /* We require exactly one argument: the directory name */ if (optind != (argc - 1)) { - show_usage(); + bb_show_usage(); } args[0] = argv[optind]; diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 576526183..a1c2c21c2 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/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); } diff --git a/debianutils/which.c b/debianutils/which.c index b2af5a8ea..fbcfb371b 100644 --- a/debianutils/which.c +++ b/debianutils/which.c @@ -34,7 +34,7 @@ extern int which_main(int argc, char **argv) int i, count=1, found, status = EXIT_SUCCESS; if (argc <= 1 || **(argv + 1) == '-') - show_usage(); + bb_show_usage(); argc--; path_list = getenv("PATH"); |