Permalink
Browse files

Sync to HEAD before merging.

  • Loading branch information...
jlam
jlam committed Sep 2, 2003
1 parent 94c1c29 commit 34014a06707753e354927113f0f0e5062a054653
Showing with 6 additions and 6 deletions.
  1. +6 −6 usr.sbin/pkg_install/delete/perform.c
@@ -1,11 +1,11 @@
-/* $NetBSD: perform.c,v 1.36.2.10 2003/08/21 22:13:08 jlam Exp $ */
+/* $NetBSD: perform.c,v 1.36.2.11 2003/09/02 07:27:44 jlam Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.36.2.10 2003/08/21 22:13:08 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.36.2.11 2003/09/02 07:27:44 jlam Exp $");
#endif
#endif
@@ -705,7 +705,7 @@ pkg_do(char *pkg)
if (fexists(REQUIRE_FNAME)) {
if (Verbose)
printf("Executing 'require' script.\n");
- vsystem("%s +x %s", CHMOD_CMD, REQUIRE_FNAME); /* be sure */
+ (void) fexec(CHMOD_CMD, "+x", REQUIRE_FNAME, NULL); /* be sure */
if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) {
warnx("package %s fails requirements %s", pkg,
Force ? "" : "- not deleted");
@@ -734,7 +734,7 @@ pkg_do(char *pkg)
if (Fake)
printf("Would execute de-install script at this point (arg: DEINSTALL).\n");
else {
- vsystem("%s +x %s", CHMOD_CMD, DEINSTALL_FNAME); /* make sure */
+ (void ) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL); /* make sure */
if (vsystem("./%s %s DEINSTALL", DEINSTALL_FNAME, pkg)) {
warnx("deinstall script returned error status");
if (!Force)
@@ -784,7 +784,7 @@ pkg_do(char *pkg)
if (Fake)
printf("Would execute post-de-install script at this point (arg: POST-DEINSTALL).\n");
else {
- vsystem("%s +x %s", CHMOD_CMD, DEINSTALL_FNAME); /* make sure */
+ (void ) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL); /* make sure */
if (vsystem("./%s %s POST-DEINSTALL", DEINSTALL_FNAME, pkg)) {
warnx("post-deinstall script returned error status");
if (!Force)
@@ -809,7 +809,7 @@ pkg_do(char *pkg)
warnx("%s is not empty", LogDir);
return 0;
} else {
- if (vsystem("%s -r %s", REMOVE_CMD, LogDir)) {
+ if (fexec(REMOVE_CMD, "-r", LogDir, NULL)) {
warnx("couldn't remove log entry in %s, deinstall failed", LogDir);
if (!Force)
return 1;

0 comments on commit 34014a0

Please sign in to comment.