diff options
| author | Matt Kraai <kraai@debian.org> | 2000-12-22 01:48:07 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-12-22 01:48:07 +0000 |
| commit | a9819b290848e0a760f3805d5937fa050235d707 (patch) | |
| tree | b8cb8d939032c0806d62161b01e5836cb808dc3f /coreutils | |
| parent | e9f07fb6e83b75a50760599a5d31f494841eddf7 (diff) | |
| download | busybox-a9819b290848e0a760f3805d5937fa050235d707.tar.gz | |
Use busybox error handling functions wherever possible.
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/mkfifo.c | 6 | ||||
| -rw-r--r-- | coreutils/mknod.c | 2 | ||||
| -rw-r--r-- | coreutils/sleep.c | 6 | ||||
| -rw-r--r-- | coreutils/uname.c | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c index ef4a5256f..728e1ec2f 100644 --- a/coreutils/mkfifo.c +++ b/coreutils/mkfifo.c @@ -53,9 +53,7 @@ extern int mkfifo_main(int argc, char **argv) } if (argc < 1 || *argv[0] == '-') usage(mkfifo_usage); - if (mkfifo(*argv, mode) < 0) { - perror("mkfifo"); - return EXIT_FAILURE; - } + if (mkfifo(*argv, mode) < 0) + perror_msg_and_die("mkfifo"); return EXIT_SUCCESS; } diff --git a/coreutils/mknod.c b/coreutils/mknod.c index 022ab8571..4d8c598ea 100644 --- a/coreutils/mknod.c +++ b/coreutils/mknod.c @@ -84,7 +84,7 @@ int mknod_main(int argc, char **argv) mode |= perm; if (mknod(argv[0], mode, dev) != 0) - error_msg_and_die("%s: %s\n", argv[0], strerror(errno)); + perror_msg_and_die("%s", argv[0]); return EXIT_SUCCESS; } diff --git a/coreutils/sleep.c b/coreutils/sleep.c index ad92b106d..10eca593e 100644 --- a/coreutils/sleep.c +++ b/coreutils/sleep.c @@ -30,9 +30,7 @@ extern int sleep_main(int argc, char **argv) usage(sleep_usage); } - if (sleep(atoi(*(++argv))) != 0) { - perror("sleep"); - return EXIT_FAILURE; - } + if (sleep(atoi(*(++argv))) != 0) + perror_msg_and_die("sleep"); return EXIT_SUCCESS; } diff --git a/coreutils/uname.c b/coreutils/uname.c index 2781b80b3..e7e9ff331 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -114,11 +114,11 @@ int uname_main(int argc, char **argv) toprint = PRINT_SYSNAME; if (uname(&name) == -1) - perror("cannot get system name"); + perror_msg("cannot get system name"); #if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE) if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1) - perror("cannot get processor type"); + perror_msg("cannot get processor type"); } #else |