Author: ed
Date: Wed Jan 13 17:56:54 2010
New Revision: 202193
URL: http://svn.freebsd.org/changeset/base/202193
Log:
Port everything in bin/ from utmp to utmpx.
date: use libc utmpx routines instead of the ones provided by libulog.
pax: don't depend on <utmp.h>
Modified:
head/bin/date/Makefile
head/bin/date/date.c
head/bin/pax/gen_subs.c
Modified: head/bin/date/Makefile
==============================================================================
--- head/bin/date/Makefile Wed Jan 13 17:54:32 2010 (r202192)
+++ head/bin/date/Makefile Wed Jan 13 17:56:54 2010 (r202193)
@@ -3,7 +3,5 @@
PROG= date
SRCS= date.c netdate.c vary.c
-DPADD= ${LIBULOG}
-LDADD= -lulog
.include <bsd.prog.mk>
Modified: head/bin/date/date.c
==============================================================================
--- head/bin/date/date.c Wed Jan 13 17:54:32 2010 (r202192)
+++ head/bin/date/date.c Wed Jan 13 17:56:54 2010 (r202193)
@@ -52,9 +52,8 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#define _ULOG_POSIX_NAMES
-#include <ulog.h>
#include <unistd.h>
+#include <utmpx.h>
#include "extern.h"
#include "vary.h"
Modified: head/bin/pax/gen_subs.c
==============================================================================
--- head/bin/pax/gen_subs.c Wed Jan 13 17:54:32 2010 (r202192)
+++ head/bin/pax/gen_subs.c Wed Jan 13 17:56:54 2010 (r202193)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <langinfo.h>
#include <stdint.h>
#include <stdio.h>
-#include <utmp.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
@@ -66,10 +65,6 @@ __FBSDID("$FreeBSD$");
#define OLDFRMTM "%b %e %Y"
#define CURFRMTD "%e %b %H:%M"
#define OLDFRMTD "%e %b %Y"
-#ifndef UT_NAMESIZE
-#define UT_NAMESIZE 8
-#endif
-#define UT_GRPSIZE 6
static int d_first = -1;
@@ -116,9 +111,8 @@ ls_list(ARCHD *arcn, time_t now, FILE *f
*/
if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0)
f_date[0] = '\0';
- (void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink,
- UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE,
- name_gid(sbp->st_gid, 1));
+ (void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink,
+ name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1));
/*
* print device id's for devices, or sizes for other nodes
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
