diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-07-22 12:52:24 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-07-22 12:52:24 -0700 |
| commit | a1f8d4ffc73293e0461c01ff005194a474854376 (patch) | |
| tree | 6d625d2e0e5321c4fd8d160cbadac2354c243f86 /Src/Modules | |
| parent | 045bd4e3a6eb1d2a8a7b0a16a1b00f477c0112ed (diff) | |
| download | zsh-a1f8d4ffc73293e0461c01ff005194a474854376.tar.gz zsh-a1f8d4ffc73293e0461c01ff005194a474854376.zip | |
35826: add getsparam_u() to return unmetafied string, use it for a number of references to non-special params
Diffstat (limited to 'Src/Modules')
| -rw-r--r-- | Src/Modules/newuser.c | 2 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Src/Modules/newuser.c b/Src/Modules/newuser.c index 71902da7d..efdb2abba 100644 --- a/Src/Modules/newuser.c +++ b/Src/Modules/newuser.c @@ -67,7 +67,7 @@ check_dotfile(const char *dotdir, const char *fname) int boot_(UNUSED(Module m)) { - const char *dotdir = getsparam("ZDOTDIR"); + const char *dotdir = getsparam_u("ZDOTDIR"); const char *spaths[] = { #ifdef SITESCRIPT_DIR SITESCRIPT_DIR, diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 09d4bd703..30f517658 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -731,7 +731,7 @@ zfgetmsg(void) stopit = (*ptr++ != '-'); queue_signals(); - if (!(verbose = getsparam("ZFTP_VERBOSE"))) + if (!(verbose = getsparam_u("ZFTP_VERBOSE"))) verbose = ""; if (strchr(verbose, lastcodestr[0])) { /* print the whole thing verbatim */ @@ -1785,7 +1785,7 @@ zftp_open(char *name, char **args, int flags) char *hname; alarm(0); queue_signals(); - if ((hname = getsparam("ZFTP_HOST")) && *hname) + if ((hname = getsparam_u("ZFTP_HOST")) && *hname) zwarnnam(name, "timeout connecting to %s", hname); else zwarnnam(name, "timeout on host name lookup"); @@ -3077,7 +3077,7 @@ bin_zftp(char *name, char **args, UNUSED(Options ops), UNUSED(int func)) } queue_signals(); - if ((prefs = getsparam("ZFTP_PREFS"))) { + if ((prefs = getsparam_u("ZFTP_PREFS"))) { zfprefs = 0; for (ptr = prefs; *ptr; ptr++) { switch (toupper(STOUC(*ptr))) { |