commit f9b731600112fab28ca7c74e0a7e756e1cb36c9c
author Longwei Su <lsu@ics.com> Fri May 04 14:14:44 2012 -0400
committer Longwei Su <lsu@ics.com> Fri May 04 14:14:44 2012 -0400
tree 3261c950069cf953ef20df20239305da69f63362
parent 26591fbdcf6adb4867c4b9f1671dccdccf1d4b43

quick fixes for autotests/requestTooLargeFile segFault.

src/plugins/fileapi.cpp

diff --git a/src/plugins/fileapi.cpp b/src/plugins/fileapi.cpp
index 9c5f8af..0456565 100644
--- a/src/plugins/fileapi.cpp
+++ b/src/plugins/fileapi.cpp
@@ -38,7 +38,7 @@
  * LocalFileSystem.requestFileSystem - http://www.w3.org/TR/file-system-api/#widl-LocalFileSystem-requestFileSystem
  */
 void FileAPI::requestFileSystem( int scId, int ecId, unsigned short p_type ) {
-    Q_UNUSED(ecId)
+//    Q_UNUSED(ecId)
 
     QDir dir;
 
@@ -49,8 +49,13 @@
     else {
         dir = QDir::home();
     }
+    if (p_type >= 10000){
+      this->callback( ecId, "FileSystem.cast( 'Home', '" + dir.dirName() + "', '" + dir.absolutePath() + "/' )" );
+    } else {
+      this->callback( scId, "FileSystem.cast( 'Home', '" + dir.dirName() + "', '" + dir.absolutePath() + "/' )" );
+    }
 
-    this->callback( scId, "FileSystem.cast( 'Home', '" + dir.dirName() + "', '" + dir.absolutePath() + "/' )" );
+
 }
 
 /**
@@ -400,25 +405,25 @@
  * Helper function for recursively removing a directory
  */
 bool FileAPI::rmDir( QDir p_dir ) {
-    if( p_dir.exists() ) {
-        // Iterate over entries and remove them
-        Q_FOREACH( const QFileInfo &fileInfo, p_dir.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot ) ) {
-            if( fileInfo.isDir() ) {
-                if( !FileAPI::rmDir( fileInfo.dir() ) ) {
-                    return false;
-                }
-            }
-            else {
-                if( !QFile::remove( fileInfo.absoluteFilePath() ) ) {
-                    return false;
-                }
-            }
-        }
+//    if( p_dir.exists() ) {
+//        // Iterate over entries and remove them
+//        Q_FOREACH( const QFileInfo &fileInfo, p_dir.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot ) ) {
+//            if( fileInfo.isDir() ) {
+//                if( !FileAPI::rmDir( fileInfo.dir() ) ) {
+//                    return false;
+//                }
+//            }
+//            else {
+//                if( !QFile::remove( fileInfo.absoluteFilePath() ) ) {
+//                    return false;
+//                }
+//            }
+//        }
 
-        // Finally remove the current dir
-        qDebug() << p_dir.absolutePath();
-        return p_dir.rmdir( p_dir.absolutePath() );
-    }
+//        // Finally remove the current dir
+//        qDebug() << p_dir.absolutePath();
+//        return p_dir.rmdir( p_dir.absolutePath() );
+//    }
 
     return false;
 }