git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ocaml: Add g#ocaml_handle method.
[libguestfs.git]
/
fish
/
glob.c
diff --git
a/fish/glob.c
b/fish/glob.c
index
2731b2f
..
e17a9ad
100644
(file)
--- a/
fish/glob.c
+++ b/
fish/glob.c
@@
-1,5
+1,5
@@
/* guestfish - the filesystem interactive shell
/* 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
*
* 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
@@
-31,7
+31,7
@@
static void glob_issue (char *cmd, int argc, char ***globs, int *posn, int *count, int *r);
int
static void glob_issue (char *cmd, int argc, char ***globs, int *posn, int *count, int *r);
int
-
do
_glob (const char *cmd, int argc, char *argv[])
+
run
_glob (const char *cmd, int argc, char *argv[])
{
/* For 'glob cmd foo /s* /usr/s*' this could be:
*
{
/* For 'glob cmd foo /s* /usr/s*' this could be:
*
@@
-140,12
+140,8
@@
glob_issue (char *cmd, int argc,
argv[argc] = NULL;
again:
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]];
argv[i] = globs[i][posn[i]];
- printf (" %s", argv[i]);
- }
- printf ("\n");
if (issue_command (argv[0], &argv[1], NULL) == -1)
*r = -1; /* ... but don't exit */
if (issue_command (argv[0], &argv[1], NULL) == -1)
*r = -1; /* ... but don't exit */