Compatibility with OpenBSD. Thanks, Steve Dee!

This commit is contained in:
David Galos
2013-07-18 15:28:08 -04:00
parent cd1526715f
commit 0fcb939408
4 changed files with 22 additions and 17 deletions
+6 -2
View File
@@ -88,10 +88,14 @@ OBJ = $(SRC:.c=.o) $(LIB)
BIN = $(SRC:.c=)
MAN = $(SRC:.c=.1)
all: $(BIN)
all: binlib
binlib: util.a
$(MAKE) bin
bin: $(BIN)
$(OBJ): util.h config.mk
$(BIN): util.a
cat.o fold.o grep.o nl.o sort.o tail.o uniq.o: text.h
cp.o mv.o rm.o: fs.h
+2 -1
View File
@@ -14,7 +14,8 @@ main(int argc, char **argv)
{
ARGBEGIN {
case 'i':
clearenv();
if(environ)
*environ = NULL;
break;
case 'u':
unsetenv(EARGF(usage()));
+1 -5
View File
@@ -15,10 +15,6 @@ relies on the utmp file to be updated responsibly. This
doesn't always happen, which can cause who to print completely
bogus data.
musl\-libc currently implements all utmpx functions as stubs Obviously,
this command cannot work under such conditions.
.SH SEE ALSO
.IR getutxent (3)
.IR utmpx (5)
.IR utmp (5)
+13 -9
View File
@@ -3,7 +3,7 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
#include <utmpx.h>
#include <utmp.h>
#include "util.h"
static void usage(void);
@@ -11,21 +11,25 @@ static void usage(void);
int
main(int argc, char **argv)
{
struct utmpx *ut;
struct utmp usr;
FILE *ufp;
time_t t;
char timebuf[sizeof "yyyy-mm-dd hh:mm"];
if(argc!=1)
usage();
while((ut=getutxent())) {
if(ut->ut_type != USER_PROCESS)
continue;
t = ut->ut_tv.tv_sec;
strftime(timebuf, sizeof timebuf, "%Y-%m-%d %H:%M", localtime(&t));
printf("%-8s %-12s %-16s\n", ut->ut_user, ut->ut_line, timebuf);
if (!(ufp = fopen(_PATH_UTMP, "r"))) {
eprintf("fopen:");
}
endutxent();
while(fread((char *)&usr, sizeof(usr), 1, ufp) == 1) {
if (!*usr.ut_name || !*usr.ut_line)
continue;
t = usr.ut_time;
strftime(timebuf, sizeof timebuf, "%Y-%m-%d %H:%M", localtime(&t));
printf("%-8s %-12s %-16s\n", usr.ut_name, usr.ut_line, timebuf);
}
fclose(ufp);
return 0;
}