diff options
| author | joerg <joerg> | 2008-08-02 20:33:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-08-02 20:33:50 +0000 |
| commit | 7be93b44a0d2e33aa0dd07de5f5b673bf95b27c8 (patch) | |
| tree | 8901b5966bac844405a560018181d94cc4eccd35 /pkgtools/pkg_install/files/delete/main.c | |
| parent | f3a58140319f67643ea733850de213b695037b07 (diff) | |
| download | pkgsrc-7be93b44a0d2e33aa0dd07de5f5b673bf95b27c8.tar.gz | |
Most memory allocation failures were fatal already and the majority of
the rest lacked an explicit check. Add the usual x* wrappers around
malloc and friends that explicitly terminate on error and use them in
all but Dewey.
Diffstat (limited to 'pkgtools/pkg_install/files/delete/main.c')
| -rw-r--r-- | pkgtools/pkg_install/files/delete/main.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c index 26e44c46bd1..c72dd43a8b0 100644 --- a/pkgtools/pkg_install/files/delete/main.c +++ b/pkgtools/pkg_install/files/delete/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.21.8.1 2008/07/30 15:38:37 joerg Exp $ */ +/* $NetBSD: main.c,v 1.21.8.2 2008/08/02 20:33:50 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #if 0 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp"; #else -__RCSID("$NetBSD: main.c,v 1.21.8.1 2008/07/30 15:38:37 joerg Exp $"); +__RCSID("$NetBSD: main.c,v 1.21.8.2 2008/08/02 20:33:50 joerg Exp $"); #endif #endif @@ -94,8 +94,7 @@ main(int argc, char **argv) break; case 'K': - if ((Pkgdb = strdup(optarg)) == NULL) - err(EXIT_FAILURE, "strdup failed"); + Pkgdb = xstrdup(optarg); break; case 'N': @@ -149,13 +148,12 @@ main(int argc, char **argv) TAILQ_INIT(&pkgs); if (Pkgdb == NULL) - Pkgdb = strdup(_pkgdb_getPKGDB_DIR()); + Pkgdb = xstrdup(_pkgdb_getPKGDB_DIR()); if (Destdir != NULL) { char *pkgdbdir; - if (asprintf(&pkgdbdir, "%s/%s", Destdir, Pkgdb) == -1) - err(EXIT_FAILURE, "asprintf failed"); + pkgdbdir = xasprintf("%s/%s", Destdir, Pkgdb); _pkgdb_setPKGDB_DIR(pkgdbdir); free(pkgdbdir); } else { |