From: kloczek <kloczek@pld-linux.org>
Date: Tue, 18 Jul 2000 11:50:21 +0000 (+0000)
Subject: - patches from rawhide.
X-Git-Tag: ash-0_2-24~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fash.git;a=commitdiff_plain;h=fc845259fa14cb040950dc951183b7fbe069fc1f

- patches from rawhide.

Changed files:
    ash-echo.patch -> 1.1
    ash-exit.patch -> 1.1
    ash-fd.patch -> 1.1
---

diff --git a/ash-echo.patch b/ash-echo.patch
new file mode 100644
index 0000000..dd6992b
--- /dev/null
+++ b/ash-echo.patch
@@ -0,0 +1,17 @@
+--- ash-linux-0.2/bltin/echo.c.foo	Sat Sep 11 23:55:02 1999
++++ ash-linux-0.2/bltin/echo.c	Sat Sep 11 23:57:48 1999
+@@ -63,7 +63,13 @@
+ 	if (argc)
+ 		ap++;
+ 	if ((p = *ap) != NULL) {
+-		if (equal(p, "-n")) {
++		if (equal(p,"-en") || equal(p,"-ne")) {
++			nflag++;
++#ifndef eflag
++			eflag++;
++#endif
++			ap++;
++		} else  if (equal(p, "-n")) {
+ 			nflag++;
+ 			ap++;
+ 		} else if (equal(p, "-e")) {
diff --git a/ash-exit.patch b/ash-exit.patch
new file mode 100644
index 0000000..dd6845b
--- /dev/null
+++ b/ash-exit.patch
@@ -0,0 +1,25 @@
+--- ash-linux-0.2/eval.c.exit	Wed Mar 29 15:43:37 2000
++++ ash-linux-0.2/eval.c	Wed Mar 29 15:39:29 2000
+@@ -206,12 +206,14 @@
+ 		break;
+ 	case NAND:
+ 		evaltree(n->nbinary.ch1, EV_TESTED);
++		flags |= EV_TESTED;
+ 		if (evalskip || exitstatus != 0)
+ 			goto out;
+ 		evaltree(n->nbinary.ch2, flags);
+ 		break;
+ 	case NOR:
+ 		evaltree(n->nbinary.ch1, EV_TESTED);
++		flags |= EV_TESTED;
+ 		if (evalskip || exitstatus == 0)
+ 			goto out;
+ 		evaltree(n->nbinary.ch2, flags);
+@@ -232,6 +234,7 @@
+ 		int status = 0; 
+ 
+ 		evaltree(n->nif.test, EV_TESTED);
++		flags |= EV_TESTED;
+ 		if (evalskip)
+ 			goto out;
+ 		if (exitstatus == 0) {
diff --git a/ash-fd.patch b/ash-fd.patch
new file mode 100644
index 0000000..2ad698c
--- /dev/null
+++ b/ash-fd.patch
@@ -0,0 +1,19 @@
+--- ash-linux-0.2/parser.c.foo	Sat Sep 11 17:33:40 1999
++++ ash-linux-0.2/parser.c	Sat Sep 11 17:36:02 1999
+@@ -552,15 +552,11 @@
+ 		}
+ 	} else if (n->type == NTOFD || n->type == NFROMFD) {
+ 		if (is_digit(wordtext[0]))
+-			n->ndup.dupfd = digit_val(wordtext[0]);
++			n->ndup.dupfd = atoi(wordtext);
+ 		else if (wordtext[0] == '-')
+ 			n->ndup.dupfd = -1;
+ 		else
+-			goto bad;
+-		if (wordtext[1] != '\0') {
+-bad:
+ 			synerror("Bad fd number");
+-		}
+ 	} else {
+ 		n->nfile.fname = (union node *)stalloc(sizeof (struct narg));
+ 		n = n->nfile.fname;