Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › dfda7c6
move pkg_emit_manifest_file into public API and use it
Baptiste Daroussin committed 13 years ago
commit dfda7c6a690a6bcadf5075bc3232970ce5ecbef4
parent 91b9c36
3 files changed +3 -7
modified libpkg/pkg.h.in
@@ -763,6 +763,7 @@ int pkg_load_manifest_file(struct pkg *pkg, const char *fpath);
 * @return An error code.

 */

int pkg_emit_manifest(struct pkg *pkg, char **buf, bool compact);
+ 
int pkg_emit_manifest_file(struct pkg*, FILE *, bool);



/* pkg_dep */

const char *pkg_dep_get(struct pkg_dep const * const , const pkg_dep_attr);
modified libpkg/private/pkg.h
@@ -384,7 +384,6 @@ int pkg_register_shlibs(struct pkg *pkg);
void pkg_config_parse(yaml_document_t *doc, yaml_node_t *node, struct pkg_config *conf_by_key);



int pkg_emit_manifest_sbuf(struct pkg*, struct sbuf *, bool);
- 
int pkg_emit_manifest_file(struct pkg*, FILE *, bool);

int pkg_emit_filelist(struct pkg *, FILE *);



#endif
modified pkg/utils.c
@@ -195,7 +195,6 @@ print_info(struct pkg * const pkg, unsigned int options)
	const char *maintainer, *www, *comment, *desc, *message, *arch;

	const char *repopath;

	const char *tab;
- 
	char *m;

	unsigned opt;

	int64_t flatsize, newflatsize, newpkgsize;

	lic_t licenselogic;
@@ -229,11 +228,8 @@ print_info(struct pkg * const pkg, unsigned int options)
		pkg_config_string(PKG_CONFIG_REPO, &repourl);



	if (options & INFO_RAW) { /* Not for remote packages */
- 
		if (pkg_type(pkg) != PKG_REMOTE) {
- 
			pkg_emit_manifest(pkg, &m, false);
- 
			printf("%s\n", m);
- 
			free(m);
- 
		}
+ 
		if (pkg_type(pkg) != PKG_REMOTE)
+ 
			pkg_emit_manifest_file(pkg, stdout, false);

		return;

	}