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.
This commit is contained in:
@ -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,
|
||||
|
Reference in New Issue
Block a user