Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ab19386
dependencies: make origin information optional
Baptiste Daroussin committed 1 year ago
commit ab193863d5ba308b342b4ae01928f68dc070a9c3
parent e0c8bb5
1 file changed +6 -6
modified libpkg/pkg.c
@@ -460,9 +460,8 @@ pkg_adddep_chain(struct pkg_dep *chain,


	assert(pkg != NULL);

	assert(name != NULL && name[0] != '\0');
- 
	assert(origin != NULL && origin[0] != '\0');
- 
	pkg_debug(3, "Pkg: add a new dependency origin: %s, name: %s", origin, name);
+ 
	pkg_debug(3, "Pkg: add a new dependency origin: %s, name: %s", origin ? origin : "", name);

	if (pkghash_get(pkg->depshash, name) != NULL) {

		pkg_emit_error("%s: duplicate dependency listing: %s",

		    pkg->name, name);
@@ -470,7 +469,8 @@ pkg_adddep_chain(struct pkg_dep *chain,
	}



	d = xcalloc(1, sizeof(*d));
- 
	d->origin = xstrdup(origin);
+ 
	if (origin != NULL && origin[0] != '\0')
+ 
		d->origin = xstrdup(origin);

	d->name = xstrdup(name);

	if (version != NULL && version[0] != '\0')

		d->version = xstrdup(version);
@@ -496,12 +496,12 @@ pkg_addrdep(struct pkg *pkg, const char *name, const char *origin, const char *v


	assert(pkg != NULL);

	assert(name != NULL && name[0] != '\0');
- 
	assert(origin != NULL && origin[0] != '\0');
- 
	pkg_debug(3, "Pkg: add a new reverse dependency origin: %s, name: %s", origin, name);
+ 
	pkg_debug(3, "Pkg: add a new reverse dependency origin: %s, name: %s", origin ? origin : "", name);



	d = xcalloc(1, sizeof(*d));
- 
	d->origin = xstrdup(origin);
+ 
	if (origin != NULL && origin[0] != '\0')
+ 
		d->origin = xstrdup(origin);

	d->name = xstrdup(name);

	if (version != NULL && version[0] != '\0')

		d->version = xstrdup(version);