diff options
author | Karel Zak | 2013-09-30 15:49:00 +0200 |
---|---|---|
committer | Karel Zak | 2013-09-30 15:49:00 +0200 |
commit | ce3e6b15e2c4478b2df9a7016c168b16325abfb0 (patch) | |
tree | 8c85ee4225a6a6a4db7fac0b63445a021b826eb5 | |
parent | textual: fix misspelled words in -rc1 (diff) | |
download | kernel-qcow2-util-linux-ce3e6b15e2c4478b2df9a7016c168b16325abfb0.tar.gz kernel-qcow2-util-linux-ce3e6b15e2c4478b2df9a7016c168b16325abfb0.tar.xz kernel-qcow2-util-linux-ce3e6b15e2c4478b2df9a7016c168b16325abfb0.zip |
bash-completion: use '\n' as IFS when ask for filenames
The bash completion for more(1) treats the space-separated pieces of
filenames as different files.
$ touch foo\ bar
$ more foo<TAB>
bar foo
Reported-by: Ángel González <ingenit@zoho.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
46 files changed, 49 insertions, 0 deletions
diff --git a/bash-completion/blkid b/bash-completion/blkid index b43932858..9f97dd94e 100644 --- a/bash-completion/blkid +++ b/bash-completion/blkid @@ -6,6 +6,7 @@ _blkid_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-c') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/colcrt b/bash-completion/colcrt index f9e4c333f..c66d7e6d6 100644 --- a/bash-completion/colcrt +++ b/bash-completion/colcrt @@ -19,6 +19,7 @@ _colcrt_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/column b/bash-completion/column index f5cb86b9c..3af8e736a 100644 --- a/bash-completion/column +++ b/bash-completion/column @@ -30,6 +30,7 @@ _column_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/cytune b/bash-completion/cytune index 4f4283805..f685c88ee 100644 --- a/bash-completion/cytune +++ b/bash-completion/cytune @@ -33,6 +33,7 @@ _cytune_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- ${cur:-"/dev/tty"}) ) return 0 diff --git a/bash-completion/dmesg b/bash-completion/dmesg index 60ecc1af6..eab41ba08 100644 --- a/bash-completion/dmesg +++ b/bash-completion/dmesg @@ -6,6 +6,7 @@ _dmesg_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-F'|'--file') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/fallocate b/bash-completion/fallocate index 5007b605e..2c6e4cbae 100644 --- a/bash-completion/fallocate +++ b/bash-completion/fallocate @@ -20,6 +20,7 @@ _fallocate_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/findmnt b/bash-completion/findmnt index 9386d8f5a..3ed331ac0 100644 --- a/bash-completion/findmnt +++ b/bash-completion/findmnt @@ -18,6 +18,7 @@ _findmnt_module() return 0 ;; '-F'|'--tab-file') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/flock b/bash-completion/flock index 8cd60d33e..8e7f8b859 100644 --- a/bash-completion/flock +++ b/bash-completion/flock @@ -38,6 +38,7 @@ _flock_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- ${cur:-"/"}) ) return 0 diff --git a/bash-completion/fsck.cramfs b/bash-completion/fsck.cramfs index 84f6f31b4..acf656411 100644 --- a/bash-completion/fsck.cramfs +++ b/bash-completion/fsck.cramfs @@ -6,6 +6,7 @@ _fsck.cramfs_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-x'|'--destination') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) ) return 0 diff --git a/bash-completion/hexdump b/bash-completion/hexdump index aa6f8cefd..9dc274076 100644 --- a/bash-completion/hexdump +++ b/bash-completion/hexdump @@ -40,6 +40,7 @@ _hexdump_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/hwclock b/bash-completion/hwclock index 0c4ebafc1..de1ac20f3 100644 --- a/bash-completion/hwclock +++ b/bash-completion/hwclock @@ -6,6 +6,7 @@ _hwclock_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-f'|'--rtc'|'--adjfile') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/ionice b/bash-completion/ionice index 3a01c5125..1b1c5fe0a 100644 --- a/bash-completion/ionice +++ b/bash-completion/ionice @@ -30,6 +30,7 @@ _ionice_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/last b/bash-completion/last index 493051e64..c93be3d43 100644 --- a/bash-completion/last +++ b/bash-completion/last @@ -6,6 +6,7 @@ _last_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-f') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/ldattach b/bash-completion/ldattach index 830142d23..0b9d26034 100644 --- a/bash-completion/ldattach +++ b/bash-completion/ldattach @@ -42,6 +42,7 @@ _ldattach_module() return 0 ;; /*) + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/logger b/bash-completion/logger index f46be8ad0..963abc704 100644 --- a/bash-completion/logger +++ b/bash-completion/logger @@ -6,6 +6,7 @@ _logger_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-f'|'--file') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/look b/bash-completion/look index e8676bae4..303a7565a 100644 --- a/bash-completion/look +++ b/bash-completion/look @@ -20,6 +20,7 @@ _look_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/losetup b/bash-completion/losetup index 75240b8c9..874c549ae 100644 --- a/bash-completion/losetup +++ b/bash-completion/losetup @@ -60,6 +60,7 @@ _losetup_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/lscpu b/bash-completion/lscpu index 27367426a..7e189eee6 100644 --- a/bash-completion/lscpu +++ b/bash-completion/lscpu @@ -42,6 +42,7 @@ _lscpu_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/lslocks b/bash-completion/lslocks index 337d07e04..c9cff2c6b 100644 --- a/bash-completion/lslocks +++ b/bash-completion/lslocks @@ -38,6 +38,7 @@ _lslocks_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/mcookie b/bash-completion/mcookie index eb3f54b5f..4345b6e6c 100644 --- a/bash-completion/mcookie +++ b/bash-completion/mcookie @@ -6,6 +6,7 @@ _mcookie_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-f'|'--file') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/mkfs.cramfs b/bash-completion/mkfs.cramfs index 38ab3b65f..af74e1212 100644 --- a/bash-completion/mkfs.cramfs +++ b/bash-completion/mkfs.cramfs @@ -36,6 +36,7 @@ _mkfs.cramfs_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/mkswap b/bash-completion/mkswap index c411b3005..b72efafd9 100644 --- a/bash-completion/mkswap +++ b/bash-completion/mkswap @@ -28,6 +28,7 @@ _mkswap_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/more b/bash-completion/more index 945c7b341..809cea2b3 100644 --- a/bash-completion/more +++ b/bash-completion/more @@ -21,6 +21,8 @@ _more_module() return 0 ;; esac + + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/mount b/bash-completion/mount index 2303cb7c1..db97a918a 100644 --- a/bash-completion/mount +++ b/bash-completion/mount @@ -80,6 +80,7 @@ hfs nohfs romfs noromfs return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/mountpoint b/bash-completion/mountpoint index 8fe27b813..f74efc9cc 100644 --- a/bash-completion/mountpoint +++ b/bash-completion/mountpoint @@ -20,6 +20,7 @@ _mountpoint_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- ${cur:-"/"}) ) return 0 diff --git a/bash-completion/namei b/bash-completion/namei index 63fb37ac1..640273500 100644 --- a/bash-completion/namei +++ b/bash-completion/namei @@ -16,6 +16,7 @@ _namei_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/nsenter b/bash-completion/nsenter index 2970b8d5e..268f3782c 100644 --- a/bash-completion/nsenter +++ b/bash-completion/nsenter @@ -40,6 +40,7 @@ _nsenter_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/pg b/bash-completion/pg index 9b1bad930..8fce1302a 100644 --- a/bash-completion/pg +++ b/bash-completion/pg @@ -25,6 +25,7 @@ _pg_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/pivot_root b/bash-completion/pivot_root index 961c88374..95df4b4d2 100644 --- a/bash-completion/pivot_root +++ b/bash-completion/pivot_root @@ -11,6 +11,7 @@ _pivot_root_module() esac case $COMP_CWORD in 1|2) + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) ) ;; diff --git a/bash-completion/readprofile b/bash-completion/readprofile index a5f45f564..bd265a69a 100644 --- a/bash-completion/readprofile +++ b/bash-completion/readprofile @@ -6,6 +6,7 @@ _readprofile_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-m'|'--mapfile'|'-p'|'--profile') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/rename b/bash-completion/rename index 3842c4d14..81365a5b2 100644 --- a/bash-completion/rename +++ b/bash-completion/rename @@ -24,6 +24,7 @@ _rename_module() COMPREPLY=( $(compgen -W "replacement" -- $cur) ) ;; *) + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) ;; diff --git a/bash-completion/rev b/bash-completion/rev index 619c5c4f6..e5397d5d8 100644 --- a/bash-completion/rev +++ b/bash-completion/rev @@ -16,6 +16,7 @@ _rev_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/script b/bash-completion/script index 329fc482f..d7efd7e7c 100644 --- a/bash-completion/script +++ b/bash-completion/script @@ -32,6 +32,7 @@ _script_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/scriptreplay b/bash-completion/scriptreplay index 2ad7b118c..a4aa8a08d 100644 --- a/bash-completion/scriptreplay +++ b/bash-completion/scriptreplay @@ -24,6 +24,7 @@ _scriptreplay_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/setterm b/bash-completion/setterm index 7fa0a4e45..a7ef6ebed 100644 --- a/bash-completion/setterm +++ b/bash-completion/setterm @@ -45,6 +45,7 @@ _setterm_module() return 0 ;; '-file') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/sfdisk b/bash-completion/sfdisk index 0226b0483..609104ca3 100644 --- a/bash-completion/sfdisk +++ b/bash-completion/sfdisk @@ -14,6 +14,7 @@ _sfdisk_module() return 0 ;; '-O'|'-I') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/su b/bash-completion/su index e739b56d9..dad1b5f04 100644 --- a/bash-completion/su +++ b/bash-completion/su @@ -38,6 +38,7 @@ _su_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/swaplabel b/bash-completion/swaplabel index 093169e06..08aa9cd79 100644 --- a/bash-completion/swaplabel +++ b/bash-completion/swaplabel @@ -24,6 +24,7 @@ _swaplabel_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/tailf b/bash-completion/tailf index e3dd295b1..0d4c869c0 100644 --- a/bash-completion/tailf +++ b/bash-completion/tailf @@ -20,6 +20,7 @@ _tailf_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/tunelp b/bash-completion/tunelp index 614b2354f..bd2cce2aa 100644 --- a/bash-completion/tunelp +++ b/bash-completion/tunelp @@ -44,6 +44,7 @@ _tunelp_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- ${cur:-"/dev/lp"}) ) return 0 diff --git a/bash-completion/ul b/bash-completion/ul index c00e510f6..449cbe054 100644 --- a/bash-completion/ul +++ b/bash-completion/ul @@ -25,6 +25,7 @@ _ul_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/utmpdump b/bash-completion/utmpdump index 48af5bc7f..fb636c18a 100644 --- a/bash-completion/utmpdump +++ b/bash-completion/utmpdump @@ -16,6 +16,7 @@ _utmpdump_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/uuidd b/bash-completion/uuidd index c45b0674c..c8f6697c9 100644 --- a/bash-completion/uuidd +++ b/bash-completion/uuidd @@ -6,16 +6,19 @@ _uuidd_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-p'|'--pid'|'-s'|'--socket') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 ;; '-T'|'--timeout') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -W "timeout" -- $cur) ) return 0 ;; '-n'|'--uuids') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -W "number" -- $cur) ) return 0 diff --git a/bash-completion/wall b/bash-completion/wall index 55d96587e..e3145ff6d 100644 --- a/bash-completion/wall +++ b/bash-completion/wall @@ -20,6 +20,7 @@ _wall_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) return 0 diff --git a/bash-completion/wdctl b/bash-completion/wdctl index 33b4e1ff6..4f16e7607 100644 --- a/bash-completion/wdctl +++ b/bash-completion/wdctl @@ -56,6 +56,7 @@ _wdctl_module() return 0 ;; esac + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- ${cur:-"/dev/"}) ) return 0 diff --git a/bash-completion/whereis b/bash-completion/whereis index 2273a07c5..0dcbac35b 100644 --- a/bash-completion/whereis +++ b/bash-completion/whereis @@ -6,6 +6,7 @@ _whereis_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-B'|'-M'|'-S') + local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) ) return 0 |