Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: ZSH_SCRIPT
>>>>> On March 3, 2016 Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx> wrote:
> On Mar 3, 12:44pm, Bart Schaefer wrote:
> } Subject: Re: ZSH_SCRIPT
> }
> } Sorry to seem mercurial, but I don't think there's any real reason that
> } all those set?param() calls need to be inside createparamtable().
> For that matter, it appears the zsh_name global could also be localized
> to zsh_main() and then passed down to setupvals(). No need to set that
> in createparamtable() either.
No problem, how do you like this?
Greg
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index ae859ce..d23c459 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 unset.
+)
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..20a07eb 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -802,7 +802,7 @@ init_term(void)
/**/
void
-setupvals(char *cmd)
+setupvals(char *cmd, char *runscript, char *zsh_name)
{
#ifdef USE_GETPWUID
struct passwd *pswd;
@@ -1089,6 +1089,9 @@ setupvals(char *cmd)
if (cmd)
setsparam("ZSH_EXECUTION_STRING", ztrdup(cmd));
+ if (runscript)
+ setsparam("ZSH_SCRIPT", ztrdup(runscript));
+ setsparam("ZSH_NAME", ztrdup(zsh_name)); /* NOTE: already metafied early in zsh_main() */
}
/*
@@ -1270,7 +1273,7 @@ run_init_scripts(void)
/**/
void
-init_misc(char *cmd)
+init_misc(char *cmd, char *zsh_name)
{
#ifndef RESTRICTED_R
if ( restricted )
@@ -1606,7 +1609,7 @@ mod_export int use_exit_printed;
mod_export int
zsh_main(UNUSED(int argc), char **argv)
{
- char **t, *runscript = NULL;
+ char **t, *runscript = NULL, *zsh_name;
char *cmd; /* argument to -c */
int t0;
#ifdef USE_LOCALE
@@ -1660,14 +1663,14 @@ zsh_main(UNUSED(int argc), char **argv)
SHTTY = -1;
init_io(cmd);
- setupvals(cmd);
+ setupvals(cmd, runscript, zsh_name);
init_signals();
init_bltinmods();
init_builtins();
run_init_scripts();
setupshin(runscript);
- init_misc(cmd);
+ init_misc(cmd, zsh_name);
for (;;) {
/*
diff --git a/Src/params.c b/Src/params.c
index 8bd8a8e..51ee886 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -80,8 +80,7 @@ char *argzero, /* $0 */
*rprompt, /* $RPROMPT */
*rprompt2, /* $RPROMPT2 */
*sprompt, /* $SPROMPT */
- *wordchars, /* $WORDCHARS */
- *zsh_name; /* $ZSH_NAME */
+ *wordchars; /* $WORDCHARS */
/**/
mod_export
char *ifs, /* $IFS */
@@ -812,8 +811,7 @@ createparamtable(void)
setsparam("OSTYPE", ztrdup_metafy(OSTYPE));
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(posixzero));
setsparam("ZSH_VERSION", ztrdup_metafy(ZSH_VERSION));
setsparam("ZSH_PATCHLEVEL", ztrdup_metafy(ZSH_PATCHLEVEL));
setaparam("signals", sigptr = zalloc((SIGCOUNT+4) * sizeof(char *)));
Messages sorted by:
Reverse Date,
Date,
Thread,
Author