Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5845a8f
Make -a the default for pkg-{check,query,rquery}
Bryan Drewery committed 14 years ago
commit 5845a8fae4bb72b20602c75c8ccacb61dc47cf78
parent edb8c8f
5 files changed +17 -7
modified pkg/check.c
@@ -317,7 +317,10 @@ exec_check(int argc, char **argv)
	argc -= optind;

	argv += optind;
- 
	if ((argc == 0 && match != MATCH_ALL) || !(dcheck || checksums || recomputeflatsize)) {
+ 
	/* Default to all packages if no pkg provided */
+ 
	if (argc == 0 && (dcheck || checksums || recomputeflatsize)) {
+ 
		match = MATCH_ALL;
+ 
	} else if ((argc == 0 && match != MATCH_ALL) || !(dcheck || checksums || recomputeflatsize)) {

		usage_check();

		return (EX_USAGE);

	}
modified pkg/pkg-query.8
@@ -25,7 +25,8 @@
.Nm

.Ao query-format Ac Ao pkg-name Ac

.Nm
- 
.Fl a Ao query-format Ac
+ 
.Op Fl a
+ 
.Ao query-format Ac

.Nm

.Fl F Ao pkg-name Ac Ao query-format Ac

.Nm
modified pkg/pkg-rquery.8
@@ -25,7 +25,7 @@
.Nm

.Ao query-format Ac Ao pkg-name Ac

.Nm
- 
.Fl a
+ 
.Op Fl a

.Op Fl r Ar reponame

.Ao query-format Ac

.Nm
modified pkg/query.c
@@ -654,7 +654,7 @@ void
usage_query(void)

{

	fprintf(stderr, "usage: pkg query <query-format> <pkg-name>\n");
- 
	fprintf(stderr, "       pkg query -a <query-format>\n");
+ 
	fprintf(stderr, "       pkg query [-a] <query-format>\n");

	fprintf(stderr, "       pkg query -F <pkg-name> <query-format>\n");

	fprintf(stderr, "       pkg query -e <evaluation> <query-format>\n");

	fprintf(stderr, "       pkg query [-gxX] <query-format> <pattern> <...>\n\n");
@@ -714,7 +714,10 @@ exec_query(int argc, char **argv)
		return (EX_USAGE);

	}
- 
	if ((argc == 1) ^ (match == MATCH_ALL) && pkgname == NULL && condition == NULL) {
+ 
	/* Default to all packages if no pkg provided */
+ 
	if (argc == 1 && pkgname == NULL && condition == NULL) {
+ 
		match = MATCH_ALL;
+ 
	} else if ((argc == 1) ^ (match == MATCH_ALL) && pkgname == NULL && condition == NULL) {

		usage_query();

		return (EX_USAGE);

	}
modified pkg/rquery.c
@@ -67,7 +67,7 @@ void
usage_rquery(void)

{

	fprintf(stderr, "usage: pkg rquery [-r reponame] <query-format> <pkg-name>\n");
- 
	fprintf(stderr, "       pkg rquery -a [-r reponame] <query-format>\n");
+ 
	fprintf(stderr, "       pkg rquery [-a] [-r reponame] <query-format>\n");

	fprintf(stderr, "       pkg rquery -e <evaluation> [-r reponame] <query-format>\n");

	fprintf(stderr, "       pkg rquery [-gxX] [-r reponame] <query-format> <pattern> <...>\n\n");

	fprintf(stderr, "For more information see 'pkg help rquery.'\n");
@@ -127,7 +127,10 @@ exec_rquery(int argc, char **argv)
		return (EX_USAGE);

	}
- 
	if ((argc == 1) ^ (match == MATCH_ALL) && condition == NULL) {
+ 
	/* Default to all packages if no pkg provided */
+ 
	if (argc == 1 && pkgname == NULL && condition == NULL) {
+ 
		match = MATCH_ALL;
+ 
	} else if ((argc == 1) ^ (match == MATCH_ALL) && condition == NULL) {

		usage_rquery();

		return (EX_USAGE);

	}