pkgtools

morpheus pkg tools
git clone git://git.2f30.org/pkgtools.git
Log | Files | Refs | README | LICENSE

commit 72c226a65445ddc52e859a15b7009bf509660e44
parent d99f93e7f4ed126f1b25f743e0fa6611927dd9a9
Author: sin <sin@2f30.org>
Date:   Wed Jul  2 00:49:40 +0100

Stop as early as possible when encountering errors

Diffstat:
infopkg.c | 3++-
installpkg.c | 29+++++++++++++++++------------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/infopkg.c b/infopkg.c @@ -48,7 +48,8 @@ main(int argc, char *argv[]) for (i = 0; i < argc; i++) { if (!realpath(argv[i], path)) { weprintf("realpath %s:", argv[i]); - continue; + db_free(db); + exit(EXIT_FAILURE); } r = db_walk(db, own_pkg_cb, path); if (r < 0) { diff --git a/installpkg.c b/installpkg.c @@ -19,7 +19,7 @@ main(int argc, char *argv[]) struct pkg *pkg; char path[PATH_MAX]; char *prefix = "/"; - int i, r; + int i; ARGBEGIN { case 'v': @@ -41,8 +41,7 @@ main(int argc, char *argv[]) db = db_new(prefix); if (!db) exit(EXIT_FAILURE); - r = db_load(db); - if (r < 0) { + if (db_load(db) < 0) { db_free(db); exit(EXIT_FAILURE); } @@ -50,28 +49,34 @@ main(int argc, char *argv[]) for (i = 0; i < argc; i++) { if (!realpath(argv[i], path)) { weprintf("realpath %s:", argv[i]); - continue; + db_free(db); + exit(EXIT_FAILURE); } if (vflag == 1) printf("installing %s\n", path); pkg = pkg_load_file(db, path); - if (!pkg) - continue; + if (!pkg) { + db_free(db); + exit(EXIT_FAILURE); + } if (fflag == 0) { if (pkg_collisions(pkg) < 0) { - db_free(db); printf("not installed %s\n", path); + db_free(db); exit(EXIT_FAILURE); } } - if (db_add(db, pkg) < 0) - continue; - if (pkg_install(db, pkg) < 0) - continue; + if (db_add(db, pkg) < 0) { + db_free(db); + exit(EXIT_FAILURE); + } + if (pkg_install(db, pkg) < 0) { + db_free(db); + exit(EXIT_FAILURE); + } printf("installed %s\n", path); } db_free(db); - return EXIT_SUCCESS; }