diff options
| author |   Ned Ludd <solar@gentoo.org> | 2006-07-09 14:27:52 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2006-07-09 14:27:52 +0000 |
| commit | 84df68d75db6fc513fd57cfce2d0d161a3c941f9 (patch) | |
| tree | 937060a1b6919d825f2c24aac0d65df9d9219408 | |
| parent | Add .texinfo/.html/.bin/.jar/.pdf/.tar/.txt/.wsz/.xpi/.7z to distfile filetypes. (diff) | |
| download | portage-utils-84df68d75db6fc513fd57cfce2d0d161a3c941f9.tar.gz portage-utils-84df68d75db6fc513fd57cfce2d0d161a3c941f9.tar.bz2 portage-utils-84df68d75db6fc513fd57cfce2d0d161a3c941f9.zip | |
- update q --option handling. bug 139772 ; TGL degrenier@easyconnect
| -rw-r--r-- | q.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1,7 +1,7 @@ /* * Copyright 2005-2006 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.31 2006/04/15 21:04:03 solar Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.32 2006/07/09 14:27:52 solar Exp $ * * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org> * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org> @@ -20,7 +20,7 @@ static const char *q_opts_help[] = { "Reinitialize metadata cache", COMMON_OPTS_HELP }; -static const char q_rcsid[] = "$Id: q.c,v 1.31 2006/04/15 21:04:03 solar Exp $"; +static const char q_rcsid[] = "$Id: q.c,v 1.32 2006/07/09 14:27:52 solar Exp $"; #define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, lookup_applet_idx("q")) @@ -119,6 +119,14 @@ int q_main(int argc, char **argv) if ((func = lookup_applet(argv[optind])) == NULL) return 1; + /* In case of "q --option ... appletname ...", remove appletname from the + * applet's args, exchange "appletname" and "--option". */ + if (optind > 1) { + char* appletname = argv[optind]; + argv[optind] = argv[1]; + argv[1] = appletname; + } + optind = 0; /* reset so the applets can call getopt */ return (func)(argc - 1, ++argv); |