diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-03 18:23:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-04 09:07:31 +0200 |
| commit | ef5c570edfd8afb20e3b04d3711e111a1dea0548 (patch) | |
| tree | 458750d6fc37079a2948f2f72220c2ecc96839ff | |
| parent | b3ac818be8d73c97dc4f74ba8bbd2091506df2e6 (diff) | |
util: document why parse_uid() returns ENXIO
parse_uid() returns EINVAL for invalid strings, but ENXIO for the
(uid_t) -1 user ids in order to distinguish these two cases. Document
this.
| -rw-r--r-- | src/basic/util.c | 5 | ||||
| -rw-r--r-- | src/test/test-util.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index beec7cb7dd..86aacad307 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -403,7 +403,10 @@ int parse_uid(const char *s, uid_t* ret_uid) { return -ERANGE; if (!uid_is_valid(uid)) - return -ENXIO; + return -ENXIO; /* we return ENXIO instead of EINVAL + * here, to make it easy to distuingish + * invalid numeric uids invalid + * strings. */ if (ret_uid) *ret_uid = uid; diff --git a/src/test/test-util.c b/src/test/test-util.c index dff38ab6f6..10d8d210d5 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -282,6 +282,9 @@ static void test_parse_uid(void) { r = parse_uid("65535", &uid); assert_se(r == -ENXIO); + + r = parse_uid("asdsdas", &uid); + assert_se(r == -EINVAL); } static void test_safe_atou16(void) { |