diff options
author | jkh <jkh@FreeBSD.org> | 1997-06-30 03:15:40 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-06-30 03:15:40 +0000 |
commit | 3ba08b5d310d322e4515c16a4e0a78d86455aadf (patch) | |
tree | f729891a50eb28bcc4a7e4a70d82088a452a5a1f /usr.sbin/pkg_install/lib/plist.c | |
parent | ef60b19dcaace9c184fff55869ae9f9a7a110d31 (diff) | |
download | FreeBSD-src-3ba08b5d310d322e4515c16a4e0a78d86455aadf.zip FreeBSD-src-3ba08b5d310d322e4515c16a4e0a78d86455aadf.tar.gz |
YAMF22 - deletes and preserve option fixes.
Diffstat (limited to 'usr.sbin/pkg_install/lib/plist.c')
-rw-r--r-- | usr.sbin/pkg_install/lib/plist.c | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index 5380187..8440e3c 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: plist.c,v 1.19 1997/02/22 16:09:51 peter Exp $"; +static const char *rcsid = "$Id: plist.c,v 1.20 1997/06/29 10:41:49 jkh Exp $"; #endif /* @@ -384,6 +384,7 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) break; case PLIST_FILE: + last_file = p->name; sprintf(tmp, "%s/%s", Where, p->name); if (isdir(tmp)) { whinge("Attempting to delete directory `%s' as a file\n" @@ -408,27 +409,26 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) } if (Verbose) printf("Delete file %s\n", tmp); - if (!Fake && preserve) { - if (!name) - whinge("preserve set but no package name supplied!"); - else { - char tmp2[FILENAME_MAX]; - - snprintf(tmp2, FILENAME_MAX, "%s.%s", tmp, name); - if (fexists(tmp2)) { - (void)chflags(tmp, 0); - delete_hierarchy(tmp, TRUE, TRUE); - if (rename(tmp2, tmp)) - whinge("preserve: Unable to restore %s as %s, errno = %d", tmp2, tmp, errno); + if (!Fake) { + if (delete_hierarchy(tmp, ign_err, nukedirs)) { + whinge("Unable to completely remove file '%s'", tmp); + fail = FAIL; + } + if (preserve) { + if (!name) + whinge("preserve set but no package name supplied!"); + else { + char tmp2[FILENAME_MAX]; + + snprintf(tmp2, FILENAME_MAX, "%s.%s", tmp, name); + if (fexists(tmp2)) { + if (rename(tmp2, tmp)) + whinge("preserve: Unable to restore %s as %s, errno = %d", tmp2, tmp, errno); + } } } } - else if (!Fake && delete_hierarchy(tmp, ign_err, nukedirs)) { - whinge("Unable to completely remove file '%s'", tmp); - fail = FAIL; - } } - last_file = p->name; break; case PLIST_DIR_RM: @@ -470,13 +470,17 @@ delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs) if (!fexists(dir)) { if (!ign_err) whinge("%s `%s' doesn't really exist.", isdir(dir) ? "Directory" : "File", dir); - } else if (nukedirs) { + return !ign_err; + } + else if (nukedirs) { if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), dir)) return 1; - } else if (isdir(dir)) { + } + else if (isdir(dir)) { if (RMDIR(dir) && !ign_err) return 1; - } else { + } + else { if (REMOVE(dir, ign_err)) return 1; } |