From: Richard Jones <rjones@redhat.com>
Date: Tue, 25 May 2010 12:52:53 +0000 (+0100)
Subject: fish: Sort returned paths so the list is stable across multiple calls.
X-Git-Tag: 1.2.9~22
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d19f31fa3a02773da6e49dc4e3de08f2682034f1;p=libguestfs.git

fish: Sort returned paths so the list is stable across multiple calls.
(cherry picked from commit 53c3b9d2b03fa5cb0ac7e86a5a51f2a18a2b91c1)
---

diff --git a/fish/destpaths.c b/fish/destpaths.c
index 2908ba4..403fe7f 100644
--- a/fish/destpaths.c
+++ b/fish/destpaths.c
@@ -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 *
@@ -212,6 +220,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;