diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
| commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
| tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /hurd/get-host.c | |
| parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
| parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) | |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'hurd/get-host.c')
| -rw-r--r-- | hurd/get-host.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hurd/get-host.c b/hurd/get-host.c index a76ba5c095..2001fc5a86 100644 --- a/hurd/get-host.c +++ b/hurd/get-host.c @@ -1,5 +1,5 @@ /* Get a host configuration item kept as the whole contents of a file. - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -65,7 +65,7 @@ _hurd_get_host_config (const char *item, char *buf, size_t buflen) } /* If the file is empty, give an empty value. */ - if (nread == 0) + if (nread == 0 && more == 0) { if (buflen != 0) *buf = '\0'; @@ -80,7 +80,7 @@ _hurd_get_host_config (const char *item, char *buf, size_t buflen) if (nread < buflen) buf[nread] = '\0'; else - if (buf[nread - 1] != '\0') + if (nread != 0 && buf[nread - 1] != '\0') more = 1; if (more) |