Update to 2.03b.

6 files changed, 2 insertions, 149 deletions

diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index ecf226f68a54..2300560ce9d0 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fd
-PORTVERSION=	2.03a
-PORTREVISION=	1
+PORTVERSION=	2.03b
 CATEGORIES=	shells
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
 		ftp://ftp.vector.co.jp/pack/unix/util/file/filer/fd/
diff --git a/shells/fd/distinfo b/shells/fd/distinfo
index 0b3633ef7a9d..84aff29df3f5 100644
--- a/shells/fd/distinfo
+++ b/shells/fd/distinfo
@@ -1 +1 @@
-MD5 (FD-2.03a.tar.gz) = e0298e41e98bdd89ecc25b3660d0bef9
+MD5 (FD-2.03b.tar.gz) = 64bc6f0b5575a55799f38b59e1797732
diff --git a/shells/fd/files/patch-dosemu.c b/shells/fd/files/patch-dosemu.c
deleted file mode 100644
index b06cd3d08a08..000000000000
--- a/shells/fd/files/patch-dosemu.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from: [FDclone-users:00142]
-
---- dosemu.c.orig	Tue Apr 15 00:00:00 2003
-+++ dosemu.c	Sat Apr 19 21:07:17 2003
-@@ -581,7 +581,7 @@
- #else
- 	path = lbuf;
- #endif
--	strncpy(buf, path, bufsiz);
-+	for (len = 0; len < bufsiz && path[len]; len++) buf[len] = path[len];
- 	return(len);
- }
- 
diff --git a/shells/fd/files/patch-shell.c b/shells/fd/files/patch-shell.c
deleted file mode 100644
index 1bebd66ad982..000000000000
--- a/shells/fd/files/patch-shell.c
+++ /dev/null
@@ -1,26 +0,0 @@
-Taken from: [FDclone-users:00145]
-
-diff -u ../old/FD-2.03a/shell.c ./shell.c
---- ../old/FD-2.03a/shell.c	Tue Apr 15 00:00:00 2003
-+++ ./shell.c	Tue Apr 22 00:00:00 2003
-@@ -752,6 +752,11 @@
- 	*argcp = argc = argc2;
- 	*argvp = argv = argv2;
- 
-+	if (iscomm < 0) {
-+		free(buf);
-+		return(ret);
-+	}
-+
- 	min = -1;
- 	for (next = lastptr; next < maxfile; next++)
- 	if (isarg(&(filelist[next]))) {
-@@ -767,7 +772,7 @@
- 			if (!isneedmark(argv[n], i)) buf[j++] = argv[n][i];
- 			else {
- 				flags = argv[n][++i];
--				cp = (iscomm < 0 || n) ? arg : NULL;
-+				cp = (!env || n) ? arg : NULL;
- 				if (min >= 0 && next < maxfile) ret++;
- 
- 				len = setarg(&buf, j, &size, NULL, cp, flags);
diff --git a/shells/fd/files/patch-system.c b/shells/fd/files/patch-system.c
deleted file mode 100644
index 523d492206e5..000000000000
--- a/shells/fd/files/patch-system.c
+++ /dev/null
@@ -1,94 +0,0 @@
-Taken from: [FDclone-users:00145]
-
-diff -u ../old/FD-2.03a/system.c ./system.c
---- ../old/FD-2.03a/system.c	Tue Apr 15 00:00:00 2003
-+++ ./system.c	Tue Apr 22 00:00:00 2003
-@@ -3926,7 +3926,11 @@
- 	char *tmp;
- 	int type;
- 
--	if (rp -> next && (errp = doredirect(rp -> next))) return(errp);
-+	rp -> type &= ~MD_REST;
-+	if (rp -> next) {
-+		if ((errp = doredirect(rp -> next))) return(errp);
-+		if (((rp -> next) -> type) & MD_REST) rp -> type |= MD_REST;
-+	}
- 
- 	type = rp -> type;
- 	if (!(rp -> filename)) tmp = NULL;
-@@ -3940,6 +3944,25 @@
- 		tmp = NULL;
- 		type &= ~MD_FILEDESC;
- 	}
-+#ifdef	FD
-+	else {
-+		char **argv;
-+		int n, argc;
-+
-+		argv = (char **)malloc2(2 * sizeof(char *));
-+		argv[0] = tmp;
-+		argv[1] = NULL;
-+		argc = 1;
-+		n = replaceargs(&argc, &argv, NULL, 0);
-+		tmp = argv[0];
-+		free(argv);
-+		if (n < 0) {
-+			free(tmp);
-+			return(rp);
-+		}
-+		if (n) rp -> type |= MD_REST;
-+	}
-+#endif	/* FD */
- 
- 	if (!tmp);
- 	else if (type & MD_HEREDOC) {
-@@ -7230,7 +7253,6 @@
- 		}
- 		else for (i = 0; i < argc; i++) stripquote(argv[i], 1);
- #ifdef	FD
--		replaceargs(NULL, NULL, NULL, 0);
- 		if (replaceargs(&argc, &argv, NULL, -1) < 0) {
- 			freevar(argv);
- 			return(-1);
-@@ -9558,9 +9580,6 @@
- 		fflush(stderr);
- 	}
- 
--#ifdef	FD
--	replaceargs(NULL, NULL, NULL, 0);
--#endif
- 	for (;;) {
- #ifdef	FD
- 		char **dupargv;
-@@ -9806,6 +9825,10 @@
- 		return(-1);
- #endif
- 
-+#ifdef	FD
-+	replaceargs(NULL, NULL, NULL, 0);
-+#endif
-+
- 	if (!(trp -> comm) || pipein > 0L) {
- #if	!MSDOS && !defined (NOJOB)
- 		if (pipein > 0L) stackjob(pipein, 0, trp);
-@@ -9822,7 +9845,7 @@
- #endif
- 		ret_status = (ret >= 0) ? ret : RET_FAIL;
- 	}
--	else {
-+	else for (;;) {
- 		if (!(errp = doredirect((trp -> comm) -> redp)))
- #if	MSDOS || defined (USEFAKEPIPE)
- 			ret = exec_process(trp);
-@@ -9854,6 +9877,11 @@
- 		}
- 		closeredirect((trp -> comm) -> redp);
- 		ret_status = (ret >= 0) ? ret : RET_FAIL;
-+#ifdef	FD
-+		if (!errp && ((trp -> comm) -> redp) -> type & MD_REST)
-+			continue;
-+#endif
-+		break;
- 	}
- 	trp = tmptr;
- 
diff --git a/shells/fd/files/patch-system.h b/shells/fd/files/patch-system.h
deleted file mode 100644
index 37bf608200fd..000000000000
--- a/shells/fd/files/patch-system.h
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from: [FDclone-users:00145]
-
-diff -u ../old/FD-2.03a/system.h ./system.h
---- ../old/FD-2.03a/system.h	Tue Apr 15 00:00:00 2003
-+++ ./system.h	Tue Apr 22 00:00:00 2003
-@@ -185,6 +185,7 @@
- #define	MD_WITHERR	0020
- #define	MD_HEREDOC	0040
- #define	MD_FORCED	0100
-+#define	MD_REST		0200
- 
- typedef struct _command_t {
- 	hashlist *hash;