sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some more argument sanity checking to the fuse helper script. This

Browse source 
fixes a problem where mounting NTFS volumes using ntfs-3g fails due to
bad options.

Submitted by:	Kris Moore <kris@pcbsd.com>
This commit is contained in:
Joe Marcus Clarke 2009-04-09 18:18:27 +00:00
parent 51903c69c6
commit fec58b93e9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=231945
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/hal/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= hal
DISTVERSION= 0.5.11
PORTREVISION= 22
PORTREVISION= 23
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/

32
sysutils/hal/files/mount-fuse
View file

@ -18,6 +18,8 @@ MNTSTRING=""
OPTIONS=""
FOUNDOPT="0"
FOUNDU="0"
FOUNDG="0"
FOUNDBADARG="0"
HWDEV=""
FOUNDDEV="0"
@ -29,6 +31,13 @@ do
elif [ "${FOUNDU}" = "1" ]
then
OPTIONS="${OPTIONS} -o uid=${i}"
elif [ "${FOUNDG}" = "1" ]
then
OPTIONS="${OPTIONS} -o gid=${i}"
elif [ "${FOUNDBADARG}" = "1" ]
then
# We have an invalid argument flag, so ignore it and following argument
FOUNDBADARG="0"
else
if [ "${FOUNDDEV}" = "1" ]
@ -63,15 +72,15 @@ do
fi
fi
# Add the value to our mount string
if [ "${i}" != "-o" -a "${i}" != "-u" ]
# Add the value to our mount string if it isn't any invalid flag
if [ "${i}" != "-o" -a "${i}" != "-u" -a "${i}" != "-C" -a "${i}" != "-g" -a "${i}" != "-m" -a "${i}" != "-a" -a "${i}" != "-i" -a "${i}" -a "-W" ]
then
MNTSTRING="${MNTSTRING} ${i}"
fi
fi
# Check if we are on a -u flag now
# Check if we are on a -u user id flag now
if [ "${i}" = "-u" ]
then
FOUNDU="1"
@ -79,6 +88,14 @@ do
FOUNDU="0"
fi
# Check if we are on a -g group id flag now
if [ "${i}" = "-g" ]
then
FOUNDG="1"
else
FOUNDG="0"
fi
# Check if we are on a -o option
if [ "${i}" = "-o" ]
then
@ -86,12 +103,19 @@ do
else
FOUNDOPT="0"
fi
# Check if we are on some other invalid flag
if [ "${i}" = "-C" -o "${i}" = "-m" -o "${i}" = "-W" ]
then
FOUNDBADARG="1"
else
FOUNDBADARG="0"
fi
done
# Save our final string which our FUSE helper will use
FINALSTRING="${MNTSTRING} ${OPTIONS}"
# Check that fuse.ko is loaded
kldstat | grep -q fuse 2>/dev/null
if [ "$?" != "0" ]