From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Sat, 30 Nov 2013 22:45:31 +0000 (+0100)
Subject: util.c: check if return value from ttyname_r is > 0 instead of != 0
X-Git-Tag: v209~1178
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=27373e442747010dfc195296c0705f67e905a611;hp=a051da35ce96923e31a532c86a530bfd40d5dc76;p=elogind.git

util.c: check if return value from ttyname_r is > 0 instead of != 0

We must return a negative error code from getttyname_malloc but
that would not be the case if ttyname_r returned a negative value.

ttyname_r should only return EBADF, ENOTTY, or ERANGE so it should
be safe to change.
---

diff --git a/src/shared/util.c b/src/shared/util.c
index 38134ae52..206fc803d 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2501,7 +2501,7 @@ int getttyname_malloc(int fd, char **r) {
         assert(r);
 
         k = ttyname_r(fd, path, sizeof(path));
-        if (k != 0)
+        if (k > 0)
                 return -k;
 
         char_array_0(path);