 @@ -1,14 +1,14 @@
-/* $NetBSD: echo.c,v 1.15.32.2 2008/09/18 04:27:40 wrstuden Exp $	*/
+/* $NetBSD: echo.c,v 1.15.32.3 2008/09/24 16:29:49 wrstuden Exp $	*/
 /*
  * Copyright (c) 1989, 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.
 @@ -30,27 +30,27 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT(
 "@(#) Copyright (c) 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: echo.c,v 1.15.32.2 2008/09/18 04:27:40 wrstuden Exp $");
+__RCSID("$NetBSD: echo.c,v 1.15.32.3 2008/09/24 16:29:49 wrstuden Exp $");
 #endif
 #endif /* not lint */
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 int main(int, char *[]);
 /* ARGSUSED */
 int
 main(int argc, char *argv[])
 @@ -65,16 +65,19 @@ main(int argc, char *argv[])
 		++argv;
 		nflag = 1;
+	}
 	else
 		nflag = 0;
 	while (*argv) {
 		(void)printf("%s", *argv);
 		if (*++argv)
 			(void)putchar(' ');
+	}
 	if (nflag == 0)
 		(void)putchar('\n');
 	fflush(stdout);
 	if (ferror(stdout))
 		exit(1);
 	exit(0);
 	/* NOTREACHED */
+}

 @@ -1,36 +1,36 @@
-/*	$NetBSD: c_ulimit.c,v 1.8 2006/10/16 00:07:32 christos Exp $	*/
+/*	$NetBSD: c_ulimit.c,v 1.8.18.1 2008/09/24 16:29:49 wrstuden Exp $	*/
 /*
 	ulimit -- handle "ulimit" builtin
 	Reworked to use getrusage() and ulimit() at once (as needed on
 	some schizophrenic systems, eg, HP-UX 9.01), made argument parsing
 	conform to at&t ksh, added autoconf support.  Michael Rendell, May, '94
 	Eric Gisin, September 1988
 	Adapted to PD KornShell. Removed AT&T code.
 	last edit:	06-Jun-1987	D A Gwyn
 	This started out as the BRL UNIX System V system call emulation
 	for 4.nBSD, and was later extended by Doug Kingston to handle
 	the extended 4.nBSD resource limits.  It now includes the code
 	that was originally under case SYSULIMIT in source file "xec.c".
 */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: c_ulimit.c,v 1.8 2006/10/16 00:07:32 christos Exp $");
+__RCSID("$NetBSD: c_ulimit.c,v 1.8.18.1 2008/09/24 16:29:49 wrstuden Exp $");
 #endif
 #include "sh.h"
 #include "ksh_time.h"
 #ifdef HAVE_SYS_RESOURCE_H
 # include <sys/resource.h>
 #endif /* HAVE_SYS_RESOURCE_H */
 #ifdef HAVE_ULIMIT_H
 # include <ulimit.h>
 #else /* HAVE_ULIMIT_H */
 # ifdef HAVE_ULIMIT
 extern	long ulimit();
 @@ -183,27 +183,27 @@ c_ulimit(wp)
 			if (!evaluate(wp[0], &rval, KSH_RETURN_ERROR))
 				return 1;
 			/* Avoid problems caused by typos that
 			 * evaluate misses due to evaluating unset
 			 * parameters to 0...
 			 * If this causes problems, will have to
 			 * add parameter to evaluate() to control
 			 * if unset params are 0 or an error.
 			 */
 			if (!rval && !digit(wp[0][0])) {
 			    bi_errorf("invalid limit: %s", wp[0]);
 			    return 1;
+			}
-			val = rval * l->factor;
+			val = (u_long)rval * l->factor;
+		}
+	}
 	if (all) {
 		for (l = limits; l->name; l++) {
 #ifdef HAVE_SETRLIMIT
 			if (l->which == RLIMIT) {
 				getrlimit(l->gcmd, &limit);
 				if (how & SOFT)
 					val = limit.rlim_cur;
 				else if (how & HARD)
 					val = limit.rlim_max;
 			} else
 #endif /* HAVE_SETRLIMIT */

 @@ -1,28 +1,28 @@
-/* $NetBSD: test.c,v 1.34.6.1 2008/06/23 04:26:44 wrstuden Exp $ */
+/* $NetBSD: test.c,v 1.34.6.2 2008/09/24 16:29:49 wrstuden Exp $ */
 /*
  * test(1); version 7-like  --  author Erik Baalbergen
  * modified by Eric Gisin to be used as built-in.
  * modified by Arnold Robbins to add SVR3 compatibility
  * (-x -c -b -p -u -g -k) plus Korn's -L -nt -ot -ef and new -S (socket).
  * modified by J.T. Conklin for NetBSD.
+ *
  * This program is in the Public Domain.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: test.c,v 1.34.6.1 2008/06/23 04:26:44 wrstuden Exp $");
+__RCSID("$NetBSD: test.c,v 1.34.6.2 2008/09/24 16:29:49 wrstuden Exp $");
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -671,27 +671,27 @@ getn(const char *s)
 	char *p;
 	long long r;
 	errno = 0;
 	r = strtoll(s, &p, 10);
 	if (errno != 0)
 	if (errno == ERANGE && (r == LLONG_MAX || r == LLONG_MIN))
 	      error("%s: out of range", s);
 	while (isspace((unsigned char)*p))
 	      p++;
-	if (*p)
+	if (*p || p == s)
 	      error("%s: bad number", s);
 	return r;
+}
 static int
 newerf(const char *f1, const char *f2)
+{
 	struct stat b1, b2;
 	return (stat(f1, &b1) == 0 &&
 		stat(f2, &b2) == 0 &&
 		b1.st_mtime > b2.st_mtime);