X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=src%2Fmisc%2Frealpath.c;h=4cc7e7debe281c11b6979e3f3bbaec73a4803a59;hb=0a8d98285f46f721dabf38485df916c02d6a4675;hp=8dcf5ec9fc8792e0299b656fee5a11700ad2348a;hpb=e98bdca9df8df791fe93ec8eec920fa8d14da1f5;p=musl

diff --git a/src/misc/realpath.c b/src/misc/realpath.c
index 8dcf5ec9..4cc7e7de 100644
--- a/src/misc/realpath.c
+++ b/src/misc/realpath.c
@@ -1,49 +1,45 @@
 #include <stdlib.h>
-#include <stdio.h>
 #include <limits.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
+#include <string.h>
+#include "syscall.h"
 
-char *realpath(const char *filename, char *resolved)
+void __procfdname(char *, unsigned);
+
+char *realpath(const char *restrict filename, char *restrict resolved)
 {
 	int fd;
 	ssize_t r;
 	struct stat st1, st2;
 	char buf[15+3*sizeof(int)];
-	int alloc = 0;
+	char tmp[PATH_MAX];
 
 	if (!filename) {
 		errno = EINVAL;
 		return 0;
 	}
 
-	if (!resolved) {
-		alloc = 1;
-		resolved = malloc(PATH_MAX);
-		if (!resolved) return 0;
-	}
-
-	fd = open(filename, O_RDONLY|O_NONBLOCK);
+	fd = syscall(SYS_open, filename, O_PATH|O_NONBLOCK|O_CLOEXEC|O_LARGEFILE);
 	if (fd < 0) return 0;
-	snprintf(buf, sizeof buf, "/proc/self/fd/%d", fd);
+	__procfdname(buf, fd);
 
-	r = readlink(buf, resolved, PATH_MAX-1);
+	r = readlink(buf, tmp, sizeof tmp - 1);
 	if (r < 0) goto err;
-	resolved[r] = 0;
+	tmp[r] = 0;
 
 	fstat(fd, &st1);
-	r = stat(resolved, &st2);
+	r = stat(tmp, &st2);
 	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
 		if (!r) errno = ELOOP;
 		goto err;
 	}
 
-	close(fd);
-	return resolved;
+	__syscall(SYS_close, fd);
+	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
 err:
-	if (alloc) free(resolved);
-	close(fd);
+	__syscall(SYS_close, fd);
 	return 0;
 }