[PC-BSD Commits] r3780 - in pcbsd: branches/7.1/system-overlay/sbin trunk/system-overlay/sbin

[svn at pcbsd.org]

Author: kris
Date: 2009-04-09 09:39:55 -0700 (Thu, 09 Apr 2009)
New Revision: 3780

Modified:
   pcbsd/branches/7.1/system-overlay/sbin/mount_ntfs
   pcbsd/trunk/system-overlay/sbin/mount_ntfs
Log:

Fixed mount_ntfs script, which corrects an issue mounting NTFS partitions while running under UTF-8 locales



Modified: pcbsd/branches/7.1/system-overlay/sbin/mount_ntfs
===================================================================
--- pcbsd/branches/7.1/system-overlay/sbin/mount_ntfs	2009-04-08 19:13:14 UTC (rev 3779)
+++ pcbsd/branches/7.1/system-overlay/sbin/mount_ntfs	2009-04-09 16:39:55 UTC (rev 3780)
@@ -18,6 +18,7 @@
 OPTIONS=""
 FOUNDOPT="0"
 FOUNDU="0"
+FOUNDC="0"
 HWDEV=""
 FOUNDDEV="0"
 
@@ -29,6 +30,10 @@
     elif [ "${FOUNDU}" = "1" ]
     then
         OPTIONS="${OPTIONS} -o uid=${i}"
+    elif [ "${FOUNDC}" = "1" ]
+    then
+        # We have a -C flag, so ignore it and following argument
+        FOUNDC="0"
     else
 
        if [ "${FOUNDDEV}" = "1" ]
@@ -64,7 +69,7 @@
         fi
 
         # Add the value to our mount string
-        if [ "${i}" != "-o" -a "${i}" != "-u" ]
+        if [ "${i}" != "-o" -a "${i}" != "-u" -a "${i}" != "-C" ]
         then
           MNTSTRING="${MNTSTRING} ${i}"
         fi
@@ -86,6 +91,14 @@
     else
        FOUNDOPT="0"
     fi
+
+    # Check if we are on a -C flag now
+    if [ "${i}" = "-C" ]
+    then
+       FOUNDC="1"
+    else
+       FOUNDC="0"
+    fi
 done
 
 # Save our final string which our FUSE helper will use

Modified: pcbsd/trunk/system-overlay/sbin/mount_ntfs
===================================================================
--- pcbsd/trunk/system-overlay/sbin/mount_ntfs	2009-04-08 19:13:14 UTC (rev 3779)
+++ pcbsd/trunk/system-overlay/sbin/mount_ntfs	2009-04-09 16:39:55 UTC (rev 3780)
@@ -18,6 +18,7 @@
 OPTIONS=""
 FOUNDOPT="0"
 FOUNDU="0"
+FOUNDC="0"
 HWDEV=""
 FOUNDDEV="0"
 
@@ -29,6 +30,10 @@
     elif [ "${FOUNDU}" = "1" ]
     then
         OPTIONS="${OPTIONS} -o uid=${i}"
+    elif [ "${FOUNDC}" = "1" ]
+    then
+        # We have a -C flag, so ignore it and following argument
+        FOUNDC="0"
     else
 
        if [ "${FOUNDDEV}" = "1" ]
@@ -64,7 +69,7 @@
         fi
 
         # Add the value to our mount string
-        if [ "${i}" != "-o" -a "${i}" != "-u" ]
+        if [ "${i}" != "-o" -a "${i}" != "-u" -a "${i}" != "-C" ]
         then
           MNTSTRING="${MNTSTRING} ${i}"
         fi
@@ -86,6 +91,14 @@
     else
        FOUNDOPT="0"
     fi
+
+    # Check if we are on a -C flag now
+    if [ "${i}" = "-C" ]
+    then
+       FOUNDC="1"
+    else
+       FOUNDC="0"
+    fi
 done
 
 # Save our final string which our FUSE helper will use