 @@ -1,29 +1,29 @@
-#	$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
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
+#
 # To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile.
 .include <bsd.own.mk>
 PROG=	csh
 DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
 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 \
 	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
 	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
 	csh.1 stop.1 csh.1 source.1
 DPSRCS+=	errnum.h const.h
 CLEANFILES+=	errnum.h const.h
 errnum.h: err.c
 	${_MKTARGET_CREATE}
 	rm -f ${.TARGET}
 @@ -45,17 +45,19 @@ const.h: const.c
 	    sort >> ${.TARGET}
 .if make(install)
 SUBDIR+=USD.doc
 .endif
 # XXX Only GCC 4.1 problem
 .if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax"
 COPTS.parse.c+=	-O0
 .endif
 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>

 @@ -1,14 +1,14 @@
-/* $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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,43 +24,43 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #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 */
 #ifndef NOT_CSH
 #include <sys/types.h>
 #include <stdarg.h>
 #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
 settimes(void)
+{
     struct rusage ruch;
     (void)gettimeofday(&time0, NULL);
     (void)getrusage(RUSAGE_SELF, &ru0);
     (void)getrusage(RUSAGE_CHILDREN, &ruch);
     ruadd(&ru0, &ruch);
+}
 @@ -176,27 +176,29 @@ prusage(FILE *fp, struct rusage *r0, str
 			 (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t));
 		break;
 	    case 'M':		/* max. Resident Set Size */
 		(void)fprintf(fp, "%ld", r1->ru_maxrss / 2L);
 		break;
 	    case 'O':		/* FS blocks out */
 		(void)fprintf(fp, "%ld", r1->ru_oublock - r0->ru_oublock);
 		break;
 	    case 'P':		/* percent time spent running */
 		/* check if it did not run at all */
 		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 */
 		(void)fprintf(fp, "%ld", r1->ru_minflt - r0->ru_minflt);
 		break;
 	    case 'S':		/* system CPU time used */
 		pdeltat(fp, &r1->ru_stime, &r0->ru_stime);
 		break;
 	    case 'U':		/* user CPU time used */
 		pdeltat(fp, &r1->ru_utime, &r0->ru_utime);
 		break;
 	    case 'W':		/* number of swaps */
 		i = r1->ru_nswap - r0->ru_nswap;