remove incorrect cancellation points from realpath

This commit is contained in:
Rich Felker
2013-08-31 16:01:01 -04:00
parent dfddd43256
commit 35e8621a28

View File

@ -1,11 +1,11 @@
#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"
void __procfdname(char *, unsigned);
@ -22,7 +22,7 @@ char *realpath(const char *restrict filename, char *restrict resolved)
return 0;
}
fd = open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
fd = syscall(SYS_open, filename, O_PATH|O_NONBLOCK|O_CLOEXEC|O_LARGEFILE);
if (fd < 0) return 0;
__procfdname(buf, fd);
@ -37,9 +37,9 @@ char *realpath(const char *restrict filename, char *restrict resolved)
goto err;
}
close(fd);
__syscall(SYS_close, fd);
return resolved ? strcpy(resolved, tmp) : strdup(tmp);
err:
close(fd);
__syscall(SYS_close, fd);
return 0;
}