diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-02-14 21:23:06 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-02-14 21:23:06 +0000 |
commit | 67991cf824f8df27e74c92d754fb507681c69ce6 (patch) | |
tree | a0b652f3dc794d1050c1a8de3afb014a621238fa /dutmp.c | |
parent | 68be2ab914e1e20fe666bbd22a89a18714be2789 (diff) | |
download | busybox-w32-67991cf824f8df27e74c92d754fb507681c69ce6.tar.gz busybox-w32-67991cf824f8df27e74c92d754fb507681c69ce6.tar.bz2 busybox-w32-67991cf824f8df27e74c92d754fb507681c69ce6.zip |
This patch, put together by Manuel Novoa III, is a merge of work
done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.
Diffstat (limited to 'dutmp.c')
-rw-r--r-- | dutmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -33,7 +33,7 @@ extern int dutmp_main(int argc, char **argv) | |||
33 | if (argc<2) { | 33 | if (argc<2) { |
34 | file = fileno(stdin); | 34 | file = fileno(stdin); |
35 | } else if (*argv[1] == '-' ) { | 35 | } else if (*argv[1] == '-' ) { |
36 | usage(dutmp_usage); | 36 | show_usage(); |
37 | } else { | 37 | } else { |
38 | file = open(argv[1], O_RDONLY); | 38 | file = open(argv[1], O_RDONLY); |
39 | if (file < 0) { | 39 | if (file < 0) { |
@@ -45,7 +45,7 @@ extern int dutmp_main(int argc, char **argv) | |||
45 | * fact the stupid libc doesn't have a reliable #define to announce that libc5 | 45 | * fact the stupid libc doesn't have a reliable #define to announce that libc5 |
46 | * is being used. sigh. | 46 | * is being used. sigh. |
47 | */ | 47 | */ |
48 | #if ! defined __GLIBC__ | 48 | #if ! defined __GLIBC__ || defined __UCLIBC__ |
49 | while (read(file, (void*)&ut, sizeof(struct utmp))) { | 49 | while (read(file, (void*)&ut, sizeof(struct utmp))) { |
50 | printf("%d|%d|%s|%s|%s|%s|%s|%lx\n", | 50 | printf("%d|%d|%s|%s|%s|%s|%s|%lx\n", |
51 | ut.ut_type, ut.ut_pid, ut.ut_line, | 51 | ut.ut_type, ut.ut_pid, ut.ut_line, |