Attachment #102433 for bug #154405




		for (i = 0; i < NUM_SEARCH_FILES; ++i) {
			snprintf(buf, sizeof(buf), "%s/profiles/%s", cur_overlay->path, search_files[i]);
			if ((fp[i] = fopen(buf, "r")) == NULL)
				if (verbose>2)
					warnp("skipping %s for the %s overlay", search_files[i], cur_overlay->name);
		}


			continue;
		snprintf(buf, sizeof(buf), "%s/profiles/desc/", cur_overlay->path);
		if (!(d = opendir(buf))) {
			if (verbose>2)
				warn("Could not open %s -> skipping", buf);
			continue;
		}

	if (idx == -1)
		return quse_describe_flag(optind, repo, repo_search, argc, argv);

	/* if (quse_all) optind = argc; */
	initialize_ebuild_flat();	/* sets our pwd to $PORTDIR */

	search_len = strlen(search_vars[idx]);

			continue;
		}

		if ((quse_all) && optind!=argc) {
			for (i=optind;i<argc;i++)
				if ((strstr(ebuild,argv[i])))
					break;
			if (i==argc)
				continue;
		}

		if ((p = strchr(ebuild, '\n')) != NULL)
			*p = 0;
		if ((newfp = fopen(ebuild, "r")) != NULL) {

						printf("%s %s %s ", *user ? user : "MISSING", *revision ? revision : "MISSING", *date ? date : "MISSING");

					printf("%s%s::%s%s ", CYAN, cur_overlay->name, ebuild, NORM);
					if (quse_all)
						print_highlighted_use_flags(&buf0[search_len+1], argc, argc, argv);
					else
						print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);
					print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);
					puts(NORM);
					if (verbose > 1) {

						int ARGC = 0;
						makeargv(&buf0[search_len+1], &ARGC, &ARGV);
						if (ARGC > 0) {
							quse_describe_flag(1, 0, repo_search, ARGC, ARGV);
							for (i = 0; i < ARGC; i++)
								free(ARGV[i]);
							free(ARGV);

Return to bug 154405

Lines 103-109 int quse_describe_flag(int ind, short re Link Here

(-)quse.c.old (-4 / +16 lines)
103	for (i = 0; i < NUM_SEARCH_FILES; ++i) {	103	for (i = 0; i < NUM_SEARCH_FILES; ++i) {
104	snprintf(buf, sizeof(buf), "%s/profiles/%s", cur_overlay->path, search_files[i]);	104	snprintf(buf, sizeof(buf), "%s/profiles/%s", cur_overlay->path, search_files[i]);
105	if ((fp[i] = fopen(buf, "r")) == NULL)	105	if ((fp[i] = fopen(buf, "r")) == NULL)
106	if (verbose )	106	if (verbose>2)
107	warnp("skipping %s for the %s overlay", search_files[i], cur_overlay->name);	107	warnp("skipping %s for the %s overlay", search_files[i], cur_overlay->name);
108	}	108	}
109		109
Lines 192-198 skip_file: Link Here
192	continue;	192	continue;
193	snprintf(buf, sizeof(buf), "%s/profiles/desc/", cur_overlay->path);	193	snprintf(buf, sizeof(buf), "%s/profiles/desc/", cur_overlay->path);
194	if (!(d = opendir(buf))) {	194	if (!(d = opendir(buf))) {
195	if (verbose)	195	if (verbose>2)
196	warn("Could not open %s -> skipping", buf);	196	warn("Could not open %s -> skipping", buf);
197	continue;	197	continue;
198	}	198	}
Lines 305-311 int quse_main(int argc, char **argv) Link Here
305	if (idx == -1)	305	if (idx == -1)
306	return quse_describe_flag(optind, repo, repo_search, argc, argv);	306	return quse_describe_flag(optind, repo, repo_search, argc, argv);
307		307
308	if (quse_all) optind = argc;	308	/* if (quse_all) optind = argc; */
309	initialize_ebuild_flat(); /* sets our pwd to $PORTDIR */	309	initialize_ebuild_flat(); /* sets our pwd to $PORTDIR */
310		310
311	search_len = strlen(search_vars[idx]);	311	search_len = strlen(search_vars[idx]);
Lines 352-357 int quse_main(int argc, char **argv) Link Here
352	continue;	352	continue;
353	}	353	}
354		354
		355	if ((quse_all) && optind!=argc) {
		356	for (i=optind;i<argc;i++)
		357	if ((strstr(ebuild,argv[i])))
		358	break;
		359	if (i==argc)
		360	continue;
		361	}
		362
355	if ((p = strchr(ebuild, '\n')) != NULL)	363	if ((p = strchr(ebuild, '\n')) != NULL)
356	*p = 0;	364	*p = 0;
357	if ((newfp = fopen(ebuild, "r")) != NULL) {	365	if ((newfp = fopen(ebuild, "r")) != NULL) {
Lines 478-483 int quse_main(int argc, char **argv) Link Here
478	printf("%s %s %s ", user ? user : "MISSING", revision ? revision : "MISSING", *date ? date : "MISSING");	486	printf("%s %s %s ", user ? user : "MISSING", revision ? revision : "MISSING", *date ? date : "MISSING");
479		487
480	printf("%s%s::%s%s ", CYAN, cur_overlay->name, ebuild, NORM);	488	printf("%s%s::%s%s ", CYAN, cur_overlay->name, ebuild, NORM);
		489	if (quse_all)
		490	print_highlighted_use_flags(&buf0[search_len+1], argc, argc, argv);
		491	else
		492	print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);
481	print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);	493	print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);
482	puts(NORM);	494	puts(NORM);
483	if (verbose > 1) {	495	if (verbose > 1) {
Lines 485-491 int quse_main(int argc, char **argv) Link Here
485	int ARGC = 0;	495	int ARGC = 0;
486	makeargv(&buf0[search_len+1], &ARGC, &ARGV);	496	makeargv(&buf0[search_len+1], &ARGC, &ARGV);
487	if (ARGC > 0) {	497	if (ARGC > 0) {
488	quse_describe_flag(1, repo, repo_search, ARGC, ARGV);	498	quse_describe_flag(1, 0, repo_search, ARGC, ARGV);
489	for (i = 0; i < ARGC; i++)	499	for (i = 0; i < ARGC; i++)
490	free(ARGV[i]);	500	free(ARGV[i]);
491	free(ARGV);	501	free(ARGV);