[systemd-commits] src/shared

Thomas H.P. Andersen phomes at kemper.freedesktop.org
Sat Nov 30 15:13:35 PST 2013


 src/shared/util.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27373e442747010dfc195296c0705f67e905a611
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Sat Nov 30 23:45:31 2013 +0100

    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 38134ae..206fc80 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);



More information about the systemd-commits mailing list