[pkgsrc/trunk]: pkgsrc/shells/pdksh PR/51142: address for/select loop compati...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8141a139367a
branches:  trunk
changeset: 347973:8141a139367a
user:      richard <richard%pkgsrc.org@localhost>
date:      Sun Jun 05 04:44:56 2016 +0000

description:
PR/51142: address for/select loop compatibility with ksh93 in pdksh

diffstat:

 shells/pdksh/Makefile     |   4 ++--
 shells/pdksh/files/exec.c |   4 ++--
 shells/pdksh/files/syn.c  |  11 +++--------
 3 files changed, 7 insertions(+), 12 deletions(-)

diffs (57 lines):

diff -r bb6af4913fe7 -r 8141a139367a shells/pdksh/Makefile
--- a/shells/pdksh/Makefile     Sun Jun 05 03:42:12 2016 +0000
+++ b/shells/pdksh/Makefile     Sun Jun 05 04:44:56 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2015/09/07 06:43:48 dsainty Exp $
+# $NetBSD: Makefile,v 1.24 2016/06/05 04:44:56 richard Exp $
 #
 
 DISTNAME=      pdksh-5.2.14
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    shells
 MASTER_SITES=  ftp://ftp.cs.mun.ca/pub/pdksh/ \
                http://gd.tuwien.ac.at/utils/shells/pdksh/ \
diff -r bb6af4913fe7 -r 8141a139367a shells/pdksh/files/exec.c
--- a/shells/pdksh/files/exec.c Sun Jun 05 03:42:12 2016 +0000
+++ b/shells/pdksh/files/exec.c Sun Jun 05 04:44:56 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec.c,v 1.3 2008/06/15 14:20:09 tnn Exp $     */
+/*     $NetBSD: exec.c,v 1.4 2016/06/05 04:44:56 richard Exp $ */
 
 /*
  * execute command tree
@@ -334,7 +334,7 @@
                }
 #ifdef KSH
                else { /* TSELECT */
-                       for (;;) {
+                       while (*ap != NULL) {
                                if (!(cp = do_selectargs(ap, is_first))) {
                                        rv = 1;
                                        break;
diff -r bb6af4913fe7 -r 8141a139367a shells/pdksh/files/syn.c
--- a/shells/pdksh/files/syn.c  Sun Jun 05 03:42:12 2016 +0000
+++ b/shells/pdksh/files/syn.c  Sun Jun 05 04:44:56 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: syn.c,v 1.3 2008/06/15 14:20:09 tnn Exp $      */
+/*     $NetBSD: syn.c,v 1.4 2016/06/05 04:44:56 richard Exp $  */
 
 /*
  * shell parser (C version)
@@ -609,13 +609,8 @@
                XPput(args, yylval.cp);
        if (c != '\n' && c != ';')
                syntaxerr((char *) 0);
-       if (XPsize(args) == 0) {
-               XPfree(args);
-               return NULL;
-       } else {
-               XPput(args, NULL);
-               return (char **) XPclose(args);
-       }
+       XPput(args, NULL);
+       return (char **) XPclose(args);
 }
 
 /*