Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID
	autolearn=ham autolearn_force=no version=3.4.1
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.me; 
	h=from:to:subject:reply-to:in-reply-to:references:mime-version:content-type; 
	s=smtpapi; bh=ZVTtXb/30yE0t1mWgrVeVK7iKLI=; b=wSBkc0DUWPAcjX62PY
	nTLLRYqI0atsASvLXUi+xlYOxBuqryTnkYkp62RqdZlmxYXFl14f6OJXMBcMyAwl
	0ZzBddIq4T4Qe613qJhCWSTudH083GocVOkDe9gDfJUuJ5i2+z6qbNbRNlHXxNsf
	8bLvCE42PURnm/GJ3X1iayF3o=
From: Greg Klanderman <gak@klanderman.net>
To: zsh-workers@zsh.org
Subject: Re: ZSH_SCRIPT
Reply-To: Greg Klanderman <gak@klanderman.net>
Date: Tue, 01 Mar 2016 15:14:17 -0500
In-Reply-To: <160301103630.ZM8094@torch.brasslantern.com> (Bart Schaefer's message of "Tue, 1 Mar 2016 10:36:30 -0800")
Message-ID: <871t7u7y7a.fsf@lwm.klanderman.net>
User-Agent: Gnus/5.1008 (Gnus v5.10.8) XEmacs/21.4.22 (linux)
References: <22221.59800.803540.618862@lwm.klanderman.net>
	<160224143153.ZM28994@torch.brasslantern.com>
	<20160225093344.0d2499d5@pwslap01u.europe.root.pri>
	<87r3g08ycp.fsf@lwm.klanderman.net>
	<160225150425.ZM14095@torch.brasslantern.com>
	<87lh6384y5.fsf@lwm.klanderman.net>
	<20160301092746.1472ae95@pwslap01u.europe.root.pri>
	<87fuwa8dpk.fsf@lwm.klanderman.net>
	<20160301150707.2ee18f01@pwslap01u.europe.root.pri>
	<874mcq889m.fsf@lwm.klanderman.net>
	<160301103630.ZM8094@torch.brasslantern.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SG-EID: i+zOheVB0lMUqP0z3X/8PPLe+C1hDfxH7g5ommK/LCoZguJyFP9cyeWhkS7fq8arXl0i8HwDZFWCCC
 jQnsi2wAFDYqBTlg6jTQjoW3ta7OiVc2m1fz+3BbspR1bMt0MLhqfgXVNbK1oPYg6oWRrzfk3FkS35
 orEE792nf3W9Ja5zQlH+510oVT2BYyc2kzeLAtMK2Dc88vH4jv2hfAro4Q==
X-Seq: zsh-workers 38061


Hi Bart, I wasn't sure if by "probably" you wanted someone (Peter?) to
comment but I think adding ztrdup should be safe and ztrdup_metafy is
used for the other variables so almost has to be right; here is an
updated patch.

Greg

diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index ae859ce..716c523 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -933,6 +933,13 @@ tt(zsh/zutil) module.
 )
 enditem()
 )
+vindex(ZSH_ARGZERO)
+item(tt(ZSH_ARGZERO))(
+If zsh was invoked to run a script, this is the name of the script.
+Otherwise, it is the name used to invoke the current shell.  This is
+the same as the value of tt($0) when the tt(POSIX_ARGZERO) option is
+set, but is always available.
+)
 vindex(ZSH_EXECUTION_STRING)
 item(tt(ZSH_EXECUTION_STRING))(
 If the shell was started with the option tt(-c), this contains
@@ -951,17 +958,15 @@ track of versions of the shell during development between releases;
 hence most users should not use it and should instead rely on
 tt($ZSH_VERSION).
 )
-vindex(ZSH_SCRIPT)
-item(tt(ZSH_SCRIPT))(
-If zsh was invoked to run a script, this is the name of the script.
-Otherwise, it is the name used to invoke the current shell.  This is
-the same as the value of tt($0) when the tt(POSIX_ARGZERO) option is
-set, but is always available.
-)
 item(tt(zsh_scheduled_events))(
 See ifzman(the section `The zsh/sched Module' in zmanref(zshmodules))\
 ifnzman(noderef(The zsh/sched Module)).
 )
+vindex(ZSH_SCRIPT)
+item(tt(ZSH_SCRIPT))(
+If zsh was invoked to run a script, this is the name of the script,
+otherwise it is the empty string.
+)
 vindex(ZSH_SUBSHELL <S>)
 item(tt(ZSH_SUBSHELL))(
 Readonly integer.  Initially zero, incremented each time the shell forks
diff --git a/Src/init.c b/Src/init.c
index 4097327..4b33ad2 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -1657,6 +1657,7 @@ zsh_main(UNUSED(int argc), char **argv)
     opts[PRIVILEGED] = (getuid() != geteuid() || getgid() != getegid());
     /* sets ZLE, INTERACTIVE, SHINSTDIN and SINGLECOMMAND */
     parseargs(argv, &runscript, &cmd);
+    zsh_script = ztrdup(runscript);
 
     SHTTY = -1;
     init_io(cmd);
diff --git a/Src/params.c b/Src/params.c
index 8bd8a8e..58dddc4 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -81,7 +81,8 @@ char *argzero,		/* $0           */
      *rprompt2,		/* $RPROMPT2    */
      *sprompt,		/* $SPROMPT     */
      *wordchars,	/* $WORDCHARS   */
-     *zsh_name;		/* $ZSH_NAME    */
+     *zsh_name,		/* $ZSH_NAME    */
+     *zsh_script;	/* $ZSH_SCRIPT  */
 /**/
 mod_export
 char *ifs,		/* $IFS         */
@@ -813,7 +814,8 @@ createparamtable(void)
     setsparam("TTY", ztrdup_metafy(ttystrname));
     setsparam("VENDOR", ztrdup_metafy(VENDOR));
     setsparam("ZSH_NAME", ztrdup_metafy(zsh_name));
-    setsparam("ZSH_SCRIPT", ztrdup(posixzero));
+    setsparam("ZSH_ARGZERO", ztrdup_metafy(posixzero));
+    setsparam("ZSH_SCRIPT", ztrdup_metafy(zsh_script));
     setsparam("ZSH_VERSION", ztrdup_metafy(ZSH_VERSION));
     setsparam("ZSH_PATCHLEVEL", ztrdup_metafy(ZSH_PATCHLEVEL));
     setaparam("signals", sigptr = zalloc((SIGCOUNT+4) * sizeof(char *)));