4c0496a Merge branch 'master' of etoilebsd.net:pkgng — HardenedBSD-pkg

HardenedBSD Package Manager

Merge branch 'master' of etoilebsd.net:pkgng

jlaffaye committed 15 years ago

commit 4c0496adb280441513149923974612b683fba25d
parent 9788b3f08d72e1e206aedbdee381bba6ff9fd4a4

5 files changed +5 -5

modified pkg/create.c

@@ -41,7 +41,7 @@ exec_create(int argc, char **argv)

 	const char *manifestdir = NULL;
 	pkg_formats fmt;
 	char mpath[MAXPATHLEN];
 	char ch;
 	int ch;
 	int retcode = 0;
 	int ret;
 	int query_flags = PKG_LOAD_DEPS | PKG_LOAD_CONFLICTS | PKG_LOAD_FILES |

modified pkg/delete.c

@@ -22,7 +22,7 @@ exec_delete(int argc, char **argv)

 	struct pkgdb_it *it;
 	match_t match = MATCH_EXACT;
 	char *origin = NULL;
 	char ch;
 	int ch;
 	int ret;
 	int flags = PKG_LOAD_BASIC;
 	int force = 0;

modified pkg/info.c

@@ -102,7 +102,7 @@ exec_info(int argc, char **argv)

 	unsigned int opt = 0;
 	match_t match = MATCH_EXACT;
 	char *pkgname, *pkgversion;
 	char ch;
 	int ch;
 	int ret;
 	int retcode = 0;
 	bool gotone = false;

modified pkg/register.c

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

 	regex_t preg;
 	regmatch_t pmatch[2];
 	char ch;
 	int ch;
 	char *plist = NULL;
 	char *v = NULL;
 	char *arch = NULL;

modified pkg/version.c

@@ -17,7 +17,7 @@ usage_version(void)

 int exec_version(int argc, char **argv)
 {
 	unsigned int opt = 0;
 	char ch;
 	int ch;
 	while ((ch = getopt(argc, argv, "hIoqvlLXsOtT")) != -1) {
 		switch (ch) {