summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2018-06-22 16:19:46 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2018-06-25 11:18:41 +0000
commit3d7215cc8277b39cd1e24ce5a04376d45bfbabf0 (patch)
tree3e176d5d2aee9ea5e1f8ea594fb5465b33446b93
parent0a6cb5078d223288f9d3ab779fcc57370a10a6bb (diff)
downloadzsh-3d7215cc8277b39cd1e24ce5a04376d45bfbabf0.tar.gz
zsh-3d7215cc8277b39cd1e24ce5a04376d45bfbabf0.zip
43091: In the (u) glob qualifier, expand and correct "unknown user" error messages.
-rw-r--r--ChangeLog5
-rw-r--r--Src/glob.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e83c53c7..51ebd1cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-25 Daniel Shahaf <d.s@daniel.shahaf.name>
+
+ * 43091: Src/glob.c: In the (u) glob qualifier, expand and
+ correct "unknown user" error messages.
+
2018-06-25 Peter Stephenson <p.stephenson@samsung.com>
* 43084: Doc/Zsh/zle.yo, Functions/Chpwd/zsh_directory_name_cdr,
diff --git a/Src/glob.c b/Src/glob.c
index 66a95329f..ed2c90bd8 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -1455,13 +1455,15 @@ zglob(LinkList list, LinkNode np, int nountok)
if ((pw = getpwnam(s + arglen)))
data = pw->pw_uid;
else {
- zerr("unknown user");
+ zerr("unknown username '%s'", s + arglen);
data = 0;
}
*tt = sav;
#else /* !USE_GETPWNAM */
sav = *tt;
- zerr("unknown user");
+ *tt = '\0';
+ zerr("unable to resolve non-numeric username '%s'", s + arglen);
+ *tt = sav;
data = 0;
#endif /* !USE_GETPWNAM */
if (sav)