math: fix undefined shift in logf

[musl] / src / unistd / ttyname_r.c

diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c
index 2255e2d..82acb75 100644 (file)
--- a/src/unistd/ttyname_r.c
+++ b/src/unistd/ttyname_r.c
@@ -1,22 +1,28 @@
 #include <unistd.h>
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <sys/stat.h>
+#include "syscall.h"
 
 int ttyname_r(int fd, char *name, size_t size)
 {
+       struct stat st1, st2;
        char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
        ssize_t l;
 
-       if (!isatty(fd)) return ENOTTY;
+       if (!isatty(fd)) return errno;
 
-       snprintf(procname, sizeof procname, "/proc/self/fd/%d", fd);
+       __procfdname(procname, fd);
        l = readlink(procname, name, size);
 
        if (l < 0) return errno;
        else if (l == size) return ERANGE;
-       else {
-               name[l] = 0;
-               return 0;
-       }
+
+       name[l] = 0;
+
+       if (stat(name, &st1) || fstat(fd, &st2))
+               return errno;
+       if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
+               return ENODEV;
+
+       return 0;
 }