aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install/lib/plist.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/pkg_install/lib/plist.c')
-rw-r--r--usr.sbin/pkg_install/lib/plist.c83
1 files changed, 23 insertions, 60 deletions
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 8cb33aa013bd..283b87f9c1b1 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -544,82 +544,45 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg)
int
delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs)
{
- char *cp1, *cp2, realdir[FILENAME_MAX];
+ char *cp1, *cp2;
- if (realdir == NULL) {
- warnx("Couldn't allocate enough memory\n");
- return (ign_err ? SUCCESS : FAIL);
- }
-
- if (issymlink(dir) && readlink(dir, realdir, FILENAME_MAX-1) == -1)
- return (ign_err ? SUCCESS : FAIL);
-
- strlcpy(realdir, dir, FILENAME_MAX-1);
-
- cp1 = cp2 = strdup(realdir);
- if (cp1 == NULL) {
- warnx("Couldn't allocate enough memory\n");
- return (ign_err ? SUCCESS : FAIL);
- }
-
- if (!fexists(realdir)) {
+ cp1 = cp2 = strdup(dir);
+ if (!fexists(dir)) {
if (!ign_err)
warnx("%s '%s' doesn't exist",
- isdir(realdir) ? "directory" : "file", realdir);
- free(cp1);
- return (ign_err ? SUCCESS : FAIL);
+ isdir(dir) ? "directory" : "file", dir);
+ return !ign_err;
}
else if (nukedirs) {
- if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), realdir)) {
- free(cp1);
- return (ign_err ? SUCCESS : FAIL);
- }
+ if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), dir))
+ return 1;
}
- else if (isdir(realdir)) {
- if (RMDIR(realdir)) {
- free(cp1);
- return (ign_err ? SUCCESS : FAIL);
- }
+ else if (isdir(dir) && !issymlink(dir)) {
+ if (RMDIR(dir) && !ign_err)
+ return 1;
}
else {
- if (REMOVE(realdir, ign_err)) {
- free(cp1);
- return (ign_err ? SUCCESS : FAIL);
- }
+ if (REMOVE(dir, ign_err))
+ return 1;
}
- if (!nukedirs) {
- free(cp1);
- return (SUCCESS);
- }
+ if (!nukedirs)
+ return 0;
while (cp2) {
if ((cp2 = strrchr(cp1, '/')) != NULL)
*cp2 = '\0';
- if (!isemptydir(realdir)) {
- free(cp1);
- return (SUCCESS);
- }
- if (RMDIR(realdir) && !ign_err) {
- if (!fexists(realdir)) {
- warnx("directory '%s' doesn't exist", realdir);
- free(cp1);
- return (SUCCESS);
- } else {
- free(cp1);
- return (FAIL);
- }
+ if (!isemptydir(dir))
+ return 0;
+ if (RMDIR(dir) && !ign_err) {
+ if (!fexists(dir))
+ warnx("directory '%s' doesn't exist", dir);
+ else
+ return 1;
}
/* back up the pathname one component */
if (cp2) {
- free(cp1);
- cp1 = strdup(realdir);
- if (cp1 == NULL) {
- warnx("Couldn't allocate enough memory\n");
- return (ign_err ? SUCCESS : FAIL);
- }
+ cp1 = strdup(dir);
}
}
- free(cp1);
- return (SUCCESS);
+ return 0;
}
-