+ in the interest of robustness, I added

[oweals/busybox.git] / dutmp.c

diff --git a/dutmp.c b/dutmp.c
index e92b6700f5bc0aaf1dfc7ce8bc0e7e7b4a473309..1629067a1bc3de92374a986ee68cc7a315fd1a54 100644 (file)
--- a/dutmp.c
+++ b/dutmp.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
  * 
@@ -9,39 +10,44 @@
  * 
  * made against libc6
  */
- 
+
 #include "internal.h"
 #include <stdio.h>
+#include <errno.h>
 #include <utmp.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_io_error
+#include "messages.c"
 
-const char      dutmp_usage[] = "dutmp\n"
-"\n"
-"\tDump file or stdin utmp file format to stdout, pipe delimited.\n"
-"\tdutmp /var/run/utmp\n";
+static const char dutmp_usage[] = "dutmp [FILE]\n\n"
+       "Dump utmp file format (pipe delimited) from FILE\n"
+       "or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')\n";
 
-extern int
-dutmp_fn(const struct FileInfo * i)
+extern int dutmp_main(int argc, char **argv)
 {
 
-FILE * f = stdin;
-struct utmp * ut = (struct utmp *) malloc(sizeof(struct utmp) );
+       FILE *f;
+       struct utmp ut;
 
-       if ( i ) 
-               if (! (f = fopen(i->source, "r"))) {
-                       name_and_error(i->source);
-                       return 1;
+       if (argc<2) {
+               f = stdin;
+       } else if (*argv[1] == '-' ) {
+               usage(dutmp_usage);
+       } else  {
+               f = fopen(argv[1], "r");
+               if (f == NULL) {
+                       fatalError(io_error, argv[1], strerror(errno));
                }
+       }
 
-       while (fread (ut, 1, sizeof(struct utmp), f)) {
-               //printf("%d:%d:%s:%s:%s:%s:%d:%d:%ld:%ld:%ld:%x\n", 
+       while (fread(&ut, sizeof(struct utmp), 1, f)) {
                printf("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n",
-               ut->ut_type, ut->ut_pid, ut->ut_line,
-               ut->ut_id, ut->ut_user, ut->ut_host,
-               ut->ut_exit.e_termination, ut->ut_exit.e_exit,
-               ut->ut_session,
-               ut->ut_tv.tv_sec, ut->ut_tv.tv_usec,
-               ut->ut_addr);
+                          ut.ut_type, ut.ut_pid, ut.ut_line,
+                          ut.ut_id, ut.ut_user, ut.ut_host,
+                          ut.ut_exit.e_termination, ut.ut_exit.e_exit,
+                          ut.ut_session,
+                          ut.ut_tv.tv_sec, ut.ut_tv.tv_usec, ut.ut_addr);
        }
 
-return 0;      
+       exit(TRUE);
 }