summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorEric Andersen1999-10-12 22:26:06 +0000
committerEric Andersen1999-10-12 22:26:06 +0000
commit3cf52d19581b2077480e7d2e63010baa1f5399c1 (patch)
treed91b0cb332ebc976126e36a394655dde7a15d8b1 /miscutils
parent2ce1edcf544ac675e6762c9861a6b918401ea716 (diff)
downloadbusybox-3cf52d19581b2077480e7d2e63010baa1f5399c1.zip
busybox-3cf52d19581b2077480e7d2e63010baa1f5399c1.tar.gz
More stuff...
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/dutmp.c61
1 files changed, 33 insertions, 28 deletions
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index e92b670..2dad7d4 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -9,39 +9,44 @@
*
* made against libc6
*/
-
+
#include "internal.h"
#include <stdio.h>
#include <utmp.h>
-const char dutmp_usage[] = "dutmp\n"
-"\n"
-"\tDump file or stdin utmp file format to stdout, pipe delimited.\n"
-"\tdutmp /var/run/utmp\n";
+const char dutmp_usage[] = "dutmp\n"
+ "\n"
+ "\tDump file or stdin utmp file format to stdout, pipe delimited.\n"
+ "\tdutmp /var/run/utmp\n";
-extern int
-dutmp_fn(const struct FileInfo * i)
+extern int dutmp_fn (int argc, char **argv)
{
-FILE * f = stdin;
-struct utmp * ut = (struct utmp *) malloc(sizeof(struct utmp) );
-
- if ( i )
- if (! (f = fopen(i->source, "r"))) {
- name_and_error(i->source);
- return 1;
- }
-
- 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);
- }
-
-return 0;
+ FILE *f = stdin;
+ struct utmp ut;
+
+ if ((argc < 2) || (**(argv + 1) == '-')) {
+ fprintf (stderr, "Usage: %s %s\n", *argv, dutmp_usage);
+ exit (FALSE);
+ }
+
+ if ( **(++argv) == 0 ) {
+ f = fopen (*(++argv), "r");
+ if (f < 0 ) {
+ perror (*argv);
+ exit (FALSE);
+ }
+ }
+
+ 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);
+ }
+
+ exit (TRUE);
}