X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmisc%2Frealpath.c;h=5756817943c208c66723f375c606451e7fe400f1;hb=c8ea985748a6857ac5db9ef50f9c92e2966c04d5;hp=8dcf5ec9fc8792e0299b656fee5a11700ad2348a;hpb=e98bdca9df8df791fe93ec8eec920fa8d14da1f5;p=musl diff --git a/src/misc/realpath.c b/src/misc/realpath.c index 8dcf5ec9..57568179 100644 --- a/src/misc/realpath.c +++ b/src/misc/realpath.c @@ -6,7 +6,7 @@ #include #include -char *realpath(const char *filename, char *resolved) +char *realpath(const char *restrict filename, char *restrict resolved) { int fd; ssize_t r; @@ -19,16 +19,16 @@ char *realpath(const char *filename, char *resolved) return 0; } + fd = open(filename, O_RDONLY|O_NONBLOCK); + if (fd < 0) return 0; + snprintf(buf, sizeof buf, "/proc/self/fd/%d", fd); + if (!resolved) { alloc = 1; resolved = malloc(PATH_MAX); if (!resolved) return 0; } - fd = open(filename, O_RDONLY|O_NONBLOCK); - if (fd < 0) return 0; - snprintf(buf, sizeof buf, "/proc/self/fd/%d", fd); - r = readlink(buf, resolved, PATH_MAX-1); if (r < 0) goto err; resolved[r] = 0;