diff options
| author | joerg <joerg> | 2008-08-01 19:14:42 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-08-01 19:14:42 +0000 |
| commit | f3a58140319f67643ea733850de213b695037b07 (patch) | |
| tree | 4f2bebbb6ca816e2ceb6b9006cf15d25db1d0181 | |
| parent | 46b703f175a05d2475333be76ba328d78a3300f9 (diff) | |
| download | pkgsrc-f3a58140319f67643ea733850de213b695037b07.tar.gz | |
Inline an obscuring debug macro.
| -rw-r--r-- | pkgtools/pkg_install/files/lib/plist.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgtools/pkg_install/files/lib/plist.c b/pkgtools/pkg_install/files/lib/plist.c index fb603da1e74..832ea4d6080 100644 --- a/pkgtools/pkg_install/files/lib/plist.c +++ b/pkgtools/pkg_install/files/lib/plist.c @@ -1,4 +1,4 @@ -/* $NetBSD: plist.c,v 1.17.4.4 2008/07/30 15:38:37 joerg Exp $ */ +/* $NetBSD: plist.c,v 1.17.4.5 2008/08/01 19:14:42 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp"; #else -__RCSID("$NetBSD: plist.c,v 1.17.4.4 2008/07/30 15:38:37 joerg Exp $"); +__RCSID("$NetBSD: plist.c,v 1.17.4.5 2008/08/01 19:14:42 joerg Exp $"); #endif #endif @@ -684,14 +684,6 @@ delete_package(Boolean ign_err, Boolean nukedirs, package_t *pkg, return fail; } -#ifdef DEBUG -#define RMDIR(dir) fexec(RMDIR_CMD, dir, NULL) -#define REMOVE(dir,ie) fexec_skipemtpy(REMOVE_CMD, (ie) ? "-f " : "", dir, NULL) -#else -#define RMDIR rmdir -#define REMOVE(file,ie) (remove(file) && !(ie)) -#endif - /* * Selectively delete a hierarchy * Returns 1 on error, 0 else. @@ -711,10 +703,10 @@ delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs) if (fexec_skipempty(REMOVE_CMD, "-r", ign_err ? "-f" : "", dir, NULL)) return 1; } else if (isdir(dir)) { - if (RMDIR(dir) && !ign_err) + if (rmdir(dir) && !ign_err) return 1; } else { - if (REMOVE(dir, ign_err)) + if (remove(dir) && !ign_err) return 1; } @@ -725,7 +717,7 @@ delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs) *cp2 = '\0'; if (!isemptydir(dir)) return 0; - if (RMDIR(dir) && !ign_err) { + if (rmdir(dir) && !ign_err) { if (!fexists(dir)) warnx("directory `%s' doesn't really exist", dir); else |