Free() is not allowed to modify errno, remove safety brackets around it [1].

Add small optimization, do not copy a string to the buffer that is
to be freed immediately after.

Noted by:	jh [1]
Reviewed by:	jh
MFC after:	2 weeks
This commit is contained in:
kib 2010-04-20 14:22:29 +00:00
parent 6dda1433c8
commit 725cebd246

View File

@ -84,12 +84,10 @@ realpath(const char * __restrict path, char * __restrict resolved)
left_len = strlcpy(left, path + 1, sizeof(left));
} else {
if (getcwd(resolved, PATH_MAX) == NULL) {
strlcpy(resolved, ".", PATH_MAX);
if (m) {
serrno = errno;
if (m)
free(resolved);
errno = serrno;
}
else
strlcpy(resolved, ".", PATH_MAX);
return (NULL);
}
resolved_len = strlen(resolved);
@ -168,11 +166,8 @@ realpath(const char * __restrict path, char * __restrict resolved)
errno = serrno;
return (resolved);
}
if (m) {
serrno = errno;
if (m)
free(resolved);
errno = serrno;
}
return (NULL);
}
if (S_ISLNK(sb.st_mode)) {
@ -184,11 +179,8 @@ realpath(const char * __restrict path, char * __restrict resolved)
}
slen = readlink(resolved, symlink, sizeof(symlink) - 1);
if (slen < 0) {
if (m) {
serrno = errno;
if (m)
free(resolved);
errno = serrno;
}
return (NULL);
}
symlink[slen] = '\0';