82e6b3c Merge pull request #137 from yuripankov/master — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge pull request #137 from yuripankov/master

Baptiste Daroussin committed 14 years ago

commit 82e6b3c7dc42068d91c926b151711cd09ad16d73
parent 6eef194

2 files changed +4 -4

modified libpkg/pkg.c

@@ -155,7 +155,8 @@ pkg_vget(struct pkg const *const pkg, va_list ap)

 	while ((attr = va_arg(ap, int)) > 0) {
 		if (attr < PKG_NUM_FIELDS) {
 			*va_arg(ap, const char **) = sbuf_get(pkg->fields[attr]);
 			*va_arg(ap, const char **) = (pkg->fields[attr] != NULL)?
 			    sbuf_get(pkg->fields[attr]) : NULL;
 			continue;
 		}
 		switch (attr) {

@@ -739,7 +740,7 @@ pkg_appendscript(struct pkg *pkg, const char *cmd, pkg_script_t type)

 	if (s != NULL) {
 		sbuf_cat(s->data, cmd);
 		sbuf_done(s->data);
 		sbuf_finish(s->data);
 		return (EPKG_OK);
 	}

modified libpkg/pkg_util.c

@@ -31,9 +31,8 @@ sbuf_set(struct sbuf **buf, const char *str)

 char *
 sbuf_get(struct sbuf *buf)
 {
 	if (buf == NULL)
 		return (NULL);
 	assert(buf != NULL);
 	assert((buf->s_flags & SBUF_FINISHED) == SBUF_FINISHED);
 	return (buf->s_buf);