D24750.diff
No OneTemporary
Actions

Size

705 B

Referenced Files

None

Subscribers

None

D24750.diff
View Options

	Index: head/usr.sbin/pkg/pkg.c
	===================================================================
	--- head/usr.sbin/pkg/pkg.c
	+++ head/usr.sbin/pkg/pkg.c
	@@ -1050,8 +1050,16 @@

	if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) {
	bootstrap_only = true;
	- if (argc == 3 && strcmp(argv[2], "-f") == 0)
	+ if (argc > 3) {
	+ fprintf(stderr, "Too many arguments\nUsage: pkg bootstrap [-f]\n");
	+ exit(EXIT_FAILURE);
	+ }
	+ if (argc == 3 && strcmp(argv[2], "-f") == 0) {
	force = true;
	+ } else if (argc == 3) {
	+ fprintf(stderr, "Invalid argument specified\nUsage: pkg bootstrap [-f]\n");
	+ exit(EXIT_FAILURE);
	+ }
	}

	if ((bootstrap_only && force) \|\| access(pkgpath, X_OK) == -1) {