|
Lines 1-13
Link Here
|
| 1 |
--- Completion/Unix/Command/_mount.orig 2006-05-28 13:46:56.000000000 -0500 |
1 |
--- Completion/Unix/Command/_mount.orig 2008-01-22 04:13:35.000000000 -0600 |
| 2 |
+++ Completion/Unix/Command/_mount 2007-08-20 21:22:22.000000000 -0500 |
2 |
+++ Completion/Unix/Command/_mount 2008-10-28 18:23:46.000000000 -0500 |
| 3 |
@@ -859,8 +859,8 @@ |
3 |
@@ -41,10 +41,10 @@ |
|
|
4 |
|
| 5 |
local curcontext="$curcontext" state line expl suf ret=1 |
| 6 |
local args deffs=iso9660 tmp typeops=-t _nfs_access _fs_nfs _nfs_ufs \ |
| 7 |
-_fs_ufs _fs_efs _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs _fs_hsfs \ |
| 8 |
-_fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos _fs_umsdos \ |
| 9 |
-_fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs _fs_xfs _fs_std _fs_devfs \ |
| 10 |
-_fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs |
| 11 |
+_fs_ufs _fs_efs _fs_cd9660 _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs \ |
| 12 |
+_fs_hsfs _fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos \ |
| 13 |
+_fs_msdosfs _fs_umsdos _fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs \ |
| 14 |
+_fs_xfs _fs_std _fs_devfs _fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs |
| 15 |
|
| 16 |
typeset -A opt_args |
| 17 |
|
| 18 |
@@ -527,7 +527,7 @@ |
| 19 |
'swidth[specify stripe width]:size' |
| 20 |
) |
| 21 |
;; |
| 22 |
- *freebsd*|dragonfly*) |
| 23 |
+ freebsd*|dragonfly*) |
| 24 |
_fs_any=( |
| 25 |
'(sync)async[do all I/O asynchronously]' |
| 26 |
'current[use current options on already mounted file system]' |
| 27 |
@@ -548,12 +548,12 @@ |
| 28 |
'update[change status of already mounted filesystem]' |
| 29 |
'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]' |
| 30 |
) |
| 31 |
- _fs_iso9660=( |
| 32 |
- 'extatt[enable use of extended attributes]' |
| 33 |
- "gens[don't strip version number on files]" |
| 34 |
- "joliet[don't use any Joliet extensions]" |
| 35 |
- "rrip[don't use any Rockridge extensions]" |
| 36 |
- 'strictjoliet[relax checking for Supplementary Volume Descriptor Flags field which is set to a wrong value on some Joliet formatted disks]' |
| 37 |
+ _fs_cd9660=( |
| 38 |
+ 'extatt[enable the use of extended attributes]' |
| 39 |
+ 'gens[do not strip version numbers on files]' |
| 40 |
+ 'nojoliet[do not use any Joliet extensions]' |
| 41 |
+ 'norrip[do not use any Rockridge extensions]' |
| 42 |
+ 'nostrictjoliet[relax checking for Supplementary Volume Descriptor Flags field]' |
| 43 |
) |
| 44 |
_fs_std=( |
| 45 |
"nodev[don't interpret devices]" |
| 46 |
@@ -568,10 +568,13 @@ |
| 47 |
_fs_linprocfs=( "$_fs_std[@]" ) |
| 48 |
_fs_procfs=( "$_fs_std[@]" ) |
| 49 |
_fs_msdos=( |
| 50 |
- 'shortnames[]' |
| 51 |
- 'longnames[]' |
| 52 |
- 'nowin95[]' |
| 53 |
+ 'shortnames[force only the old MS-DOS 8.3 style filenames to be visible]' |
| 54 |
+ 'longnames[force Windows 95 long filenames to be visible]' |
| 55 |
+ 'nowin95[completely ignore Windows 95 extended file information]' |
| 56 |
) |
| 57 |
+ if [[ "${OSTYPE}" =~ freebsd.* ]]; then |
| 58 |
+ _fs_msdosfs=( "$_fs_msdos[@]" ) |
| 59 |
+ fi |
| 60 |
;; |
| 61 |
esac |
| 62 |
fi |
| 63 |
@@ -682,7 +685,7 @@ |
| 64 |
deffs=hsfs |
| 65 |
typeops=-F |
| 66 |
;; |
| 67 |
- *freebsd*|dragonfly*) |
| 68 |
+ freebsd*|dragonfly*) |
| 69 |
args=( -s |
| 70 |
'(:)-a[mount all filesystems in fstab]' |
| 71 |
'-d[cause everything to be done except for the actual system call]' |
| 72 |
@@ -757,7 +760,7 @@ |
| 73 |
'*:dev or dir:->udevordir' |
| 74 |
) |
| 75 |
;; |
| 76 |
- *freebsd*|dragonfly*) |
| 77 |
+ freebsd*|dragonfly*) |
| 78 |
args=( |
| 79 |
'(*)-a[unmount all mounted file systems]' |
| 80 |
'-A[unmount all mounted file systems except the root]' |
| 81 |
@@ -819,7 +822,7 @@ |
| 82 |
fi |
| 83 |
|
| 84 |
case "$OSTYPE" in |
| 85 |
- *freebsd*|dragonfly*) |
| 86 |
+ freebsd*|dragonfly*) |
| 87 |
while read mline; do |
| 88 |
case $mline[(w)1] in |
| 89 |
\#* ) |
| 90 |
@@ -861,8 +864,13 @@ |
| 4 |
;; |
91 |
;; |
| 5 |
*) |
92 |
*) |
| 6 |
/sbin/mount | while read mline; do |
93 |
/sbin/mount | while read mline; do |
| 7 |
- mp_tmp+=( $mline[(w)1] ) |
94 |
- mp_tmp+=( $mline[(w)1] ) |
| 8 |
- dev_tmp+=( $mline[(w)3] ) |
95 |
- dev_tmp+=( $mline[(w)3] ) |
| 9 |
+ dev_tmp+=( $mline[(w)1] ) |
96 |
+ if [[ "$OSTYPE" =~ .*freebsd.* ]]; then |
| 10 |
+ mp_tmp+=( $mline[(w)3] ) |
97 |
+ dev_tmp+=( $mline[(w)1] ) |
|
|
98 |
+ mp_tmp+=( $mline[(w)3] ) |
| 99 |
+ else |
| 100 |
+ mp_tmp+=( $mline[(w)1] ) |
| 101 |
+ dev_tmp+=( $mline[(w)3] ) |
| 102 |
+ fi |
| 11 |
done |
103 |
done |
| 12 |
;; |
104 |
;; |
| 13 |
esac |
105 |
esac |