blob: 30b575694878c207c10b3e710a4d4f57ddcdcf7c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- ./solid/solid/backends/hal/halstorageaccess.cpp.orig 2009-12-11 02:14:57.000000000 +0300
+++ ./solid/solid/backends/hal/halstorageaccess.cpp 2010-04-11 14:13:21.934934943 +0400
@@ -317,11 +317,17 @@
#ifdef Q_OS_FREEBSD
char *cType;
- if ( fstype=="vfat" && halOptions.contains("-L=")) {
- if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) )
+ if ( fstype=="vfat" ) {
+ if ( halOptions.contains("-L=") && (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) )
options << "-L="+QString(cType);
+ if ( halOptions.contains("large") )
+ options << "large";
+ if ( halOptions.contains("-m=") )
+ options << "-m=644";
+ if ( halOptions.contains("-M=") )
+ options << "-M=755";
}
- else if ( (fstype.startsWith(QLatin1String("ntfs")) || fstype=="iso9660" || fstype=="udf") && halOptions.contains("-C=") ) {
+ else if ( (fstype=="ntfs" || fstype=="iso9660" || fstype=="udf") && halOptions.contains("-C=") ) {
if ((cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) )
options << "-C="+QString(nl_langinfo(CODESET));
}
@@ -336,6 +342,7 @@
if (halOptions.contains("flush"))
options<<"flush";
}
+#endif
// pass our locale to the ntfs-3g driver so it can translate local characters
else if ( halOptions.contains("locale=") ) {
// have to obtain LC_CTYPE as returned by the `locale` command
@@ -345,7 +352,6 @@
options << "locale="+QString(cType);
}
}
-#endif
msg << "" << fstype << options;
|
