tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
revision 1.17
date: 2014/10/18 20:43:52;  author: doug;  state: Exp;  lines: +10 -10;  commitid: I74hI1tVZtsspKEt;
Better POSIX compliance in realpath(3).

millert@ made changes to realpath.c based on FreeBSD's version.  I merged
Todd's changes into dl_realpath.c.

ok millert@, guenther@
This commit is contained in:
Damien Miller 2015-10-14 08:26:24 +11:00
parent e929a43f95
commit c39ad23b06
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openbsd-compat/realpath.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: realpath.c,v 1.16 2013/04/05 12:59:54 kurt Exp $ */ /* $OpenBSD: realpath.c,v 1.17 2014/10/18 20:43:52 doug Exp $ */
/* /*
* Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru> * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
* *
@ -62,6 +62,10 @@ realpath(const char *path, char *resolved)
int serrno, slen, mem_allocated; int serrno, slen, mem_allocated;
char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX]; char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
if (path == NULL) {
errno = EINVAL;
return (NULL);
}
if (path[0] == '\0') { if (path[0] == '\0') {
errno = ENOENT; errno = ENOENT;
return (NULL); return (NULL);
@ -147,22 +151,15 @@ realpath(const char *path, char *resolved)
} }
/* /*
* Append the next path component and lstat() it. If * Append the next path component and lstat() it.
* lstat() fails we still can return successfully if
* there are no more path components left.
*/ */
resolved_len = strlcat(resolved, next_token, PATH_MAX); resolved_len = strlcat(resolved, next_token, PATH_MAX);
if (resolved_len >= PATH_MAX) { if (resolved_len >= PATH_MAX) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
goto err; goto err;
} }
if (lstat(resolved, &sb) != 0) { if (lstat(resolved, &sb) != 0)
if (errno == ENOENT && p == NULL) {
errno = serrno;
return (resolved);
}
goto err; goto err;
}
if (S_ISLNK(sb.st_mode)) { if (S_ISLNK(sb.st_mode)) {
if (symlinks++ > MAXSYMLINKS) { if (symlinks++ > MAXSYMLINKS) {
errno = ELOOP; errno = ELOOP;
@ -205,6 +202,9 @@ realpath(const char *path, char *resolved)
} }
} }
left_len = strlcpy(left, symlink, sizeof(left)); left_len = strlcpy(left, symlink, sizeof(left));
} else if (!S_ISDIR(sb.st_mode) && p != NULL) {
errno = ENOTDIR;
goto err;
} }
} }