diff options
| author | Bart Schaefer <schaefer@zsh.org> | 2023-10-01 13:38:25 -0700 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2023-10-01 13:38:25 -0700 |
| commit | 0f0ba0539e9fdc063c73e3ac6751f77395c193ec (patch) | |
| tree | 9a216ba50f4f458089752f8eda1ccd02523c3ab4 | |
| parent | 29644f12e742883ec9502205cffb318e446d7ca3 (diff) | |
| download | zsh-0f0ba0539e9fdc063c73e3ac6751f77395c193ec.tar.gz zsh-0f0ba0539e9fdc063c73e3ac6751f77395c193ec.zip | |
52195: cached_username is already metafied when initializing LOGNAME
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/params.c | 7 |
2 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,8 @@ 2023-10-01 Bart Schaefer <schaefer@zsh.org> + * 52195: Src/params.c: cached_username is already metafied when + initializing LOGNAME + * 52193: Src/init.c, Src/params.c, Src/utils.c: metafy USERNAME (mostly for Cygwin compatibilty with UTF8 encodings) diff --git a/Src/params.c b/Src/params.c index 50e8627d1..957656e3f 100644 --- a/Src/params.c +++ b/Src/params.c @@ -850,12 +850,11 @@ createparamtable(void) setsparam("HOST", ztrdup_metafy(hostnam)); zfree(hostnam, 256); - setsparam("LOGNAME", ztrdup_metafy( + setsparam("LOGNAME", #ifndef DISABLE_DYNAMIC_NSS - (str = getlogin()) && *str ? str : + (str = getlogin()) && *str ? ztrdup_metafy(str) : #endif - cached_username - )); + ztrdup(cached_username)); #if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV) /* Copy the environment variables we are inheriting to dynamic * |