0728e2b pkg_printf()-ify some more verbs: annotate, lock, set — HardenedBSD-pkg

modified pkg/annotate.c

@@ -65,26 +65,34 @@ usage_annotate(void)

 static int
 do_add(struct pkgdb *db, struct pkg *pkg, const char *tag, const char *value)
 {
 	const char	*pkgname, *pkgversion, *pkgorigin;
 	const char	*pkgname, *pkgversion;
 	int		 ret = EPKG_OK;
 	pkg_get(pkg, PKG_NAME, &pkgname, PKG_VERSION, &pkgversion, PKG_ORIGIN, &pkgorigin);
 	if (yes || query_tty_yesno("%s-%s: Add annotation tagged: %s with "
 	               "value: %s? [y/N]: ", pkgname, pkgversion,
                        tag, value)) {
 		ret = pkgdb_add_annotation(db, pkgorigin, tag, value);
 	if (yes || query_tty_yesno("%n-%v: Add annotation tagged: %S with "
 	               "value: %S? [y/N]: ", pkg, pkg, tag, value)) {
 		ret = pkgdb_add_annotation(db, pkg, tag, value);
 		if (ret == EPKG_OK) {
 			if (!quiet)
 				printf("%s-%s: added annotation tagged: %s\n",
 				    pkgname, pkgversion, tag);
 				pkg_printf("%n-%v: added annotation tagged:"
 				    " %S\n", pkg, pkg, tag);
 		} else if (ret == EPKG_WARN) {
 			if (!quiet)
 				warnx("%s-%s: Can't add annotation tagged: %s -- "
 				    "already exists", pkgname, pkgversion, tag);
 		} else
 			if (!quiet) {
 				pkg_get(pkg, PKG_NAME, &pkgname,
 					PKG_VERSION, &pkgversion);
 				warnx("%s-%s: Can't add annotation tagged: "
 				      "%s -- already exists", pkgname,
 				      pkgversion, tag);
 			}
 		} else {
 			pkg_get(pkg, PKG_NAME, &pkgname,
 				PKG_VERSION, &pkgversion);
 			warnx("%s-%s: Failed to add annotation tagged: %s",
 			    pkgname, pkgversion, tag);
 		}
 	}
 	return (ret);
 }

@@ -92,22 +100,24 @@ do_add(struct pkgdb *db, struct pkg *pkg, const char *tag, const char *value)

 static int
 do_modify(struct pkgdb *db, struct pkg *pkg, const char *tag, const char *value)
 {
 	const char	*pkgname, *pkgversion, *pkgorigin;
 	const char	*pkgname, *pkgversion;
 	int		 ret = EPKG_OK;
 	pkg_get(pkg, PKG_NAME, &pkgname, PKG_VERSION, &pkgversion, PKG_ORIGIN, &pkgorigin);
 	if (yes || query_tty_yesno("%s-%s: Change annotation tagged: %s to "
 		         "new value: %s? [y/N]: ",
 			 pkgname, pkgversion, tag, value)) {
 		ret = pkgdb_modify_annotation(db, pkgorigin, tag, value);
 	if (yes || query_tty_yesno("%n-%v: Change annotation tagged: %S to "
 		         "new value: %S? [y/N]: ", pkg, pkg, tag, value)) {
 		ret = pkgdb_modify_annotation(db, pkg, tag, value);
 		if (ret == EPKG_OK || ret == EPKG_WARN) {
 			if (!quiet)
 				printf("%s-%s: Modified annotation tagged: "
 				       "%s\n", pkgname, pkgversion, tag);
 		} else
 				pkg_printf("%n-%v: Modified annotation "
 				       "tagged: %S\n", pkg, pkg, tag);
 		} else {
 			pkg_get(pkg, PKG_NAME, &pkgname,
 				PKG_VERSION, &pkgversion);
 			warnx("%s-%s: Failed to modify annotation tagged: %s",
 			     pkgname, pkgversion, tag);
 		}
 	}
 	return (ret);
 }

@@ -115,26 +125,32 @@ do_modify(struct pkgdb *db, struct pkg *pkg, const char *tag, const char *value)

 static int
 do_delete(struct pkgdb *db, struct pkg *pkg, const char *tag)
 {
 	const char	*pkgname, *pkgversion, *pkgorigin;
 	const char	*pkgname, *pkgversion;
 	int		 ret = EPKG_OK;
 	pkg_get(pkg, PKG_NAME, &pkgname, PKG_VERSION, &pkgversion, PKG_ORIGIN, &pkgorigin);
 	if (yes || query_tty_yesno("%s-%s: Delete annotation tagged: %s [y/N]: ",
 			 pkgname, pkgversion, tag)) {
 		ret = pkgdb_delete_annotation(db, pkgorigin, tag);
 	if (yes || query_tty_yesno("%n-%v: Delete annotation tagged: %S "
 			 "[y/N]: ", pkg, pkg, tag)) {
 		ret = pkgdb_delete_annotation(db, pkg, tag);
 		if (ret == EPKG_OK) {
 			if (!quiet)
 				printf("%s-%s: Deleted annotation tagged: %s\n",
 				       pkgname, pkgversion, tag);
 				pkg_printf("%n-%v: Deleted annotation "
 				       "tagged: %S\n", pkg, pkg, tag);
 		} else if (ret == EPKG_WARN) {
 			if (!quiet)
 				warnx("%s-%s: Can't delete annotation tagged: "
 				     "%s -- because there is none", pkgname,
 				     pkgversion, tag);
 		} else
 			if (!quiet) {
 				pkg_get(pkg, PKG_NAME, &pkgname,
 					PKG_VERSION, &pkgversion);
 				warnx("%s-%s: Can't delete annotation "
 				     "tagged: %s -- because there is none",
 				     pkgname, pkgversion, tag);
 			}
 		} else {
 			pkg_get(pkg, PKG_NAME, &pkgname,
 				PKG_VERSION, &pkgversion);
 			warnx("%s-%s: Failed to delete annotation tagged: %s",
 			     pkgname, pkgversion, tag);
 		}
 	}
 	return (ret);
 }

modified pkg/lock.c

@@ -59,25 +59,20 @@ static int

 do_lock(struct pkgdb *db, struct pkg *pkg)
 {
 	bool locked;
 	const char *pkgname;
 	const char *pkgversion;
 	pkg_get(pkg, PKG_NAME, &pkgname, PKG_VERSION, &pkgversion,
 		PKG_LOCKED, &locked);
 	if (locked) {
 		if (!quiet)
 			printf("%s-%s: already locked\n",
 			       pkgname, pkgversion);
 			pkg_printf("%n-%v: already locked\n",
 			       pkg, pkg);
 		return (EPKG_OK);
 	}
 	if (!yes && !query_yesno("%s-%s: lock this package? [y/N]: ",
 				 pkgname, pkgversion))
 	if (!yes && !query_yesno("%n-%v: lock this package? [y/N]: ",
 				 pkg, pkg))
 		return (EPKG_OK);
 	if (!quiet)
 		printf("Locking %s-%s\n", pkgname, pkgversion);
 		pkg_printf("Locking %n-%v\n", pkg, pkg);
 	return (pkgdb_set(db, pkg, PKG_SET_LOCKED, (int64_t)true));
 }

@@ -87,26 +82,19 @@ static int

 do_unlock(struct pkgdb *db, struct pkg *pkg)
 {
 	bool locked;
 	const char *pkgname;
 	const char *pkgversion;
 	pkg_get(pkg, PKG_NAME, &pkgname, PKG_VERSION, &pkgversion,
 		PKG_LOCKED, &locked);
 	if (!locked) {
 		if (!quiet)
 			printf("%s-%s: already unlocked\n",
 			       pkgname, pkgversion);
 			pkg_printf("%n-%v: already unlocked\n", pkg, pkg);
 		return (EPKG_OK);
 	}
 	if (!yes && !query_yesno("%s-%s: unlock this package? [y/N]: ",
 				 pkgname, pkgversion))
 	if (!yes && !query_yesno("%n-%v: unlock this package? [y/N]: ",
 				 pkg, pkg))
 		return (EPKG_OK);
 	if (!quiet)
 		printf("Unlocking %s-%s\n", pkgname, pkgversion);
 		pkg_printf("Unlocking %n-%v\n", pkg, pkg);
 	return (pkgdb_set(db, pkg, PKG_SET_LOCKED, (int64_t)false));
 }

modified pkg/set.c

@@ -58,8 +58,6 @@ exec_set(int argc, char **argv)

 	int64_t newautomatic = -1;
 	bool automatic = false;
 	const char *errstr;
 	const char *name;
 	const char *version;
 	char *neworigin = NULL;
 	char *oldorigin = NULL;
 	unsigned int loads = PKG_LOAD_BASIC;

@@ -165,14 +163,13 @@ exec_set(int argc, char **argv)

 			pkgdb_close(db);
 			return (EX_SOFTWARE);*/
 		}
 		if (pkg != NULL)
 			pkg_get(pkg, PKG_NAME, &name, PKG_VERSION, &version);
 		if (!yes) {
 			if (pkg != NULL)
 				yes = query_yesno("Change origin from %s to %s for %s-%s? [y/N]: ",
 				    oldorigin, neworigin, name, version);
 				yes = query_yesno("Change origin from %S to %S for %n-%v? [y/N]: ",
 				    oldorigin, neworigin, pkg, pkg);
 			else
 				yes = query_yesno("Change origin from %s to %s for all dependencies? "
 				yes = query_yesno("Change origin from %S to %S for all dependencies? "
 				    "[y/N]: ", oldorigin, neworigin);
 		}
 		if (pkg != NULL && yes) {

@@ -197,11 +194,10 @@ exec_set(int argc, char **argv)

 				if (automatic == newautomatic)
 					continue;
 				if (!yes) {
 					pkg_get(pkg, PKG_NAME, &name, PKG_VERSION, &version);
 					if (newautomatic)
 						yes = query_yesno("Mark %s-%s as automatically installed? [y/N]: ", name, version);
 						yes = query_yesno("Mark %n-%v as automatically installed? [y/N]: ", pkg, pkg);
 					else
 						yes = query_yesno("Mark %s-%s as not automatically installed? [y/N]: ", name, version);
 						yes = query_yesno("Mark %n-%v as not automatically installed? [y/N]: ", pkg, pkg);
 				}
 				if (yes)
 					pkgdb_set(db, pkg, PKG_SET_AUTOMATIC, newautomatic);

modified pkg/utils.c

@@ -59,7 +59,7 @@ query_tty_yesno(const char *msg, ...)

 	tty = fdopen(tty_fd, "r+");
 	va_start(ap, msg);
 	vfprintf(tty, msg, ap);
 	pkg_vfprintf(tty, msg, ap);
 	va_end(ap);
 	c = getc(tty);

@@ -84,7 +84,7 @@ query_yesno(const char *msg, ...)

 	va_list	 ap;
 	va_start(ap, msg);
 	vprintf(msg, ap);
 	pkg_vprintf(msg, ap);
 	va_end(ap);
 	c = getchar();