diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/utils.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index b232c16af..828b7064f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-04-10 Peter Stephenson <p.stephenson@samsung.com> + + * Orlov Sergey: 40935: Src/utils.c: User names need metafying as + they can contain multibyte characters on some systems. + 2017-04-07 Bart Schaefer <schaefer@zsh.org> * 40940: Src/cond.c: untokenize names of condition features diff --git a/Src/utils.c b/Src/utils.c index b3fa3d24c..9701ea78a 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -1230,13 +1230,13 @@ adduserdir(char *s, char *t, int flags, int always) * named directory, since these are sometimes used for * special purposes. */ - nd->dir = ztrdup(t); + nd->dir = metafy(t, -1, META_DUP); } else - nd->dir = ztrduppfx(t, eptr - t); + nd->dir = metafy(t, eptr - t, META_DUP); /* The variables PWD and OLDPWD are not to be displayed as ~PWD etc. */ if (!strcmp(s, "PWD") || !strcmp(s, "OLDPWD")) nd->node.flags |= ND_NOABBREV; - nameddirtab->addnode(nameddirtab, ztrdup(s), nd); + nameddirtab->addnode(nameddirtab, metafy(s, -1, META_DUP), nd); } /* Get a named directory: this function can cause a directory name * |