Module Name: src
Committed By: christos
Date: Sun Aug 28 07:49:16 UTC 2011
Modified Files:
src/bin/csh: Makefile time.c
Removed Files:
src/bin/csh: strpct.c
Log Message:
use strpct(3) from libutil.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/bin/csh/Makefile
cvs rdiff -u -r1.8 -r0 src/bin/csh/strpct.c
cvs rdiff -u -r1.17 -r1.18 src/bin/csh/time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/Makefile
diff -u src/bin/csh/Makefile:1.32 src/bin/csh/Makefile:1.33
--- src/bin/csh/Makefile:1.32 Thu Aug 25 11:44:51 2011
+++ src/bin/csh/Makefile Sun Aug 28 03:49:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2011/08/25 15:44:51 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2011/08/28 07:49:16 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
#
# C Shell with process control; VM/UNIX VAX Makefile
@@ -13,7 +13,7 @@
CPPFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
SRCS= alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
func.c glob.c hist.c init.c lex.c misc.c parse.c printf.c proc.c \
- sem.c set.c str.c strpct.c time.c
+ sem.c set.c str.c time.c
.PATH: ${NETBSDSRCDIR}/usr.bin/printf
MLINKS= csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
@@ -55,7 +55,9 @@
COPTS.err.c = -Wno-format-nonliteral
COPTS.printf.c = -Wno-format-nonliteral
COPTS.proc.c = -Wno-format-nonliteral
-COPTS.strpct.c = -Wno-format-nonliteral
+
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/bin/csh/time.c
diff -u src/bin/csh/time.c:1.17 src/bin/csh/time.c:1.18
--- src/bin/csh/time.c:1.17 Sun Feb 24 00:20:17 2008
+++ src/bin/csh/time.c Sun Aug 28 03:49:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.17 2008/02/24 05:20:17 dholland Exp $ */
+/* $NetBSD: time.c,v 1.18 2011/08/28 07:49:16 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: time.c,v 1.17 2008/02/24 05:20:17 dholland Exp $");
+__RCSID("$NetBSD: time.c,v 1.18 2011/08/28 07:49:16 christos Exp $");
#endif
#endif /* not lint */
@@ -44,13 +44,13 @@
#include "csh.h"
#include "extern.h"
#endif
+#include <util.h>
/*
* C Shell - routines handling process timing and niceing
*/
static void pdeltat(FILE *, struct timeval *, struct timeval *);
static void pcsecs(FILE *, long);
-extern char *strpct(u_long, u_long, u_int);
#ifndef NOT_CSH
void
@@ -186,7 +186,9 @@
if (ms == 0) {
(void)fputs("0.0%", fp);
} else {
- (void)fputs(strpct((ulong)t, (ulong)ms, 1), fp);
+ char pb[32];
+ (void)fputs(strpct(pb, sizeof(pb), t, ms, 1), fp);
+ (void)fputc('%', fp);
}
break;
case 'R': /* page reclaims */
