diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
| commit | cc78bdc31749e9754120ae5a9d4849f4832b40a4 (patch) | |
| tree | 4f9e3f2064e56651ed8d41ae9d8ce8b08fc5241b /lib/userspec.c | |
| parent | 8425beb209e6fedf50bcdd934ced14dfa0d7b596 (diff) | |
| parent | 71cd8e3a743046573744123777061b64881bf372 (diff) | |
| download | coreutils-cc78bdc31749e9754120ae5a9d4849f4832b40a4.tar.gz | |
Merge tag 'upstream/8.24'
Upstream version 8.24
Conflicts:
INSTALL
Makefile.in
aclocal.m4
build-aux/config.guess
build-aux/config.rpath
build-aux/config.sub
build-aux/depcomp
build-aux/missing
build-aux/test-driver
build-aux/texinfo.tex
doc/coreutils.info
doc/stamp-vti
doc/version.texi
gnulib-tests/Makefile.in
po/Makefile.in.in
Diffstat (limited to 'lib/userspec.c')
| -rw-r--r-- | lib/userspec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/userspec.c b/lib/userspec.c index 1be9266e..84632c37 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -1,5 +1,5 @@ /* userspec.c -- Parse a user and group string. - Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2014 Free Software + Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -234,7 +234,7 @@ parse_with_separator (char const *spec, char const *separator, free (u); free (gname); - return _(error_msg); + return error_msg ? _(error_msg) : NULL; } /* Extract from SPEC, which has the form "[user][:.][group]", |