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

[Mike Frysinger (vapier)]

vapier      11/02/28 18:15:33

  Modified:             q.c
  Log:
  add a helper for easily running applets from other applets

Revision  Changes    Path
1.50                 portage-utils/q.c

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

Index: q.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/q.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- q.c	21 Feb 2011 01:33:47 -0000	1.49
+++ q.c	28 Feb 2011 18:15:32 -0000	1.50
@@ -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.49 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.50 2011/02/28 18:15:32 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.49 2011/02/21 01:33:47 vapier Exp $";
+static const char q_rcsid[] = "$Id: q.c,v 1.50 2011/02/28 18:15:32 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)
@@ -134,3 +134,43 @@
 
 	return (func)(argc - 1, ++argv);
 }
+
+static int run_applet_l(const char *arg, ...)
+{
+	int (*applet)(int, char **);
+	va_list ap;
+	int ret, optind_saved, argc;
+	char **argv;
+	const char *argv0_saved;
+
+	optind_saved = optind;
+	argv0_saved = argv0;
+
+	applet = lookup_applet(arg);
+	if (!applet)
+		return -1;
+
+	/* This doesn't NULL terminate argv, but you should be using argc */
+	va_start(ap, arg);
+	argc = 0;
+	argv = NULL;
+	while (arg) {
+		argv = xrealloc(argv, sizeof(*argv) * ++argc);
+		argv[argc - 1] = xstrdup(arg);
+		arg = va_arg(ap, const char *);
+	}
+	va_end(ap);
+
+	optind = 0;
+	argv0 = argv[0];
+	ret = applet(argc, argv);
+
+	while (argc--)
+		free(argv[argc]);
+	free(argv);
+
+	optind = optind_saved;
+	argv0 = argv0_saved;
+
+	return ret;
+}