summaryrefslogtreecommitdiff
path: root/miscutils/dutmp.c
diff options
context:
space:
mode:
authorEric Andersen2001-02-14 21:23:06 +0000
committerEric Andersen2001-02-14 21:23:06 +0000
commit67991cf824f8df27e74c92d754fb507681c69ce6 (patch)
treea0b652f3dc794d1050c1a8de3afb014a621238fa /miscutils/dutmp.c
parent68be2ab914e1e20fe666bbd22a89a18714be2789 (diff)
downloadbusybox-67991cf824f8df27e74c92d754fb507681c69ce6.zip
busybox-67991cf824f8df27e74c92d754fb507681c69ce6.tar.gz
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 'miscutils/dutmp.c')
-rw-r--r--miscutils/dutmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index 7e1d2ee..2e6b3c0 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -33,7 +33,7 @@ extern int dutmp_main(int argc, char **argv)
if (argc<2) {
file = fileno(stdin);
} else if (*argv[1] == '-' ) {
- usage(dutmp_usage);
+ show_usage();
} else {
file = open(argv[1], O_RDONLY);
if (file < 0) {
@@ -45,7 +45,7 @@ extern int dutmp_main(int argc, char **argv)
* fact the stupid libc doesn't have a reliable #define to announce that libc5
* is being used. sigh.
*/
-#if ! defined __GLIBC__
+#if ! defined __GLIBC__ || defined __UCLIBC__
while (read(file, (void*)&ut, sizeof(struct utmp))) {
printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
ut.ut_type, ut.ut_pid, ut.ut_line,