When mounting a ro fs rw, print warning and then mount it ro. Patch

[oweals/busybox.git] / dutmp.c

diff --git a/dutmp.c b/dutmp.c
index 45eab8ae78fb4efe4e2d6663aec7225d4541f1fa..5a6eb076b6ec84adc95c934542bea42d8598d9f3 100644 (file)
--- a/dutmp.c
+++ b/dutmp.c
@@ -8,46 +8,44 @@
  * versions of 'who', 'last', etc. IP Addr is output in hex, 
  * little endian on x86.
  * 
- * made against libc6
+ * Modified to support all sort of libcs by 
+ * Erik Andersen <andersen@lineo.com>
  */
 
 #include "internal.h"
-#include <stdio.h>
-#include <utmp.h>
-
-static const char dutmp_usage[] = "dutmp\n"
-       "\n"
+#include <sys/types.h>
+#include <fcntl.h>
 
-       "\tDump file or stdin utmp file format to stdout, pipe delimited.\n"
-       "\tdutmp /var/run/utmp\n";
+#include <errno.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_io_error
+#include "messages.c"
+#include <utmp.h>
 
 extern int dutmp_main(int argc, char **argv)
 {
 
-       FILE *f = stdin;
+       int file;
        struct utmp ut;
 
-       if ((argc < 2) || (**(argv + 1) == '-')) {
+       if (argc<2) {
+               file = fileno(stdin);
+       } else if (*argv[1] == '-' ) {
                usage(dutmp_usage);
-       }
-
-       if (**(++argv) == 0) {
-               f = fopen(*(++argv), "r");
-               if (f < 0) {
-                       perror(*argv);
-                       exit(FALSE);
+       } else  {
+               file = open(argv[1], O_RDONLY);
+               if (file < 0) {
+                       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", 
-               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);
+       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,
+                               ut.ut_id, ut.ut_user, ut.ut_host,
+                               ctime(&(ut.ut_time)), 
+                               (long)ut.ut_addr);
        }
 
-       exit(TRUE);
+       return(TRUE);
 }