[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 69012bc6200f712a5389b2366cd25c2407d15bbf
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 15 03:28:48 2003 +0000

    WebFoundation:
    
            Reviewed by Darin, Dave and Trey, and given the seal of approval by Don.
    
    	Added a new NSFileManager extension method which can be used to
    	remove a file but will refuse to remove a directory. Used it
    	wherever we remove files but not directories.
    
            * Misc.subproj/WebNSFileManagerExtras.h:
            * Misc.subproj/WebNSFileManagerExtras.m:
    	(-[NSFileManager _web_removeFileOnlyAtPath:]): New method that
    	removes a file using unlink(2), which means we can't possibly remove a directory.
    	Also unlink ._ file if we are on a filesystem that doesn't support a resource fork.
            * Database.subproj/WebFileDatabase.m:
            (-[WebFileDatabase _truncateToSizeLimit:]):  Use the new method.
            (-[WebFileDatabase performRemoveObjectForKey:]): Use the new method.
    
    WebKit:
    
            Reviewed by Darin, Dave and Trey, and given the seal of approval by Don.
    
    	Use new safer file removal call that does not handle directories.
    
            * Downloads.subproj/WebDownloadHandler.m:
    	(-[WebDownloadHandler cleanUpAfterFailure]): Use
    	_web_removeFileOnlyAtPath:
            * Plugins.subproj/WebBaseNetscapePluginStream.m:
            (-[WebBaseNetscapePluginStream dealloc]): Use _web_removeFileOnlyAtPath:
            (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): Use _web_removeFileOnlyAtPath:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3324 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7ea80b8..d81eb2e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-01-13  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin, Dave and Trey, and given the seal of approval by Don.
+
+	Use new safer file removal call that does not handle directories.
+
+        * Downloads.subproj/WebDownloadHandler.m:
+	(-[WebDownloadHandler cleanUpAfterFailure]): Use
+	_web_removeFileOnlyAtPath:
+        * Plugins.subproj/WebBaseNetscapePluginStream.m:
+        (-[WebBaseNetscapePluginStream dealloc]): Use _web_removeFileOnlyAtPath:
+        (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): Use _web_removeFileOnlyAtPath:
+
 2003-01-14  Darin Adler  <darin at apple.com>
 
 	Reviewed by Dave.
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 6eadc05..6124369 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -144,7 +144,7 @@
         BOOL isDirectory;
         BOOL fileExists = [fileMgr fileExistsAtPath:path isDirectory:&isDirectory];
         if (fileExists && !isDirectory) {
-            [fileMgr removeFileAtPath:path handler:nil];
+            [fileMgr _web_removeFileOnlyAtPath:path];
             [[NSWorkspace sharedWorkspace] _web_noteFileChangedAtPath:path];
         } else if (!fileExists) {
             ERROR("Download file disappeared in the middle of download");
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index 6eadc05..6124369 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -144,7 +144,7 @@
         BOOL isDirectory;
         BOOL fileExists = [fileMgr fileExistsAtPath:path isDirectory:&isDirectory];
         if (fileExists && !isDirectory) {
-            [fileMgr removeFileAtPath:path handler:nil];
+            [fileMgr _web_removeFileOnlyAtPath:path];
             [[NSWorkspace sharedWorkspace] _web_noteFileChangedAtPath:path];
         } else if (!fileExists) {
             ERROR("Download file disappeared in the middle of download");
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index e5e1347..243d549 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -215,7 +215,7 @@ static void UniqueFilePathForKey(id key, char *buffer)
                 break;
             }
             NSString *filePath = [[NSString alloc] initWithFormat:@"%@/%s", path, uniqueKey];
-            [defaultManager removeFileAtPath:filePath handler:nil];
+            [defaultManager _web_removeFileOnlyAtPath:filePath];
             WebLRUFileListRemoveOldestFileFromList(lru);
         }
         [mutex unlock];
@@ -501,7 +501,7 @@ static void databaseInit()
 
     UniqueFilePathForKey(key, uniqueKey);
     filePath = [[NSString alloc] initWithFormat:@"%@/%s", path, uniqueKey];
-    [[NSFileManager defaultManager] removeFileAtPath:filePath handler:nil];
+    [[NSFileManager defaultManager] _web_removeFileOnlyAtPath:filePath];
     WebLRUFileListRemoveFileWithPath(lru, uniqueKey);
     [filePath release];
 }

-- 
WebKit Debian packaging