9704ce7 now that prefix is stored in pkg no need to get it from arguments — HardenedBSD-pkg

HardenedBSD Package Manager

now that prefix is stored in pkg no need to get it from arguments

Baptiste Daroussin committed 15 years ago

commit 9704ce70b71091b447def83e4a88d81e4941d04c
parent 3ce47c2ec4860f92ec38b2e95e9cd9e83f927083

3 files changed +6 -10

modified libpkg/pkg.h

@@ -345,7 +345,7 @@ int pkg_delete(struct pkg *, struct pkgdb *, int);

 int pkg_version_cmp(const char *, const char *);
 /* glue to deal with ports */
 int ports_parse_plist(struct pkg *, char *, const char *);
 int ports_parse_plist(struct pkg *, char *);
 int ports_parse_depends(struct pkg *, char *);
 int ports_parse_conflicts(struct pkg *, char *);
 int ports_parse_scripts(struct pkg *, char *);

modified libpkg/pkg_ports.c

@@ -10,7 +10,7 @@

 #include <sys/stat.h>
 int
 ports_parse_plist(struct pkg *pkg, char *plist, const char *prefix)
 ports_parse_plist(struct pkg *pkg, char *plist)
 {
 	char *plist_p, *buf, *p, *plist_buf;
 	int nbel, i;

@@ -19,6 +19,7 @@ ports_parse_plist(struct pkg *pkg, char *plist, const char *prefix)

 	char path[MAXPATHLEN];
 	char *last_plist_file = NULL;
 	char *cmd = NULL;
 	const char *prefix = NULL;
 	struct stat st;
 	int ret = EPKG_OK;
 	off_t sz = 0;

@@ -32,8 +33,7 @@ ports_parse_plist(struct pkg *pkg, char *plist, const char *prefix)

 	if ((ret = file_to_buffer(plist, &plist_buf, &sz)) != EPKG_OK)
 		return (ret);
 	if (prefix == NULL)
 		prefix = "/usr/local";
 	prefix = pkg_get(pkg, PKG_PREFIX);
 	nbel = split_chr(plist_buf, '\n');

modified pkg/register.c

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

 	char ch;
 	char *plist = NULL;
 	char *prefix = NULL;
 	char *v = NULL;
 	char *arch = NULL;
 	char *www = NULL;

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

 				plist = strdup(optarg);
 				break;
 			case 'p':
 				prefix = strdup(optarg);
 				pkg_set(pkg, PKG_PREFIX, optarg);
 				break;
 			case 'P':
 				ret += ports_parse_depends(pkg, optarg);

@@ -149,14 +148,11 @@ exec_register(int argc, char **argv)

 		return (ret);
 	}
 	ret += ports_parse_plist(pkg, plist, prefix);
 	ret += ports_parse_plist(pkg, plist);
 	if (ret < 0)
 		return (ret);
 	if (prefix != NULL)
 		free(prefix);
 	if (plist != NULL)
 		free(plist);