/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2010 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
/* A bit tricky because in the case where there are multiple
* paths we have to perform a Cartesian product.
*/
-static void glob_issue (char *cmd, int argc, char ***globs, int *posn, int *count, int *r);
+static void glob_issue (char *cmd, size_t argc, char ***globs, int *posn, int *count, int *r);
int
-do_glob (const char *cmd, int argc, char *argv[])
+run_glob (const char *cmd, size_t argc, char *argv[])
{
/* For 'glob cmd foo /s* /usr/s*' this could be:
*
char **globs[argc];
int posn[argc];
int count[argc];
- int i, r = 0;
+ size_t i;
+ int r = 0;
if (argc < 1) {
fprintf (stderr, _("use 'glob command [args...]'\n"));
if (argv[i][0] == '/') {
pp = guestfs_glob_expand (g, argv[i]);
if (pp == NULL) { /* real error in glob_expand */
- fprintf (stderr, _("glob: guestfs_glob_expand call failed: %s\n"),
- argv[i]);
- goto error0;
+ fprintf (stderr, _("glob: guestfs_glob_expand call failed: %s\n"),
+ argv[i]);
+ goto error0;
}
/* If there were no matches, then we add a single element list
* containing just the original argv[i] string.
*/
if (pp[0] == NULL) {
- char **pp2;
-
- pp2 = realloc (pp, sizeof (char *) * 2);
- if (pp2 == NULL) {
- perror ("realloc");
- free (pp);
- goto error0;
- }
- pp = pp2;
-
- pp[0] = strdup (argv[i]);
- if (pp[0] == NULL) {
- perror ("strdup");
- free (pp);
- goto error0;
- }
- pp[1] = NULL;
+ char **pp2;
+
+ pp2 = realloc (pp, sizeof (char *) * 2);
+ if (pp2 == NULL) {
+ perror ("realloc");
+ free (pp);
+ goto error0;
+ }
+ pp = pp2;
+
+ pp[0] = strdup (argv[i]);
+ if (pp[0] == NULL) {
+ perror ("strdup");
+ free (pp);
+ goto error0;
+ }
+ pp[1] = NULL;
}
}
/* Doesn't begin with '/' */
else {
pp = malloc (sizeof (char *) * 2);
if (pp == NULL) {
- perror ("malloc");
- goto error0;
+ perror ("malloc");
+ goto error0;
}
pp[0] = strdup (argv[i]);
if (pp[0] == NULL) {
- perror ("strdup");
- free (pp);
- goto error0;
+ perror ("strdup");
+ free (pp);
+ goto error0;
}
pp[1] = NULL;
}
}
static void
-glob_issue (char *cmd, int argc,
- char ***globs, int *posn, int *count,
- int *r)
+glob_issue (char *cmd, size_t argc,
+ char ***globs, int *posn, int *count,
+ int *r)
{
- int i;
+ size_t i;
char *argv[argc+1];
argv[0] = cmd;
argv[argc] = NULL;
again:
- printf ("%s", argv[0]);
- for (i = 1; i < argc; ++i) {
+ for (i = 1; i < argc; ++i)
argv[i] = globs[i][posn[i]];
- printf (" %s", argv[i]);
- }
- printf ("\n");
- if (issue_command (argv[0], &argv[1]) == -1)
+ if (issue_command (argv[0], &argv[1], NULL, 0) == -1)
*r = -1; /* ... but don't exit */
for (i = argc-1; i >= 1; --i) {