e734327 Now pkg register register report CLI arguments parsing errors. — HardenedBSD-pkg

HardenedBSD Package Manager

Now pkg register register report CLI arguments parsing errors.

jlaffaye committed 15 years ago

commit e734327baefd1ecb5d2af8d82d1ab46dddeefb46
parent e2fa4f71cdfb7972911f0ea78cafb0d8d0484e90

2 files changed +12 -3

modified libpkg/pkg_ports.c

@@ -131,7 +131,9 @@ ports_parse_depends(struct pkg *pkg, char *depends)

 		buf = dep_p;
 		split_chr(dep_p, ':');
 		v = strrchr(dep_p, '-');
 		if ((v = strrchr(dep_p, '-')) == NULL)
 			return (pkg_error_set(EPKG_FATAL, "bad depends format"));
 		v[0] = '\0';
 		v++;

@@ -141,8 +143,10 @@ ports_parse_depends(struct pkg *pkg, char *depends)

 		pkg_adddep(pkg, name, buf, v);
 		dep_p += next + 1;
 		next = strlen(dep_p);
 		if (i != nbel) {
 			dep_p += next + 1;
 			next = strlen(dep_p);
 		}
 	}
 	return (0);

modified pkg/register.c

@@ -111,6 +111,11 @@ exec_register(int argc, char **argv)

 		}
 	}
 	if (ret != 0) {
 		pkg_error_warn("can not parse arguments");
 		return (1);
 	}
 	uname(&u);
 	if (arch == NULL) {
 		pkg_set(pkg, PKG_ARCH, u.machine);