[gentoo-commits] gentoo-projects commit in portage-utils: main.c q.c

[Mike Frysinger (vapier)]

vapier      14/02/25 21:30:50

  Modified:             main.c q.c
  Log:
  add support for setting ROOT via cmdline --root flag http://crbug.com/336871

Revision  Changes    Path
1.232                portage-utils/main.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.232&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.232&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.231&r2=1.232

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- main.c	18 Feb 2014 07:31:33 -0000	1.231
+++ main.c	25 Feb 2014 21:30:50 -0000	1.232
@@ -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/main.c,v 1.231 2014/02/18 07:31:33 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.232 2014/02/25 21:30:50 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2013 Mike Frysinger  - <vapier@g.o>
@@ -83,6 +83,7 @@
 /* Common usage for all applets */
 #define COMMON_FLAGS "vqChV"
 #define COMMON_LONG_OPTS \
+	{"root",       a_argument, NULL, 0x1}, \
 	{"verbose",   no_argument, NULL, 'v'}, \
 	{"quiet",     no_argument, NULL, 'q'}, \
 	{"nocolor",   no_argument, NULL, 'C'}, \
@@ -90,6 +91,7 @@
 	{"version",   no_argument, NULL, 'V'}, \
 	{NULL,        no_argument, NULL, 0x0}
 #define COMMON_OPTS_HELP \
+	"Set the ROOT env var", \
 	"Make a lot of noise", \
 	"Tighter output; suppress warnings", \
 	"Don't output color", \
@@ -97,6 +99,7 @@
 	"Print version and exit", \
 	NULL
 #define COMMON_GETOPTS_CASES(applet) \
+	case 0x1: portroot = optarg; break; \
 	case 'v': ++verbose; break; \
 	case 'q': ++quiet; if (freopen("/dev/null", "w", stderr)) { /* ignore errors */ } break; \
 	case 'V': version_barf( applet ## _rcsid ); break; \
@@ -137,7 +140,7 @@
 		assert(help[i] != NULL);
 
 		/* first output the short flag if it has one */
-		if (opts[i].val > '~')
+		if (opts[i].val > '~' || opts[i].val < ' ')
 			printf("      ");
 		else
 			printf("  -%c, ", opts[i].val);



1.53                 portage-utils/q.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/q.c?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/q.c?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/q.c?r1=1.52&r2=1.53

Index: q.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/q.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- q.c	17 Mar 2011 03:32:51 -0000	1.52
+++ q.c	25 Feb 2014 21:30:50 -0000	1.53
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.52 2011/03/17 03:32:51 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.53 2014/02/25 21:30:50 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -22,7 +22,7 @@
 	"Module path",
 	COMMON_OPTS_HELP
 };
-static const char q_rcsid[] = "$Id: q.c,v 1.52 2011/03/17 03:32:51 vapier Exp $";
+static const char q_rcsid[] = "$Id: q.c,v 1.53 2014/02/25 21:30:50 vapier Exp $";
 #define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, lookup_applet_idx("q"))
 
 static APPLET lookup_applet(const char *applet)
@@ -145,16 +145,17 @@
 		return 1;
 
 	/* In case of "q --option ... appletname ...", remove appletname from the
-	 * applet's args, exchange "appletname" and "--option". */
+	 * applet's args. */
 	if (optind > 1) {
-		char* appletname = argv[optind];
-		argv[optind] = argv[1];
-		argv[1] = appletname;
-	}
+		argv[0] = argv[optind];
+		for (i = optind; i < argc; ++i)
+			argv[i] = argv[i + 1];
+	} else
+		++argv;
 
 	optind = 0; /* reset so the applets can call getopt */
 
-	return (func)(argc - 1, ++argv);
+	return (func)(argc - 1, argv);
 }
 
 static int run_applet_l(const char *arg, ...)