Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 114221 Details for
Bug 171374
app-portage/portage-utils - Misc enhancements for qgrep
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qgrep-07_misc_options_warnings_and_-lvv_support.patch
qgrep-07_misc_options_warnings_and_-lvv_support.patch (text/plain), 1.62 KB, created by
TGL
on 2007-03-24 11:22:37 UTC
(
hide
)
Description:
qgrep-07_misc_options_warnings_and_-lvv_support.patch
Filename:
MIME Type:
Creator:
TGL
Created:
2007-03-24 11:22:37 UTC
Size:
1.62 KB
patch
obsolete
>--- qgrep.c.06 2007-03-19 21:17:01.000000000 +0100 >+++ qgrep.c 2007-03-24 11:59:46.000000000 +0100 >@@ -80,6 +80,7 @@ > char *p; > char do_count, do_regex, do_eclass, do_list; > char show_filename, skip_comments, invert_list, show_name; >+ char per_file_output; > FILE *fp = NULL; > DIR *eclass_dir = NULL; > struct dirent *dentry; >@@ -127,8 +128,19 @@ > if (argc == optind) > qgrep_usage(EXIT_FAILURE); > >- if (do_list) >+ if (do_list && do_count) { >+ warnf("%s and --count are incompatible options. The former wins.", >+ (invert_list ? "--invert-list" : "--list")); > do_count = 0; >+ } >+ >+ if (show_name && show_filename) { >+ warn("--with-name and --with-filename are incompatible options. The former wins."); >+ show_filename = 0; >+ } >+ >+ /* do we report results once per file or per line ? */ >+ per_file_output = do_count || (do_list && (!verbose || invert_list)); > > if (argc > (optind + 1)) { > include_atoms = xcalloc(sizeof(depend_atom*), (argc - optind - 1)); >@@ -251,15 +263,17 @@ > } > > count++; >- if (do_count || do_list) continue; >+ if (per_file_output) continue; > if (verbose || show_filename || show_name) { >- printf("%s:", (show_name ? name : ebuild)); >- if (verbose > 1) printf("%d:", lineno); >- printf(" "); >+ printf("%s", (show_name ? name : ebuild)); >+ if (verbose > 1) printf(":%d", lineno); >+ if (!do_list) >+ printf(": "); > } >- printf("%s\n", buf0); >+ printf("%s\n", (do_list ? "" : buf0)); > } > fclose(newfp); >+ if (!per_file_output) continue; > if (do_count && count) { > if (verbose || show_filename || show_name) > printf("%s:", (show_name ? name : ebuild));
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 171374
:
113690
|
113693
|
113695
|
113697
|
113698
|
113699
|
113701
|
114221
|
114222
|
114281
|
114282
|
114944