Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 86474 and bug 79983. Truncate files used by nsFileTransport

Browse Source 
and eliminate trailing garbage from updated cache files. r=gagan, sr=darin


git-svn-id: svn://10.0.0.236/trunk@99853 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gordon%netscape.com
2001-07-25 00:40:42 +00:00
parent 36611d1dab
commit 01ee4eee70
5 changed files with 119 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mozilla/netwerk/base/src/nsFileStreams.cpp
View File

@@ -20,6 +20,24 @@
* Contributor(s):
*/
// file truncation support
#if defined(__linux)
#define _BSD_SOURCE 1
#include <unistd.h>
#elif defined(XP_MAC)
#include <Files.h>
#elif defined(XP_WIN)
#include <windows.h>
#else
// XXX add necessary include file for ftruncate (or equivalent)
#endif
#if defined(XP_MAC)
#include "pprio.h"
#else
#include "private/pprio.h"
#endif
#include "nsFileStreams.h"
#include "nsILocalFile.h"
#include "nsXPIDLString.h"
@@ -345,6 +363,46 @@ nsFileStream::Tell(PRUint32 *result)
return NS_OK;
}
NS_IMETHODIMP
nsFileStream::SetEOF()
{
if (mFD == nsnull)
return NS_BASE_STREAM_CLOSED;
#if defined(__linux) || defined(XP_MAC) || defined(XP_OS2)
// Some system calls require an EOF offset.
PRUint32 offset;
nsresult rv = Tell(&offset);
if (NS_FAILED(rv)) return rv;
#endif
#if defined(__linux)
if (ftruncate(PR_FileDesc2NativeHandle(mFD), offset) != 0) {
NS_ERROR("ftruncate failed");
return NS_ERROR_FAILURE;
}
#elif defined(XP_MAC)
if (::SetEOF(PR_FileDesc2NativeHandle(mFD), offset) != 0) {
NS_ERROR("SetEOF failed");
return NS_ERROR_FAILURE;
}
#elif defined(XP_WIN)
if (!SetEndOfFile((HANDLE) PR_FileDesc2NativeHandle(mFD))) {
NS_ERROR("SetEndOfFile failed");
return NS_ERROR_FAILURE;
}
#elif defined(XP_OS2)
if (DosSetFileSize((HFILE) PR_FileDesc2NativeHandle(mFD), offset) != NO_ERROR) {
NS_ERROR("DosSetFileSize failed");
return NS_ERROR_FAILURE;
}
#else
// XXX not implemented
#endif
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
// nsFileInputStream