 @@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.17 2008/06/19 18:36:51 joerg Exp $
+# $NetBSD: Makefile,v 1.17.10.1 2009/02/23 13:18:56 tron Exp $
+#
 DISTNAME=	pdksh-5.2.14
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.cs.mun.ca/pub/pdksh/ \
 		http://gd.tuwien.ac.at/utils/shells/pdksh/ \
 		ftp://ftp.lip6.fr/pub/unix/shells/pdksh/ \
 		ftp://ftp.demon.net/pub/mirrors/pdksh/
 MASTER_SITES=	# maintained locally
 DISTFILES=	# empty
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://web.cs.mun.ca/~michael/pdksh/
 COMMENT=	Free clone of the AT&T Korn shell
 PKG_DESTDIR_SUPPORT=	user-destdir

 @@ -1,14 +1,14 @@
-/*	$NetBSD: c_ulimit.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
+/*	$NetBSD: c_ulimit.c,v 1.3.10.1 2009/02/23 13:18:56 tron 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
 @@ -177,27 +177,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 = (unsigned 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,14 +1,14 @@
-/*	$NetBSD: lex.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
+/*	$NetBSD: lex.c,v 1.3.10.1 2009/02/23 13:18:56 tron Exp $	*/
 /*
  * lexical analysis and source input
  */
 #include "sh.h"
 #include <ctype.h>
 /* Structure to keep track of the lexing state and the various pieces of info
  * needed for each particular state.
  */
 typedef struct lex_state Lex_state;
 @@ -318,61 +318,47 @@ yylex(cf)
 					*wp++ = '\0';
 					*wp++ = CSUBST;
 					*wp++ = 'X';
 				} else {
 					*wp++ = CHAR, *wp++ = '$';
 					ungetsc(c);
+				}
 				break;
 			  case '`':
 				PUSH_STATE(SBQUOTE);
 				*wp++ = COMSUB;
 				/* Need to know if we are inside double quotes
 				 * since sh/at&t-ksh translate the \" to " in
-				 * "`..\"..`".
+				 * "`..\"..`".  POSIX also requires this.
-				 * This is not done in posix mode (section
+				 * An earlier version of ksh misinterpreted
-				 * 3.2.3, Double Quotes: "The backquote shall
+				 * the POSIX specification and performed
-				 * retain its special meaning introducing the
+				 * removal of backslash escapes only if
-				 * other form of command substitution (see
+				 * posix mode was not in effect.
 				 * 3.6.3). The portion of the quoted string
 				 * from the initial backquote and the
 				 * characters up to the next backquote that
 				 * is not preceded by a backslash (having
 				 * escape characters removed) defines that
 				 * command whose output replaces `...` when
 				 * the word is expanded."
 				 * Section 3.6.3, Command Substitution:
 				 * "Within the backquoted style of command
 				 * substitution, backslash shall retain its
 				 * literal meaning, except when followed by
 				 * $ ` \.").
 				 */
 				statep->ls_sbquote.indquotes = 0;
-				if (!Flag(FPOSIX)) {
+				Lex_state *s = statep;
-					Lex_state *s = statep;
+				Lex_state *base = state_info.base;
-					Lex_state *base = state_info.base;
+				while (1) {
-					while (1) {
+					for (; s != base; s--) {
-						for (; s != base; s--) {
+						if (s->ls_state == SDQUOTE) {
-							if (s->ls_state == SDQUOTE) {
+							statep->ls_sbquote.indquotes = 1;
 								statep->ls_sbquote.indquotes = 1;
 								break;
 						if (s != base)
 							break;
 						if (!(s = s->ls_info.base))
 							break;
 						base = s-- - STATE_BSIZE;
+					}
 					if (s != base)
 						break;
 					if (!(s = s->ls_info.base))
 						break;
 					base = s-- - STATE_BSIZE;
+				}
 				break;
 			  default:
 				*wp++ = CHAR, *wp++ = c;
+			}
 			break;
 		  case SSQUOTE:
 			if (c == '\'') {
 				POP_STATE();
 				*wp++ = CQUOTE;
 				ignore_backslash_newline--;
 			} else