From: "Bart Schaefer" <schaefer@brasslantern.com>
To: zsh-workers@math.gatech.edu
Subject: PATCH: 3.1.5 - Small Src/ patches that were overlooked
Date: Sat, 31 Oct 1998 02:13:23 -0800 [thread overview]
Message-ID: <981031021323.ZM12234@candle.brasslantern.com> (raw)
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
next reply other threads:[~1998-10-31 10:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
1998-10-31 10:13 Bart Schaefer [this message]
1998-10-31 15:21 ` Peter Stephenson
1998-11-02 9:15 ` Zefram
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=981031021323.ZM12234@candle.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@math.gatech.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).