PATCH: 3.1.5 - Small Src/ patches that were overlooked

PATCH: 3.1.5 - Small Src/ patches that were overlooked

[Bart Schaefer]

Fix whitespace in builtins.c.

My patch from zsh-workers/4421 for restore_params() segfault.

PWS's patch from zsh-workers/4250 to regenerate signal names on reconfigure.

Goran Larsson's patch from zsh-workers/4105 to nul-terminate a string in
the stat module.

Index: Src/builtin.c
===================================================================
diff -u -r1.1.1.2 builtin.c
--- builtin.c	1998/10/30 15:57:01	1.1.1.2
+++ builtin.c	1998/10/31 09:03:10
@@ -2627,14 +2627,14 @@
     if(opch == ':' || !(p = memchr(optstr, opch, lenoptstr))) {
 	p = "?";
 err:
-      zsfree(zoptarg);
+	zsfree(zoptarg);
 	if(quiet) {
 	    setsparam(var, ztrdup(p));
 	    zoptarg = metafy(optbuf, lenoptbuf, META_DUP);
 	} else {
 	    zerr(*p == '?' ? "bad option: -%c" :
 		"argument expected after -%c option", NULL, opch);
-          zoptarg=ztrdup("");
+	    zoptarg=ztrdup("");
 	    errflag = 0;
 	}
 	return 0;
Index: Src/exec.c
===================================================================
diff -u -r1.1.1.2 -r1.6
--- exec.c	1998/10/30 15:57:02	1.1.1.2
+++ exec.c	1998/10/30 17:52:43	1.6
@@ -1992,8 +1992,8 @@
 		}
 	    } else
 		paramtab->addnode(paramtab, pm->nam, pm);
-	    if (pm->flags & PM_EXPORTED)
-		pm->env = addenv(pm->nam, getsparam(pm->nam));
+	    if ((pm->flags & PM_EXPORTED) && ((s = getsparam(pm->nam))))
+		pm->env = addenv(pm->nam, s);
 	}
     }
 }
Index: Src/zsh.mdd
===================================================================
diff -u -r1.1.1.2 -r1.3
--- zsh.mdd	1998/10/30 15:57:08	1.1.1.2
+++ zsh.mdd	1998/10/30 17:52:47	1.3
@@ -12,7 +12,7 @@
 prototypes.h hashtable.h ztype.h"
 
 :<<\Make
-signames.c: signames.awk @SIGNAL_H@
+signames.c: signames.awk ../config.h @SIGNAL_H@
 	$(AWK) -f $(sdir)/signames.awk @SIGNAL_H@ > $@
 
 sigcount.h: signames.c
Index: Src/Modules/stat.c
===================================================================
diff -u -r1.1.1.2 -r1.3
--- stat.c	1998/10/30 15:57:11	1.1.1.2
+++ stat.c	1998/10/30 17:52:47	1.3
@@ -85,6 +85,7 @@
 
 	for (i = 1; i <= 9; i++)
 	    pm[i] = (mode & *mfp++) ? modes[i] : '-';
+	pm[10] = '\0';
 
 	if (mode & S_ISUID)
 	    pm[3] = (mode & S_IXUSR) ? 's' : 'S';

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: PATCH: 3.1.5 - Small Src/ patches that were overlooked

[Peter Stephenson]

"Bart Schaefer" wrote:
> Goran Larsson's patch from zsh-workers/4105 to nul-terminate a string in
> the stat module.

This isn't actually necessary: you'll see that pm[10] now gets set to
zero, just in a different place from where Goran's patch put it.

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarotti 2, 56100 Pisa, Italy

Re: PATCH: 3.1.5 - Small Src/ patches that were overlooked

[Zefram]

Bart Schaefer wrote:
>My patch from zsh-workers/4421 for restore_params() segfault.

I want to know more about this before including the patch.  There should
never be a NULL pointer there, so the real bug is in whatever is adding
a NULL to that list.  Can you reproduce the bug?

-zefram