1e7cc79 Use sysexits — HardenedBSD-pkg

HardenedBSD Package Manager

Use sysexits

Matthew Seaman committed 13 years ago

commit 1e7cc790a146f6710230bcd84ec4c53ae1fb51ec
parent 05b47f6dee9643057a1564b3c6f5b38c3388dca2

2 files changed +7 -6

modified pkg/query.c

@@ -765,7 +765,7 @@ exec_query(int argc, char **argv)

 	match_t match = MATCH_EXACT;
 	int ch;
 	int ret = EPKG_OK;
 	int retcode = EXIT_SUCCESS;
 	int retcode = EX_OK;
 	int i;
 	char multiline = 0;
 	char *condition = NULL;

@@ -820,12 +820,12 @@ exec_query(int argc, char **argv)

 	if (pkgname != NULL) {
 		if (pkg_open(&pkg, pkgname, NULL) != EPKG_OK) {
 			return (1);
 			return (EX_IOERR);
 		}
 		print_query(pkg, argv[0], multiline);
 		pkg_free(pkg);
 		return (EXIT_SUCCESS);
 		return (EX_OK);
 	}
 	if (condition != NULL) {

@@ -843,7 +843,7 @@ exec_query(int argc, char **argv)

 			return (EX_IOERR);
 		/* do not fail if run as a user */
 		return (EXIT_SUCCESS);
 		return (EX_OK);
 	}
 	if (ret != EPKG_OK)

modified pkg/register.c

@@ -97,7 +97,7 @@ exec_register(int argc, char **argv)

 	bool developer = false;
 	int i;
 	int ret = EPKG_OK, retcode = EPKG_OK;
 	int ret = EPKG_OK, retcode = EX_OK;
 	if (geteuid() != 0) {
 		warnx("registering packages can only be done as root");

@@ -216,7 +216,8 @@ exec_register(int argc, char **argv)

 		free(input_path);
 	}
 	retcode = pkgdb_register_ports(db, pkg);
 	if (pkgdb_register_ports(db, pkg) != EPKG_OK)
 		retcode = EX_SOFTWARE;
 	pkg_get(pkg, PKG_MESSAGE, &message);
 	if (message != NULL && !legacy)