aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-07-27 15:05:49 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-07-27 15:05:49 +0000
commit380539bd4300e100878f71b3a0ca7dfb7ecdcc59 (patch)
treedb32c4e1831d42c8c33b1447ac3adbfdbe9d5c28 /src
parentFix canonicalize() to return NULL if path = "" (diff)
downloadportage-cvs-380539bd4300e100878f71b3a0ca7dfb7ecdcc59.tar.gz
portage-cvs-380539bd4300e100878f71b3a0ca7dfb7ecdcc59.tar.bz2
portage-cvs-380539bd4300e100878f71b3a0ca7dfb7ecdcc59.zip
ignore empty path argument to canonicalize
Diffstat (limited to 'src')
-rw-r--r--src/sandbox-1.1/ChangeLog4
-rw-r--r--src/sandbox-1.1/libsandbox.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/sandbox-1.1/ChangeLog b/src/sandbox-1.1/ChangeLog
index f7811fe..46d5e15 100644
--- a/src/sandbox-1.1/ChangeLog
+++ b/src/sandbox-1.1/ChangeLog
@@ -1,9 +1,9 @@
# ChangeLog for Path Sandbox
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.19 2003/07/27 14:31:50 azarah Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.20 2003/07/27 15:05:49 azarah Exp $
27 Jul 2003; Martin Schlemmer <azarah@gentoo.org> libsandbox.c :
- Fix canonicalize() to return NULL if path = "".
+ Fix canonicalize() to ignore calls with path = "".
27 Jul 2003; Martin Schlemmer <azarah@gentoo.org> getcwd.c, libsandbox.c,
sandbox_futils.c, canonicalize.c :
diff --git a/src/sandbox-1.1/libsandbox.c b/src/sandbox-1.1/libsandbox.c
index f6a077a..5948887 100644
--- a/src/sandbox-1.1/libsandbox.c
+++ b/src/sandbox-1.1/libsandbox.c
@@ -25,7 +25,7 @@
* as some of the InstallWatch code was used.
*
*
- * $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/libsandbox.c,v 1.8 2003/07/27 14:31:50 azarah Exp $
+ * $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/libsandbox.c,v 1.9 2003/07/27 15:05:49 azarah Exp $
*
*/
@@ -284,8 +284,8 @@ canonicalize(const char *path, char *resolved_path)
/* Do not try to resolve an empty path */
if ('\0' == path[0]) {
- errno = EINVAL;
- return -1;
+ errno = old_errno;
+ return 0;
}
retval = erealpath(path, resolved_path);