summaryrefslogtreecommitdiffstats
path: root/fish
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-10-01 10:46:38 +0100
committerRichard W.M. Jones <rjones@redhat.com>2010-10-01 11:13:06 +0100
commitffc75da7139f1ff447b597457458b72eba2bb108 (patch)
treecd08879affa1023478dd68978b6e0237ed6b39b4 /fish
parentc6c030b64bab98602363485cb62a9e1d847d570e (diff)
downloadlibguestfs-ffc75da7139f1ff447b597457458b72eba2bb108.tar.gz
libguestfs-ffc75da7139f1ff447b597457458b72eba2bb108.tar.xz
libguestfs-ffc75da7139f1ff447b597457458b72eba2bb108.zip
fish: Fix glob command (RHBZ#635969).
This is a fix for the glob command in guestfish which was inadvertently broken in commit c359347dd42c9f5b875630537ee3641264826b89. This also appears to fix: https://bugzilla.redhat.com/show_bug.cgi?id=635969 glob echo mkfs ext2 /dev/vd[b-t]1 prints garbage
Diffstat (limited to 'fish')
-rw-r--r--fish/glob.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/fish/glob.c b/fish/glob.c
index 41f2bcdd..e17a9adc 100644
--- a/fish/glob.c
+++ b/fish/glob.c
@@ -1,5 +1,5 @@
/* 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
@@ -140,14 +140,8 @@ glob_issue (char *cmd, int argc,
argv[argc] = NULL;
again:
- if (guestfs_get_trace (g)) {
- printf ("%s", argv[0]);
- for (i = 1; i < argc; ++i) {
- argv[i] = globs[i][posn[i]];
- printf (" %s", argv[i]);
- }
- printf ("\n");
- }
+ for (i = 1; i < argc; ++i)
+ argv[i] = globs[i][posn[i]];
if (issue_command (argv[0], &argv[1], NULL) == -1)
*r = -1; /* ... but don't exit */