D48107.id148009.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48107.id148009.diff
View Options

	diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h
	--- a/usr.sbin/pkg/pkg.h
	+++ b/usr.sbin/pkg/pkg.h
	@@ -63,4 +63,6 @@
	int siglen;
	};

	+char pkg_read_fd(int fd, size_t osz);
	+
	#endif /* _PKG_H */
	diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
	--- a/usr.sbin/pkg/pkg.c
	+++ b/usr.sbin/pkg/pkg.c
	@@ -451,32 +451,46 @@
	return (fingerprints);
	}

	+char *
	+pkg_read_fd(int fd, size_t *osz)
	+{
	+ char *obuf;
	+ char buf[4096];
	+ FILE *fp;
	+ ssize_t r;
	+
	+ obuf = NULL;
	+ *osz = 0;
	+ fp = open_memstream(&obuf, osz);
	+ if (fp == NULL)
	+ err(EXIT_FAILURE, "open_memstream()");
	+
	+ while ((r = read(fd, buf, sizeof(buf))) >0) {
	+ fwrite(buf, 1, r, fp);
	+ }
	+
	+ if (ferror(fp))
	+ errx(EXIT_FAILURE, "reading file");
	+
	+ fclose(fp);
	+
	+ return (obuf);
	+}
	+
	static struct pubkey *
	read_pubkey(int fd)
	{
	struct pubkey *pk;
	char *sigb;
	size_t sigsz;
	- FILE *sig;
	- char buf[4096];
	- int r;

	if (lseek(fd, 0, 0) == -1) {
	warn("lseek");
	return (NULL);
	}

	- sigsz = 0;
	- sigb = NULL;
	- sig = open_memstream(&sigb, &sigsz);
	- if (sig == NULL)
	- err(EXIT_FAILURE, "open_memstream()");
	-
	- while ((r = read(fd, buf, sizeof(buf))) >0) {
	- fwrite(buf, 1, r, sig);
	- }
	+ sigb = pkg_read_fd(fd, &sigsz);

	- fclose(sig);
	pk = calloc(1, sizeof(struct pubkey));
	pk->siglen = sigsz;
	pk->sig = calloc(1, pk->siglen);