bug 315188 make libjar use symlinks on BeOS too
patch by tqh <thesuckiestemail@yahoo.se> r=fyysik sr=darin git-svn-id: svn://10.0.0.236/trunk@184199 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
424f84d5f7
commit
fd32ae606a
@ -294,7 +294,7 @@ nsJAR::Extract(const char *zipEntry, nsIFile* outFile)
|
||||
outFile->Remove(PR_FALSE);
|
||||
else
|
||||
{
|
||||
#if defined(XP_UNIX)
|
||||
#if defined(XP_UNIX) || defined(XP_BEOS)
|
||||
if (item->flags & ZIFLAG_SYMLINK)
|
||||
{
|
||||
nsCAutoString path;
|
||||
|
||||
@ -111,6 +111,8 @@ char * strdup(const char *src)
|
||||
#include <unistd.h>
|
||||
#elif defined(XP_WIN) || defined(XP_OS2)
|
||||
#include <io.h>
|
||||
#elif defined(XP_BEOS)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifndef XP_UNIX /* we need to have some constant defined in limits.h and unistd.h */
|
||||
@ -683,7 +685,7 @@ PRInt32 nsZipArchive::ExtractFile(const char* zipEntry, const char* aOutname,
|
||||
{
|
||||
PR_Delete(aOutname);
|
||||
}
|
||||
#if defined(XP_UNIX)
|
||||
#if defined(XP_UNIX) || defined(XP_BEOS)
|
||||
else
|
||||
{
|
||||
if (ZIFLAG_SYMLINK & item->flags)
|
||||
@ -830,7 +832,7 @@ PRInt32 nsZipArchive::FindFree(nsZipFind* aFind)
|
||||
return ZIP_OK;
|
||||
}
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) || defined(XP_BEOS)
|
||||
//---------------------------------------------
|
||||
// nsZipArchive::ResolveSymlink
|
||||
//---------------------------------------------
|
||||
|
||||
@ -273,7 +273,7 @@ public:
|
||||
|
||||
PRInt32 FindFree(nsZipFind *aFind);
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) || defined(XP_BEOS)
|
||||
/**
|
||||
* ResolveSymLinks
|
||||
* @param path where the file is located
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user