* [gentoo-commits] gentoo-projects commit in portage-utils: TODO qdepends.c
@ 2013-09-29 10:07 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2013-09-29 10:07 UTC (permalink / raw
To: gentoo-commits
vapier 13/09/29 10:07:28
Modified: TODO qdepends.c
Log:
scandirat: use _DIRENT_HAVE_D_RECLEN to be slightly more portable #485430
Revision Changes Path
1.14 portage-utils/TODO
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/TODO?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/TODO?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/TODO?r1=1.13&r2=1.14
Index: TODO
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/TODO,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TODO 29 Sep 2013 10:06:17 -0000 1.13
+++ TODO 29 Sep 2013 10:07:28 -0000 1.14
@@ -34,7 +34,6 @@
- only 64bit values are supported in any individual version component
foo-(1234)_alpha(56789)
- these limits should not be an issue for all practical purposes
- - need to handle USE deps like: cat/pkg-123[foo(+)]
- env vars only get expanded once, so this fails:
ACCEPT_LICENSE="foo"
1.63 portage-utils/qdepends.c
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?r1=1.62&r2=1.63
Index: qdepends.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qdepends.c 29 Sep 2013 10:03:06 -0000 1.62
+++ qdepends.c 29 Sep 2013 10:07:28 -0000 1.63
@@ -1,7 +1,7 @@
/*
* Copyright 2005-2013 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.62 2013/09/29 10:03:06 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.63 2013/09/29 10:07:28 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
@@ -32,7 +32,7 @@
"Pretty format specified depend strings",
COMMON_OPTS_HELP
};
-static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.62 2013/09/29 10:03:06 vapier Exp $";
+static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.63 2013/09/29 10:07:28 vapier Exp $";
#define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends"))
static char qdep_name_only = 0;
@@ -146,7 +146,6 @@
_q_static dep_node *dep_grow_tree(const char *depend)
{
- bool saw_whitespace;
signed long paren_balanced;
const char *ptr, *word;
int curr_attach;
@@ -176,10 +175,8 @@
word = NULL; \
} while (0)
- saw_whitespace = true;
for (ptr = depend; *ptr; ++ptr) {
if (isspace(*ptr)) {
- saw_whitespace = true;
_maybe_consume_word(DEP_NORM);
continue;
}
@@ -195,8 +192,6 @@
continue;
}
case '|': {
- if (!saw_whitespace)
- break;
if (ptr[1] != '|') {
warnf("Found a | but not ||");
goto error_out;
@@ -208,8 +203,6 @@
}
case '(': {
++paren_balanced;
- if (!saw_whitespace)
- break;
if (prev_type == DEP_OR || prev_type == DEP_USE) {
_maybe_consume_word(DEP_NORM);
prev_type = DEP_NULL;
@@ -226,8 +219,6 @@
}
case ')': {
--paren_balanced;
- if (!saw_whitespace)
- break;
_maybe_consume_word(DEP_NORM);
if (curr_node->parent == NULL) {
@@ -242,7 +233,6 @@
if (!word)
word = ptr;
}
- saw_whitespace = false;
/* fall through to the paren failure below */
if (paren_balanced < 0)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-projects commit in portage-utils: TODO qdepends.c
@ 2013-09-29 10:10 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2013-09-29 10:10 UTC (permalink / raw
To: gentoo-commits
vapier 13/09/29 10:10:51
Modified: TODO qdepends.c
Log:
revert accidental revert
Revision Changes Path
1.15 portage-utils/TODO
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/TODO?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/TODO?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/TODO?r1=1.14&r2=1.15
Index: TODO
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/TODO,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TODO 29 Sep 2013 10:07:28 -0000 1.14
+++ TODO 29 Sep 2013 10:10:51 -0000 1.15
@@ -34,6 +34,7 @@
- only 64bit values are supported in any individual version component
foo-(1234)_alpha(56789)
- these limits should not be an issue for all practical purposes
+ - need to handle USE deps like: cat/pkg-123[foo(+)]
- env vars only get expanded once, so this fails:
ACCEPT_LICENSE="foo"
1.64 portage-utils/qdepends.c
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?r1=1.63&r2=1.64
Index: qdepends.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qdepends.c 29 Sep 2013 10:07:28 -0000 1.63
+++ qdepends.c 29 Sep 2013 10:10:51 -0000 1.64
@@ -1,7 +1,7 @@
/*
* Copyright 2005-2013 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.63 2013/09/29 10:07:28 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.64 2013/09/29 10:10:51 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
@@ -32,7 +32,7 @@
"Pretty format specified depend strings",
COMMON_OPTS_HELP
};
-static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.63 2013/09/29 10:07:28 vapier Exp $";
+static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.64 2013/09/29 10:10:51 vapier Exp $";
#define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends"))
static char qdep_name_only = 0;
@@ -146,6 +146,7 @@
_q_static dep_node *dep_grow_tree(const char *depend)
{
+ bool saw_whitespace;
signed long paren_balanced;
const char *ptr, *word;
int curr_attach;
@@ -175,8 +176,10 @@
word = NULL; \
} while (0)
+ saw_whitespace = true;
for (ptr = depend; *ptr; ++ptr) {
if (isspace(*ptr)) {
+ saw_whitespace = true;
_maybe_consume_word(DEP_NORM);
continue;
}
@@ -192,6 +195,8 @@
continue;
}
case '|': {
+ if (!saw_whitespace)
+ break;
if (ptr[1] != '|') {
warnf("Found a | but not ||");
goto error_out;
@@ -203,6 +208,8 @@
}
case '(': {
++paren_balanced;
+ if (!saw_whitespace)
+ break;
if (prev_type == DEP_OR || prev_type == DEP_USE) {
_maybe_consume_word(DEP_NORM);
prev_type = DEP_NULL;
@@ -219,6 +226,8 @@
}
case ')': {
--paren_balanced;
+ if (!saw_whitespace)
+ break;
_maybe_consume_word(DEP_NORM);
if (curr_node->parent == NULL) {
@@ -233,6 +242,7 @@
if (!word)
word = ptr;
}
+ saw_whitespace = false;
/* fall through to the paren failure below */
if (paren_balanced < 0)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-29 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-29 10:07 [gentoo-commits] gentoo-projects commit in portage-utils: TODO qdepends.c Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2013-09-29 10:10 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox