[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH] Solaris, Kio, Volumes
From:       Charles Samuels <charles () kde ! org>
Date:       2002-03-21 10:07:03
[Download RAW message or body]

The attached patch has KIO system also recognize volume block devices as the 
block device for a given mountpoint.  It's a very small patch, that should 
change no behavior in all but a few very unlikely cases.

Any objections ?

-Charles

["kio_solaris_volume_mounts.diff" (text/x-diff)]

? .global.cpp.swp
? kio_solaris_volume_mounts.diff
Index: global.cpp
===================================================================
RCS file: /home/kde/kdelibs/kio/kio/global.cpp,v
retrieving revision 1.83
diff -u -r1.83 global.cpp
--- global.cpp	2002/02/28 06:34:04	1.83
+++ global.cpp	2002/03/21 10:01:50
@@ -1263,7 +1263,6 @@
 
 QString KIO::findDeviceMountPoint( const QString& filename )
 {
-    //kdDebug( 7007 ) << "findDeviceMountPoint " << filename << endl;
     QString result;
 
 #ifdef HAVE_VOLMGT
@@ -1311,9 +1310,10 @@
 		 *  or the device name without the slice#
 		 */
 		if( strncmp( devname.data(), mnt.mnt_special, len ) == 0
-			|| (strncmp( devname.data(),
-				mnt.mnt_special, len - 3 ) == 0
-				&& mnt.mnt_special[len - 3] == '/' )) {
+			|| (strncmp( devname.data(), mnt.mnt_special, len - 3 ) == 0
+				&& mnt.mnt_special[len - 3] == '/' )
+			|| (strcmp(QFile::encodeName(filename.local8Bit()).data()
+					, mnt.mnt_special)==0)) {
 			result = mnt.mnt_mountp;
 			break;
 		}


[prev in list] [next in list] [prev in thread] [next in thread]