X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fdestpaths.c;h=f3cf0f2e24a7dac164fde63b12d361b08700b851;hb=refs%2Fheads%2Fmaster;hp=403fe7f5b4353336b3aca524bdaff9e4767c793c;hpb=53c3b9d2b03fa5cb0ac7e86a5a51f2a18a2b91c1;p=libguestfs.git

diff --git a/fish/destpaths.c b/fish/destpaths.c
index 403fe7f..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>
@@ -155,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] == '/') {
@@ -230,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 = '/';