2a5fae5 libpkg: Use pkg_copy_file() to implement library backup — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

libpkg: Use pkg_copy_file() to implement library backup

Mark Johnston committed 8 months ago

commit 2a5fae56a433f1f94f91df78d489b573e892a96a
parent 27e7dfb

1 file changed +1 -19

modified libpkg/backup_lib.c

@@ -94,10 +94,7 @@ static void

 backup_library(struct pkgdb *db, struct pkg *p, const char *path)
 {
 	const char *libname;
 	char buf[BUFSIZ];
 	char *outbuf;
 	int from, to, backupdir;
 	ssize_t nread, nwritten;
 	if ((libname = strrchr(path, '/')) == NULL)
 		return;

@@ -141,21 +138,7 @@ backup_library(struct pkgdb *db, struct pkg *p, const char *path)

 		goto out;
 	}
 	memset(buf, '\0', sizeof(buf));
 	while ((nread = read(from, buf, sizeof(buf))) > 0) {
 		outbuf = buf;
 		do {
 			nwritten = write(to, outbuf, nread);
 			if (nwritten >= 0) {
 				nread -= nwritten;
 				outbuf += nwritten;
 			} else if (errno != EINTR) {
 				goto out;
 			}
 		} while (nread > 0);
 	}
 	if (nread == 0) {
 	if (pkg_copy_file(from, to)) {
 		if (close(to) < 0) {
 			to = -1;
 			goto out;

@@ -166,7 +149,6 @@ backup_library(struct pkgdb *db, struct pkg *p, const char *path)

 		return;
 	}
 out:
 	pkg_emit_errno("Fail to backup the library", libname);
 	if (backupdir >= 0)