? contrib
? header.txt
Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.104
diff -u -b -B -w -p -r1.104 main.c
--- main.c	11 Feb 2006 16:24:46 -0000	1.104
+++ main.c	12 Feb 2006 23:21:32 -0000
@@ -579,7 +579,7 @@ int filter_hidden(const struct dirent *d
 	return 1;
 }
 
-#define CACHE_EBUILD_FILE ".ebuild.x"
+#define CACHE_EBUILD_FILE (getenv("CACHE_EBUILD_FILE") ? getenv("CACHE_EBUILD_FILE") : ".ebuild.x")
 #define CACHE_METADATA_FILE ".metadata.x"
 const char *initialize_flat(int cache_type);
 const char *initialize_flat(int cache_type)
Index: qgrep.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v
retrieving revision 1.13
diff -u -b -B -w -p -r1.13 qgrep.c
--- qgrep.c	26 Jan 2006 02:32:04 -0000	1.13
+++ qgrep.c	12 Feb 2006 23:21:32 -0000
@@ -69,7 +69,7 @@ int qgrep_main(int argc, char **argv)
 
 	initialize_ebuild_flat();	/* sets our pwd to $PORTDIR */
 
-	if ((fp = fopen(".ebuild.x", "r")) == NULL)
+	if ((fp = fopen(CACHE_EBUILD_FILE, "r")) == NULL)
 		return 1;
 	while ((fgets(ebuild, sizeof(ebuild), fp)) != NULL) {
 		FILE *newfp;
Index: quse.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v
retrieving revision 1.48
diff -u -b -B -w -p -r1.48 quse.c
--- quse.c	26 Jan 2006 02:32:04 -0000	1.48
+++ quse.c	12 Feb 2006 23:21:32 -0000
@@ -164,7 +164,7 @@ int quse_main(int argc, char **argv)
 
 	const char *search_var = NULL;
 	const char *search_vars[] = { "IUSE=", "KEYWORDS=", "LICENSE=", search_var };
-	short all = 0;
+	short quse_all = 0;
 	int regexp_matching = 1, i, idx = 0;
 	size_t search_len;
 
@@ -174,7 +174,7 @@ int quse_main(int argc, char **argv)
 	while ((i = GETOPT_LONG(QUSE, quse, "")) != -1) {
 		switch (i) {
 		case 'e': regexp_matching = 0; break;
-		case 'a': all = 1; break;
+		case 'a': quse_all = 1; break;
 		case 'K': idx = 1; break;
 		case 'L': idx = 2; break;
 		case 'D': idx = -1; break;
@@ -182,13 +182,13 @@ int quse_main(int argc, char **argv)
 		COMMON_GETOPTS_CASES(quse)
 		}
 	}
-	if (argc == optind && !all && idx >= 0)
+	if (argc == optind && !quse_all && idx >= 0)
 		quse_usage(EXIT_FAILURE);
 
 	if (idx == -1)
 		return quse_describe_flag(optind, argc, argv);
 
-	if (all) optind = argc;
+	if (quse_all) optind = argc;
 	initialize_ebuild_flat();	/* sets our pwd to $PORTDIR */
 
 	search_len = strlen(search_vars[idx]);
@@ -278,7 +278,7 @@ int quse_main(int argc, char **argv)
 					continue;
 				}
 
-				if ((argc == optind) || (all)) {
+				if ((argc == optind) || (quse_all)) {
 					ok = 1;
 				} else {
 					ok = 0;