32 lines
919 B
Diff
32 lines
919 B
Diff
From 27373e442747010dfc195296c0705f67e905a611 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
|
|
Date: Sat, 30 Nov 2013 23:45:31 +0100
|
|
Subject: [PATCH] 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.
|
|
---
|
|
src/shared/util.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git src/shared/util.c src/shared/util.c
|
|
index 38134ae..206fc80 100644
|
|
--- src/shared/util.c
|
|
+++ 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);
|
|
--
|
|
1.7.9.2
|
|
|