From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-849056-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id C8E3E1384B4
for <garchives@archives.gentoo.org>; Sat, 28 Nov 2015 02:44:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E4C6421C09A;
Sat, 28 Nov 2015 02:44:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0910021C014
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Nov 2015 02:44:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ED8033406BF
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Nov 2015 02:44:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B13CFE1
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Nov 2015 02:44:35 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1448666777.a0c3ddab026e271b3eb2e66e64b9e9a24eb6f708.vapier@gentoo>
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
X-VCS-Repository: proj/portage-utils
X-VCS-Files: qgrep.c quse.c
X-VCS-Directories: /
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: a0c3ddab026e271b3eb2e66e64b9e9a24eb6f708
X-VCS-Branch: master
Date: Sat, 28 Nov 2015 02:44:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: e526b765-85a7-40c8-b7be-b491aed1097c
X-Archives-Hash: c889942d8a4c3337615c8eca0402e4b3
commit: a0c3ddab026e271b3eb2e66e64b9e9a24eb6f708
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 23:26:17 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 23:26:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a0c3ddab
qgrep/quse: add multiple overlay support
This is a pretty straight forward extension. The code hasn't seen
any clean ups in the process (although it probably should).
URL: https://bugs.gentoo.org/553260
qgrep.c | 366 +++++++++++++++++++++++++++++++++-------------------------------
quse.c | 268 ++++++++++++++++++++++++-----------------------
2 files changed, 329 insertions(+), 305 deletions(-)
diff --git a/qgrep.c b/qgrep.c
index de018ea..e7c2c10 100644
--- a/qgrep.c
+++ b/qgrep.c
@@ -259,7 +259,7 @@ int qgrep_main(int argc, char **argv)
int need_separator = 0;
char status = 1;
- QGREP_STR_FUNC strfunc = (QGREP_STR_FUNC) strstr;
+ QGREP_STR_FUNC strfunc = strstr;
DBG("argc=%d argv[0]=%s argv[1]=%s",
argc, argv[0], argc > 1 ? argv[1] : "NULL?");
@@ -271,7 +271,7 @@ int qgrep_main(int argc, char **argv)
switch (i) {
case 'I': invert_match = 1; break;
case 'i':
- strfunc = (QGREP_STR_FUNC) strcasestr;
+ strfunc = strcasestr;
reflags |= REG_ICASE;
break;
case 'c': do_count = 1; break;
@@ -369,203 +369,216 @@ int qgrep_main(int argc, char **argv)
xregcomp(&skip_preg, skip_pattern, reflags);
}
- /* go look either in ebuilds or eclasses or VDB */
- if (!do_eclass && !do_installed) {
- if ((fp = fopen(initialize_ebuild_flat(), "r")) == NULL)
- return 1;
- xchdir(portdir);
- } else if (do_eclass) {
- xchdir(portdir);
- if ((eclass_dir = opendir("eclass")) == NULL)
- errp("opendir(\"%s/eclass\") failed", portdir);
- } else { /* if (do_install) */
- char buf[_Q_PATH_MAX];
- snprintf(buf, sizeof(buf), "%s/%s", portroot, portvdb);
- xchdir(buf);
- if ((vdb_dir = opendir(".")) == NULL)
- errp("could not opendir(%s/%s) for ROOT/VDB", portroot, portvdb);
- }
-
/* allocate a circular buffers list for --before */
buf_list = qgrep_buf_list_alloc(num_lines_before + 1);
- /* iteration is either over ebuilds or eclasses */
- while (do_eclass
- ? ((dentry = readdir(eclass_dir))
- && snprintf(ebuild, sizeof(ebuild), "eclass/%s", dentry->d_name))
- : (do_installed
- ? (get_next_installed_ebuild(ebuild, vdb_dir, &dentry, &cat_dir) != NULL)
- : (fgets(ebuild, sizeof(ebuild), fp) != NULL))) {
- FILE *newfp;
-
- /* filter badly named files, prepare eclass or package name, etc. */
- if (do_eclass) {
- if ((p = strrchr(ebuild, '.')) == NULL)
+ size_t n;
+ char *overlay;
+ array_for_each(overlays, n, overlay) {
+
+ /* go look either in ebuilds or eclasses or VDB */
+ if (!do_eclass && !do_installed) {
+ fp = fopen(initialize_flat(overlay, CACHE_EBUILD, false), "re");
+ if (fp == NULL)
continue;
- if (strcmp(p, ".eclass"))
+ xchdir(overlay);
+ } else if (do_eclass) {
+ xchdir(overlay);
+ if ((eclass_dir = opendir("eclass")) == NULL) {
+ if (errno != ENOENT)
+ warnp("opendir(\"%s/eclass\") failed", overlay);
continue;
- if (show_name || (include_atoms != NULL)) {
- /* cut ".eclass" */
- *p = '\0';
- /* and skip "eclass/" */
- snprintf(name, sizeof(name), "%s", ebuild + 7);
- /* restore the filepath */
- *p = '.';
}
- } else {
- if ((p = strchr(ebuild, '\n')) != NULL)
- *p = '\0';
- if (show_name || (include_atoms != NULL)) {
- /* cut ".ebuild" */
- if (p == NULL)
- p = ebuild + strlen(ebuild);
- *(p-7) = '\0';
- /* cut "/foo/" from "cat/foo/foo-x.y" */
- if ((p = strchr(ebuild, '/')) == NULL)
+ } else { /* if (do_install) */
+ char buf[_Q_PATH_MAX];
+ snprintf(buf, sizeof(buf), "%s/%s", portroot, portvdb);
+ xchdir(buf);
+ if ((vdb_dir = opendir(".")) == NULL)
+ errp("could not opendir(%s/%s) for ROOT/VDB", portroot, portvdb);
+ }
+
+ /* iteration is either over ebuilds or eclasses */
+ while (do_eclass
+ ? ((dentry = readdir(eclass_dir))
+ && snprintf(ebuild, sizeof(ebuild), "eclass/%s", dentry->d_name))
+ : (do_installed
+ ? (get_next_installed_ebuild(ebuild, vdb_dir, &dentry, &cat_dir) != NULL)
+ : (fgets(ebuild, sizeof(ebuild), fp) != NULL))) {
+ FILE *newfp;
+
+ /* filter badly named files, prepare eclass or package name, etc. */
+ if (do_eclass) {
+ if ((p = strrchr(ebuild, '.')) == NULL)
continue;
- *(p++) = '\0';
- /* find head of the ebuild basename */
- if ((p = strchr(p, '/')) == NULL)
+ if (strcmp(p, ".eclass"))
continue;
- /* find start of the pkg name */
- snprintf(name, sizeof(name), "%s/%s", ebuild, (p+1));
- /* restore the filepath */
- *p = '/';
- *(p + strlen(p)) = '.';
- ebuild[strlen(ebuild)] = '/';
+ if (show_name || (include_atoms != NULL)) {
+ /* cut ".eclass" */
+ *p = '\0';
+ /* and skip "eclass/" */
+ snprintf(name, sizeof(name), "%s", ebuild + 7);
+ /* restore the filepath */
+ *p = '.';
+ }
+ } else {
+ if ((p = strchr(ebuild, '\n')) != NULL)
+ *p = '\0';
+ if (show_name || (include_atoms != NULL)) {
+ /* cut ".ebuild" */
+ if (p == NULL)
+ p = ebuild + strlen(ebuild);
+ *(p-7) = '\0';
+ /* cut "/foo/" from "cat/foo/foo-x.y" */
+ if ((p = strchr(ebuild, '/')) == NULL)
+ continue;
+ *(p++) = '\0';
+ /* find head of the ebuild basename */
+ if ((p = strchr(p, '/')) == NULL)
+ continue;
+ /* find start of the pkg name */
+ snprintf(name, sizeof(name), "%s/%s", ebuild, (p+1));
+ /* restore the filepath */
+ *p = '/';
+ *(p + strlen(p)) = '.';
+ ebuild[strlen(ebuild)] = '/';
+ }
}
- }
- /* filter the files we grep when there are extra args */
- if (include_atoms != NULL)
- if (!qgrep_name_match(name, (argc - optind - 1), include_atoms))
- continue;
-
- if ((newfp = fopen(ebuild, "r")) != NULL) {
- int lineno = 0;
- char remaining_after_context = 0;
- count = 0;
- /* if there have been some matches already, then a separator will be needed */
- need_separator = (!status) && (num_lines_before || num_lines_after);
- /* whatever is in the circular buffers list is no more a valid context */
- qgrep_buf_list_invalidate(buf_list);
-
- /* reading a new line always happen in the next buffer of the list */
- while ((buf_list = buf_list->next)
- && (fgets(buf_list->buf, sizeof(buf_list->buf), newfp)) != NULL) {
- lineno++;
- buf_list->valid = 1;
-
- /* cleanup EOL */
- if ((p = strrchr(buf_list->buf, '\n')) != NULL)
- *p = 0;
- if ((p = strrchr(buf_list->buf, '\r')) != NULL)
- *p = 0;
-
- if (skip_comments) {
- /* reject comments line ("^[ \t]*#") */
- p = buf_list->buf;
- while (*p == ' ' || *p == '\t') p++;
- if (*p == '#')
- goto print_after_context;
- }
+ /* filter the files we grep when there are extra args */
+ if (include_atoms != NULL)
+ if (!qgrep_name_match(name, (argc - optind - 1), include_atoms))
+ continue;
- if (skip_pattern) {
- /* reject some other lines which match an optional pattern */
- if (!do_regex) {
- if (strfunc(buf_list->buf, skip_pattern) != NULL)
- goto print_after_context;
- } else {
- if (regexec(&skip_preg, buf_list->buf, 0, NULL, 0) == 0)
+ if ((newfp = fopen(ebuild, "r")) != NULL) {
+ int lineno = 0;
+ char remaining_after_context = 0;
+ count = 0;
+ /* if there have been some matches already, then a separator will be needed */
+ need_separator = (!status) && (num_lines_before || num_lines_after);
+ /* whatever is in the circular buffers list is no more a valid context */
+ qgrep_buf_list_invalidate(buf_list);
+
+ /* reading a new line always happen in the next buffer of the list */
+ while ((buf_list = buf_list->next)
+ && (fgets(buf_list->buf, sizeof(buf_list->buf), newfp)) != NULL) {
+ lineno++;
+ buf_list->valid = 1;
+
+ /* cleanup EOL */
+ if ((p = strrchr(buf_list->buf, '\n')) != NULL)
+ *p = 0;
+ if ((p = strrchr(buf_list->buf, '\r')) != NULL)
+ *p = 0;
+
+ if (skip_comments) {
+ /* reject comments line ("^[ \t]*#") */
+ p = buf_list->buf;
+ while (*p == ' ' || *p == '\t') p++;
+ if (*p == '#')
goto print_after_context;
}
- }
- /* four ways to match a line (with/without inversion and regexp) */
- if (!invert_match) {
- if (do_regex == 0) {
- if (strfunc(buf_list->buf, argv[optind]) == NULL)
- goto print_after_context;
- } else {
- if (regexec(&preg, buf_list->buf, 0, NULL, 0) != 0)
- goto print_after_context;
+ if (skip_pattern) {
+ /* reject some other lines which match an optional pattern */
+ if (!do_regex) {
+ if (strfunc(buf_list->buf, skip_pattern) != NULL)
+ goto print_after_context;
+ } else {
+ if (regexec(&skip_preg, buf_list->buf, 0, NULL, 0) == 0)
+ goto print_after_context;
+ }
}
- } else {
- if (do_regex == 0) {
- if (strfunc(buf_list->buf, argv[optind]) != NULL)
- goto print_after_context;
+
+ /* four ways to match a line (with/without inversion and regexp) */
+ if (!invert_match) {
+ if (do_regex == 0) {
+ if (strfunc(buf_list->buf, argv[optind]) == NULL)
+ goto print_after_context;
+ } else {
+ if (regexec(&preg, buf_list->buf, 0, NULL, 0) != 0)
+ goto print_after_context;
+ }
} else {
- if (regexec(&preg, buf_list->buf, 0, NULL, 0) == 0)
- goto print_after_context;
+ if (do_regex == 0) {
+ if (strfunc(buf_list->buf, argv[optind]) != NULL)
+ goto print_after_context;
+ } else {
+ if (regexec(&preg, buf_list->buf, 0, NULL, 0) == 0)
+ goto print_after_context;
+ }
}
- }
- count++;
- status = 0; /* got a match, exit status should be 0 */
- if (per_file_output)
- continue; /* matching files are listed out of this loop */
-
- if ((need_separator > 0)
- && (num_lines_before || num_lines_after))
- printf("--\n");
- /* "need_separator" is not a flag, but a counter, so that
- * adjacent contextes are not separated */
- need_separator = 0 - num_lines_before;
- if (!do_list) {
- /* print the leading context */
- qgrep_print_before_context(buf_list, num_lines_before, label,
- ((verbose > 1) ? lineno : -1));
- /* print matching line */
- if (invert_match || *RED == '\0')
- qgrep_print_matching_line_nocolor(buf_list, label,
- ((verbose > 1) ? lineno : -1));
- else if (do_regex)
- qgrep_print_matching_line_regcolor(buf_list, label,
- ((verbose > 1) ? lineno : -1), &preg);
- else
- qgrep_print_matching_line_strcolor(buf_list, label,
- ((verbose > 1) ? lineno : -1), strfunc, argv[optind]);
- } else {
- /* in verbose do_list mode, list the file once per match */
- printf("%s", label);
- if (verbose > 1)
- printf(":%d", lineno);
- putchar('\n');
- }
- /* init count down of trailing context lines */
- remaining_after_context = num_lines_after;
- continue;
+ count++;
+ status = 0; /* got a match, exit status should be 0 */
+ if (per_file_output)
+ continue; /* matching files are listed out of this loop */
+
+ if ((need_separator > 0)
+ && (num_lines_before || num_lines_after))
+ printf("--\n");
+ /* "need_separator" is not a flag, but a counter, so that
+ * adjacent contextes are not separated */
+ need_separator = 0 - num_lines_before;
+ if (!do_list) {
+ /* print the leading context */
+ qgrep_print_before_context(buf_list, num_lines_before, label,
+ ((verbose > 1) ? lineno : -1));
+ /* print matching line */
+ if (invert_match || *RED == '\0')
+ qgrep_print_matching_line_nocolor(buf_list, label,
+ ((verbose > 1) ? lineno : -1));
+ else if (do_regex)
+ qgrep_print_matching_line_regcolor(buf_list, label,
+ ((verbose > 1) ? lineno : -1), &preg);
+ else
+ qgrep_print_matching_line_strcolor(buf_list, label,
+ ((verbose > 1) ? lineno : -1), strfunc, argv[optind]);
+ } else {
+ /* in verbose do_list mode, list the file once per match */
+ printf("%s", label);
+ if (verbose > 1)
+ printf(":%d", lineno);
+ putchar('\n');
+ }
+ /* init count down of trailing context lines */
+ remaining_after_context = num_lines_after;
+ continue;
-print_after_context:
- /* print some trailing context lines when needed */
- if (!remaining_after_context) {
- if (!status)
- /* we're getting closer to the need of a separator between
- * current match block and the next one */
- ++need_separator;
- } else {
- qgrep_print_context_line(buf_list, label,
- ((verbose > 1) ? lineno : -1));
- --remaining_after_context;
+ print_after_context:
+ /* print some trailing context lines when needed */
+ if (!remaining_after_context) {
+ if (!status)
+ /* we're getting closer to the need of a separator between
+ * current match block and the next one */
+ ++need_separator;
+ } else {
+ qgrep_print_context_line(buf_list, label,
+ ((verbose > 1) ? lineno : -1));
+ --remaining_after_context;
+ }
}
+ fclose(newfp);
+ if (!per_file_output)
+ continue; /* matches were already displayed, line per line */
+ if (do_count && count) {
+ if (label != NULL)
+ /* -c without -v/-N/-H only outputs
+ * the matches count of the file */
+ printf("%s:", label);
+ printf("%d\n", count);
+ } else if ((count && !invert_list) || (!count && invert_list))
+ printf("%s\n", label); /* do_list == 1, or we wouldn't be here */
}
- fclose(newfp);
- if (!per_file_output)
- continue; /* matches were already displayed, line per line */
- if (do_count && count) {
- if (label != NULL)
- /* -c without -v/-N/-H only outputs
- * the matches count of the file */
- printf("%s:", label);
- printf("%d\n", count);
- } else if ((count && !invert_list) || (!count && invert_list))
- printf("%s\n", label); /* do_list == 1, or we wouldn't be here */
}
+ if (do_eclass)
+ closedir(eclass_dir);
+ else if (!do_installed)
+ fclose(fp);
+
+ if (do_installed)
+ break;
}
- if (do_eclass)
- closedir(eclass_dir);
- else if (!do_installed)
- fclose(fp);
+
if (do_regex)
regfree(&preg);
if (do_regex && skip_pattern)
@@ -577,6 +590,7 @@ print_after_context:
free(include_atoms);
}
qgrep_buf_list_free(buf_list);
+
return status;
}
diff --git a/quse.c b/quse.c
index 8ba0be1..2ac6cad 100644
--- a/quse.c
+++ b/quse.c
@@ -239,6 +239,8 @@ int quse_main(int argc, char **argv)
short quse_all = 0;
int regexp_matching = 1, i, idx = 0;
size_t search_len;
+ size_t n;
+ const char *overlay;
DBG("argc=%d argv[0]=%s argv[1]=%s",
argc, argv[0], argc > 1 ? argv[1] : "NULL?");
@@ -259,179 +261,187 @@ int quse_main(int argc, char **argv)
quse_usage(EXIT_FAILURE);
if (idx == -1) {
- size_t n;
- const char *overlay;
array_for_each(overlays, n, overlay)
quse_describe_flag(overlay, optind, argc, argv);
return 0;
}
if (quse_all) optind = argc;
- cache_file = initialize_ebuild_flat();
search_len = strlen(search_vars[idx]);
assert(search_len < sizeof(buf0));
- if ((fp = fopen(cache_file, "r")) == NULL) {
- warnp("could not read cache: %s", cache_file);
- return 1;
- }
+ array_for_each(overlays, n, overlay) {
+ cache_file = initialize_flat(overlay, CACHE_EBUILD, false);
- int portdir_fd = open(portdir, O_RDONLY|O_CLOEXEC|O_PATH);
+ if ((fp = fopen(cache_file, "re")) == NULL) {
+ warnp("could not read cache: %s", cache_file);
+ continue;
+ }
- ebuild = NULL;
- while ((linelen = getline(&ebuild, &ebuildlen, fp)) != -1) {
- FILE *newfp;
- int fd;
+ int overlay_fd = open(overlay, O_RDONLY|O_CLOEXEC|O_PATH);
- rmspace_len(ebuild, linelen);
+ ebuild = NULL;
+ while ((linelen = getline(&ebuild, &ebuildlen, fp)) != -1) {
+ FILE *newfp;
+ int fd;
- fd = openat(portdir_fd, ebuild, O_RDONLY|O_CLOEXEC);
- if (fd < 0)
- continue;
- newfp = fdopen(fd, "r");
- if (newfp != NULL) {
- unsigned int lineno = 0;
- char revision[sizeof(buf0)];
- char date[sizeof(buf0)];
- char user[sizeof(buf0)];
-
- revision[0] = 0;
- user[0] = 0;
- date[0] = 0;
- while (fgets(buf0, sizeof(buf0), newfp) != NULL) {
- int ok = 0;
- char warned = 0;
- lineno++;
-
- if (*buf0 == '#') {
- if (strncmp(buf0, "# $Header: /", 12) == 0)
- sscanf(buf0, "%*s %*s %*s %s %s %*s %s %*s %*s", (char *) &revision, (char *) &date, (char *) &user);
- continue;
- }
- if (strncmp(buf0, search_vars[idx], search_len) != 0)
- continue;
+ rmspace_len(ebuild, linelen);
+
+ fd = openat(overlay_fd, ebuild, O_RDONLY|O_CLOEXEC);
+ if (fd < 0)
+ continue;
+ newfp = fdopen(fd, "r");
+ if (newfp != NULL) {
+ unsigned int lineno = 0;
+ char revision[sizeof(buf0)];
+ char date[sizeof(buf0)];
+ char user[sizeof(buf0)];
+
+ revision[0] = 0;
+ user[0] = 0;
+ date[0] = 0;
+ while (fgets(buf0, sizeof(buf0), newfp) != NULL) {
+ int ok = 0;
+ char warned = 0;
+ lineno++;
+
+ if (*buf0 == '#') {
+ if (strncmp(buf0, "# $Header: /", 12) == 0)
+ sscanf(buf0, "%*s %*s %*s %s %s %*s %s %*s %*s",
+ revision, date, user);
+ continue;
+ }
+ if (strncmp(buf0, search_vars[idx], search_len) != 0)
+ continue;
- if ((p = strchr(buf0, '\n')) != NULL)
- *p = 0;
- if ((p = strchr(buf0, '#')) != NULL) {
- if (buf0 != p && p[-1] == ' ')
- p[-1] = 0;
- else
+ if ((p = strchr(buf0, '\n')) != NULL)
*p = 0;
- }
- if (verbose > 1) {
- if ((strchr(buf0, '\t') != NULL)
- || (strchr(buf0, '$') != NULL)
- || (strchr(buf0, '\\') != NULL)
- || (strchr(buf0, '\'') != NULL)
- || (strstr(buf0, " ") != NULL)) {
- warned = 1;
- warn("# Line %d of %s has an annoying %s", lineno, ebuild, buf0);
+ if ((p = strchr(buf0, '#')) != NULL) {
+ if (buf0 != p && p[-1] == ' ')
+ p[-1] = 0;
+ else
+ *p = 0;
+ }
+ if (verbose > 1) {
+ if ((strchr(buf0, '\t') != NULL)
+ || (strchr(buf0, '$') != NULL)
+ || (strchr(buf0, '\\') != NULL)
+ || (strchr(buf0, '\'') != NULL)
+ || (strstr(buf0, " ") != NULL)) {
+ warned = 1;
+ warn("# Line %d of %s has an annoying %s",
+ lineno, ebuild, buf0);
+ }
}
- }
#ifdef THIS_SUCKS
- if ((p = strrchr(&buf0[search_len + 1], '\\')) != NULL) {
+ if ((p = strrchr(&buf0[search_len + 1], '\\')) != NULL) {
- multiline:
- *p = ' ';
+ multiline:
+ *p = ' ';
- if (fgets(buf1, sizeof(buf1), newfp) == NULL)
- continue;
- lineno++;
+ if (fgets(buf1, sizeof(buf1), newfp) == NULL)
+ continue;
+ lineno++;
- if ((p = strchr(buf1, '\n')) != NULL)
- *p = 0;
- snprintf(buf2, sizeof(buf2), "%s %s", buf0, buf1);
- remove_extra_space(buf2);
- strcpy(buf0, buf2);
- if ((p = strrchr(buf1, '\\')) != NULL)
- goto multiline;
- }
+ if ((p = strchr(buf1, '\n')) != NULL)
+ *p = 0;
+ snprintf(buf2, sizeof(buf2), "%s %s", buf0, buf1);
+ remove_extra_space(buf2);
+ strcpy(buf0, buf2);
+ if ((p = strrchr(buf1, '\\')) != NULL)
+ goto multiline;
+ }
#else
- remove_extra_space(buf0);
+ remove_extra_space(buf0);
#endif
- while ((p = strrchr(&buf0[search_len + 1], '"')) != NULL) *p = 0;
- while ((p = strrchr(&buf0[search_len + 1], '\'')) != NULL) *p = 0;
- while ((p = strrchr(&buf0[search_len + 1], '\\')) != NULL) *p = ' ';
-
- if (verbose && warned == 0) {
- if ((strchr(buf0, '$') != NULL) || (strchr(buf0, '\\') != NULL)) {
- warned = 1;
- warn("# Line %d of %s has an annoying %s", lineno, ebuild, buf0);
+ while ((p = strrchr(&buf0[search_len + 1], '"')) != NULL) *p = 0;
+ while ((p = strrchr(&buf0[search_len + 1], '\'')) != NULL) *p = 0;
+ while ((p = strrchr(&buf0[search_len + 1], '\\')) != NULL) *p = ' ';
+
+ if (verbose && warned == 0) {
+ if ((strchr(buf0, '$') != NULL) || (strchr(buf0, '\\') != NULL)) {
+ warned = 1;
+ warn("# Line %d of %s has an annoying %s",
+ lineno, ebuild, buf0);
+ }
}
- }
- if (strlen(buf0) < search_len + 1) {
- /* warnf("err '%s'/%zu <= %zu; line %u\n", buf0, strlen(buf0), search_len + 1, lineno); */
- continue;
- }
+ if (strlen(buf0) < search_len + 1) {
+ /* warnf("err '%s'/%zu <= %zu; line %u\n", buf0, strlen(buf0), search_len + 1, lineno); */
+ continue;
+ }
- if ((argc == optind) || (quse_all)) {
- ok = 1;
- } else {
- ok = 0;
- if (regexp_matching) {
- for (i = optind; i < argc; ++i) {
- if (rematch(argv[i], &buf0[search_len + 1], REG_NOSUB) == 0) {
- ok = 1;
- break;
- }
- }
+ if ((argc == optind) || (quse_all)) {
+ ok = 1;
} else {
- remove_extra_space(buf0);
- strcpy(buf1, &buf0[search_len + 1]);
-
- for (i = (size_t) optind; i < argc && argv[i] != NULL; i++) {
- if (strcmp(buf1, argv[i]) == 0) {
- ok = 1;
- break;
+ ok = 0;
+ if (regexp_matching) {
+ for (i = optind; i < argc; ++i) {
+ if (rematch(argv[i], &buf0[search_len + 1], REG_NOSUB) == 0) {
+ ok = 1;
+ break;
+ }
}
- }
- if (ok == 0) while ((p = strchr(buf1, ' ')) != NULL) {
- *p = 0;
+ } else {
+ remove_extra_space(buf0);
+ strcpy(buf1, &buf0[search_len + 1]);
+
for (i = (size_t) optind; i < argc && argv[i] != NULL; i++) {
if (strcmp(buf1, argv[i]) == 0) {
ok = 1;
break;
}
}
- strcpy(buf2, p + 1);
- strcpy(buf1, buf2);
- if (strchr(buf1, ' ') == NULL)
+ if (ok == 0) while ((p = strchr(buf1, ' ')) != NULL) {
+ *p = 0;
for (i = (size_t) optind; i < argc && argv[i] != NULL; i++) {
- if (strcmp(buf1, argv[i]) == 0)
+ if (strcmp(buf1, argv[i]) == 0) {
ok = 1;
+ break;
+ }
}
+ strcpy(buf2, p + 1);
+ strcpy(buf1, buf2);
+ if (strchr(buf1, ' ') == NULL)
+ for (i = (size_t) optind; i < argc && argv[i] != NULL; i++) {
+ if (strcmp(buf1, argv[i]) == 0)
+ ok = 1;
+ }
+ }
}
}
- }
- if (ok) {
- if (verbose > 3)
- printf("%s %s %s ", *user ? user : "MISSING", *revision ? revision : "MISSING", *date ? date : "MISSING");
-
- printf("%s%s%s ", CYAN, ebuild, NORM);
- print_highlighted_use_flags(&buf0[search_len + 1], optind, argc, argv);
- puts(NORM);
- if (verbose > 1) {
- char **ARGV;
- int ARGC;
- makeargv(&buf0[search_len + 1], &ARGC, &ARGV);
- quse_describe_flag(portdir, 1, ARGC, ARGV);
- freeargv(ARGC, ARGV);
+ if (ok) {
+ if (verbose > 3)
+ printf("%s %s %s ",
+ *user ? user : "MISSING",
+ *revision ? revision : "MISSING",
+ *date ? date : "MISSING");
+
+ printf("%s%s%s ", CYAN, ebuild, NORM);
+ print_highlighted_use_flags(&buf0[search_len + 1], optind, argc, argv);
+ puts(NORM);
+ if (verbose > 1) {
+ char **ARGV;
+ int ARGC;
+ makeargv(&buf0[search_len + 1], &ARGC, &ARGV);
+ quse_describe_flag(overlay, 1, ARGC, ARGV);
+ freeargv(ARGC, ARGV);
+ }
}
+ break;
}
- break;
+ fclose(newfp);
+ } else {
+ if (!reinitialize)
+ warnfp("(cache update pending) %s", ebuild);
+ reinitialize = 1;
}
- fclose(newfp);
- } else {
- if (!reinitialize)
- warnfp("(cache update pending) %s", ebuild);
- reinitialize = 1;
}
+ fclose(fp);
+ close(overlay_fd);
}
- fclose(fp);
- close(portdir_fd);
+
return EXIT_SUCCESS;
}