| 1 |
commit: 9284822a7e38ffa6533ac3b048a7ea1d2110b14f |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 14 15:10:56 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 14 15:10:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9284822a |
| 7 |
|
| 8 |
qkeyword: default to ARCH when no arch given |
| 9 |
|
| 10 |
By default just operate on the arch specified by the selected profile. |
| 11 |
This is probably going to be useful in the majority of the cases. |
| 12 |
|
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
applets.h | 1 + |
| 16 |
main.c | 2 +- |
| 17 |
qkeyword.c | 8 ++++---- |
| 18 |
3 files changed, 6 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/applets.h b/applets.h |
| 21 |
index e7b81f4..ea4eece 100644 |
| 22 |
--- a/applets.h |
| 23 |
+++ b/applets.h |
| 24 |
@@ -152,6 +152,7 @@ static const struct applet_t { |
| 25 |
case 'C': no_colors(); break; \ |
| 26 |
default: applet ## _usage(EXIT_FAILURE); break; |
| 27 |
|
| 28 |
+extern char *portarch; |
| 29 |
extern char *portroot; |
| 30 |
extern int verbose; |
| 31 |
extern int quiet; |
| 32 |
|
| 33 |
diff --git a/main.c b/main.c |
| 34 |
index e0b2b9c..869bf31 100644 |
| 35 |
--- a/main.c |
| 36 |
+++ b/main.c |
| 37 |
@@ -31,6 +31,7 @@ int verbose = 0; |
| 38 |
int quiet = 0; |
| 39 |
int twidth; |
| 40 |
char pretend = 0; |
| 41 |
+char *portarch; |
| 42 |
char *portroot; |
| 43 |
char *config_protect; |
| 44 |
char *config_protect_mask; |
| 45 |
@@ -46,7 +47,6 @@ DECLARE_ARRAY(overlays); |
| 46 |
DECLARE_ARRAY(overlay_names); |
| 47 |
DECLARE_ARRAY(overlay_src); |
| 48 |
|
| 49 |
-static char *portarch; |
| 50 |
static char *portedb; |
| 51 |
static char *eprefix; |
| 52 |
static char *accept_license; |
| 53 |
|
| 54 |
diff --git a/qkeyword.c b/qkeyword.c |
| 55 |
index 9c7187e..b329068 100644 |
| 56 |
--- a/qkeyword.c |
| 57 |
+++ b/qkeyword.c |
| 58 |
@@ -762,11 +762,12 @@ int qkeyword_main(int argc, char **argv) |
| 59 |
} |
| 60 |
} |
| 61 |
|
| 62 |
- data.arch = NULL; |
| 63 |
+ data.arch = portarch; |
| 64 |
if (optind < argc) |
| 65 |
data.arch = argv[optind]; |
| 66 |
|
| 67 |
- if ((data.arch == NULL && action != 's') || optind + 1 < argc) |
| 68 |
+ if (((data.arch == NULL || *data.arch == '\0') && action != 's') || |
| 69 |
+ optind + 1 < argc) |
| 70 |
qkeyword_usage(EXIT_FAILURE); |
| 71 |
|
| 72 |
if (cat != NULL) { |
| 73 |
@@ -803,8 +804,7 @@ int qkeyword_main(int argc, char **argv) |
| 74 |
i = qkeyword_dropped(NULL, NULL); break; |
| 75 |
case 't': i = qkeyword_traverse(qkeyword_testing_only, &data); |
| 76 |
i = qkeyword_testing_only(NULL, NULL); break; |
| 77 |
- case 's': data.arch = "amd64"; /* doesn't matter, need to be set */ |
| 78 |
- i = qkeyword_traverse(qkeyword_stats, &data); |
| 79 |
+ case 's': i = qkeyword_traverse(qkeyword_stats, &data); |
| 80 |
i = qkeyword_stats(NULL, NULL); break; |
| 81 |
case 'a': i = qkeyword_traverse(qkeyword_all, &data); break; |
| 82 |
case 'n': i = qkeyword_traverse(qkeyword_not, &data); break; |
Archives