8241122 Workaround bad origin with trailing /. Fixes #31 — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Workaround bad origin with trailing /. Fixes #31

Baptiste Daroussin committed 14 years ago

commit 8241122f0b9d8d794c0e8185d1d81187852a8f8d
parent a140bf8

2 files changed +12 -0

modified libpkg/pkg_manifest.c

@@ -91,6 +91,10 @@ m_parse_name(struct pkg *pkg, char *buf)

 static int
 m_parse_origin(struct pkg *pkg, char *buf)
 {
 	/* Remove trailing / if any */
 	if (buf[strlen(buf) -1] == '/')
 		buf[strlen(buf) - 1] = '\0';
 	return (m_parse_set_string(pkg, buf, PKG_ORIGIN));
 }

modified pkg/info.c

@@ -194,6 +194,14 @@ exec_info(int argc, char **argv)

 		pkgname = argv[i];
 		/*
 		 * allow to search for origin with a trailing /
 		 * likes audio/linux-vsound depending on ${PORTSDIR}/audio/sox/
 		 */
 		if (pkgname[strlen(pkgname) -1] == '/')
 			pkgname[strlen(pkgname) -1] = '\0';
 		if (argc > 0) {
 			pkgversion = strrchr(pkgname, '>');
 			if (pkgversion == NULL)