X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fdestpaths.c;h=f3cf0f2e24a7dac164fde63b12d361b08700b851;hb=c649817586e5b4df53b251d1290422f5ef046045;hp=2908ba47481507d1eff31548e5d8d6a2951e9da6;hpb=aa4fffd512faf302bacfef70c4f1f81f64820a66;p=libguestfs.git

diff --git a/fish/destpaths.c b/fish/destpaths.c
index 2908ba4..f3cf0f2 100644
--- a/fish/destpaths.c
+++ b/fish/destpaths.c
@@ -13,7 +13,7 @@
  *
  * 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>
@@ -71,6 +71,14 @@ free_words (struct word *words, size_t nr_words)
     free (words[i].name);
   free (words);
 }
+
+static int
+compare_words (const void *vp1, const void *vp2)
+{
+  const struct word *w1 = (const struct word *) vp1;
+  const struct word *w2 = (const struct word *) vp2;
+  return strcmp (w1->name, w2->name);
+}
 #endif
 
 char *
@@ -147,6 +155,12 @@ complete_dest_paths_generator (const char *text, int state)
 
       strs = guestfs_lvs (g);
       APPEND_STRS_AND_FREE;
+
+      strs = guestfs_list_dm_devices (g);
+      APPEND_STRS_AND_FREE;
+
+      strs = guestfs_list_md_devices (g);
+      APPEND_STRS_AND_FREE;
     }
 
     if (len < 1 || text[0] == '/') {
@@ -212,6 +226,9 @@ complete_dest_paths_generator (const char *text, int state)
   /* This inhibits ordinary (local filename) completion. */
   rl_attempted_completion_over = 1;
 
+  /* Sort the words so the list is stable over multiple calls. */
+  qsort (words, nr_words, sizeof (struct word), compare_words);
+
   /* Complete the string. */
   while (index < nr_words) {
     struct word *word;
@@ -219,7 +236,20 @@ complete_dest_paths_generator (const char *text, int state)
     word = &words[index];
     index++;
 
-    if (STRCASEEQLEN (word->name, text, len)) {
+    /* Whether we should match case insensitively here or not is
+     * determined by the value of the completion-ignore-case readline
+     * variable.  Default to case insensitive.  (See: RHBZ#582993).
+     */
+    char *cic_var = rl_variable_value ("completion-ignore-case");
+    int cic = 1;
+    if (cic_var && STREQ (cic_var, "off"))
+      cic = 0;
+
+    int matches =
+      cic ? STRCASEEQLEN (word->name, text, len)
+          : STREQLEN (word->name, text, len);
+
+    if (matches) {
       if (word->is_dir)
         rl_completion_append_character = '/';