Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make really sure to only nuke LogDir when it's been set. Fixes problem

Browse Source 
described in PR 5308, code was contributed by Eivind Eklund <eivind@yes.no>.
This commit is contained in:
hubertf 1998-08-28 00:35:51 +00:00
parent 90c872591e
commit e6c468e777
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/pkg_install/add/perform.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.18 1998/08/27 23:37:35 hubertf Exp $ */
/* $NetBSD: perform.c,v 1.19 1998/08/28 00:35:51 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
__RCSID("$NetBSD: perform.c,v 1.18 1998/08/27 23:37:35 hubertf Exp $");
__RCSID("$NetBSD: perform.c,v 1.19 1998/08/28 00:35:51 hubertf Exp $");
#endif
#endif
@ -39,6 +39,7 @@ __RCSID("$NetBSD: perform.c,v 1.18 1998/08/27 23:37:35 hubertf Exp $");
static int pkg_do(char *);
static int sanity_check(char *);
static char LogDir[FILENAME_MAX];
static int zapLogDir; /* Should we delete LogDir? */
int
pkg_perform(char **pkgs)
@ -79,6 +80,7 @@ pkg_do(char *pkg)
int inPlace;
code = 0;
zapLogDir = 0;
LogDir[0] = '\0';
strcpy(playpen, FirstPen);
inPlace = 0;
@ -395,6 +397,7 @@ pkg_do(char *pkg)
goto success; /* well, partial anyway */
}
sprintf(LogDir, "%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR, PkgName);
zapLogDir = 1;
if (Verbose)
printf("Attempting to record package into %s.\n", LogDir);
if (make_hierarchy(LogDir)) {
@ -511,7 +514,7 @@ cleanup(int signo)
alreadyCleaning = 1;
if (signo)
printf("Signal %d received, cleaning up.\n", signo);
if (!Fake && LogDir[0])
if (!Fake && zapLogDir && LogDir[0])
vsystem("%s -rf %s", REMOVE_CMD, LogDir);
leave_playpen(Home);
if (signo)