ae4d0a4 pkg-convert: Add locking. EXCLUSIVE by default, READONLY with -n — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg-convert: Add locking. EXCLUSIVE by default, READONLY with -n

Bryan Drewery committed 11 years ago

commit ae4d0a40a4f7ccd9bb5343fb2ae19627d841cbf5
parent 19d843a

1 file changed +10 -0

modified src/convert.c

@@ -240,6 +240,7 @@ convert_from_old(const char *pkg_add_dbdir, bool dry_run)

 	char		 path[MAXPATHLEN];
 	struct pkgdb	*db = NULL;
 	struct stat	 sb;
 	int		lock_type = PKGDB_LOCK_EXCLUSIVE;
 	if ((d = opendir(pkg_add_dbdir)) == NULL)
 		err(EX_NOINPUT, "%s", pkg_add_dbdir);

@@ -247,6 +248,14 @@ convert_from_old(const char *pkg_add_dbdir, bool dry_run)

 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		return (EX_IOERR);
 	}
 	if (dry_run)
 		lock_type = PKGDB_LOCK_READONLY;
 	if (pkgdb_obtain_lock(db, lock_type) != EPKG_OK) {
 		pkgdb_close(db);
 		warnx("Cannot get an advisory lock on a database, it is locked"
 		    " by another process");
 		return (EX_TEMPFAIL);
 	}
 	while ((dp = readdir(d)) != NULL) {
 		if (fstatat(dirfd(d), dp->d_name, &sb, 0) == 0 &&
 		    S_ISDIR(sb.st_mode)) {

@@ -271,6 +280,7 @@ convert_from_old(const char *pkg_add_dbdir, bool dry_run)

 	}
 	pkg_free(p);
 	pkgdb_release_lock(db, lock_type);
 	pkgdb_close(db);
 	return (EX_OK);
 }