dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed MMapFile on POSIX

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3631 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-08-19 21:07:39 +00:00
parent 1855c9f7a5
commit 3e062ee8a6
1 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Source/strlist.h
View file

@ -492,7 +492,8 @@ class MMapFile : public IMMap
m_hFile = INVALID_HANDLE_VALUE; m_hFile = INVALID_HANDLE_VALUE;
m_hFileMap = NULL; m_hFileMap = NULL;
#else #else
m_hFile = -1; m_hFile = NULL;
m_hFileDesc = -1;
#endif #endif
m_pView = NULL; m_pView = NULL;
@ -530,7 +531,7 @@ class MMapFile : public IMMap
m_hFileMap = 0; m_hFileMap = 0;
#else #else
if (m_bTempHandle && m_hFile) if (m_bTempHandle && m_hFile)
close(m_hFile); fclose(m_hFile);
#endif #endif
} }
@ -547,13 +548,17 @@ class MMapFile : public IMMap
{ {
clear(); clear();
#ifdef _WIN32
m_hFile = hFile; m_hFile = hFile;
#else
m_hFileDesc = hFile;
#endif
m_bTempHandle = FALSE; m_bTempHandle = FALSE;
#ifdef _WIN32 #ifdef _WIN32
if (m_hFile == INVALID_HANDLE_VALUE) if (m_hFile == INVALID_HANDLE_VALUE)
#else #else
if (m_hFile == -1) if (m_hFileDesc == -1)
#endif #endif
return 0; return 0;
@ -621,8 +626,42 @@ class MMapFile : public IMMap
NULL NULL
); );
} }
#else
if (m_hFile == NULL)
{
m_hFile = tmpfile();
if (m_hFile != NULL)
{
m_hFileDesc = fileno(m_hFile);
m_bTempHandle = TRUE;
}
// resize
if (m_hFileDesc != -1)
{
char c;
if (lseek(m_hFileDesc, m_iSize, SEEK_SET) != (off_t)-1)
{
if (read(m_hFileDesc, &c, 1) != -1)
{
if (write(m_hFileDesc, &c, 1) != -1)
{
return; // no errors
}
}
}
}
m_hFileDesc = -1; // some error occured, bail
}
#endif
#ifdef _WIN32
if (!m_hFileMap) if (!m_hFileMap)
#else
if (m_hFileDesc == -1)
#endif
{ {
extern FILE *g_output; extern FILE *g_output;
extern void quit(); extern int g_display_errors; extern void quit(); extern int g_display_errors;
@ -633,14 +672,6 @@ class MMapFile : public IMMap
} }
quit(); quit();
} }
#else
if (m_hFile == -1)
{
char tmp[] = "/tmp/makensisXXXXXX";
m_hFile = mkstemp(tmp);
m_bTempHandle = TRUE;
}
#endif
} }
} }
@ -683,7 +714,7 @@ class MMapFile : public IMMap
#ifdef _WIN32 #ifdef _WIN32
m_pView = MapViewOfFile(m_hFileMap, m_bReadOnly ? FILE_MAP_READ : FILE_MAP_WRITE, 0, alignedoffset, size); m_pView = MapViewOfFile(m_hFileMap, m_bReadOnly ? FILE_MAP_READ : FILE_MAP_WRITE, 0, alignedoffset, size);
#else #else
m_pView = mmap(0, size, m_bReadOnly ? PROT_READ : PROT_READ | PROT_WRITE, MAP_SHARED, m_hFile, alignedoffset); m_pView = mmap(0, size, m_bReadOnly ? PROT_READ : PROT_READ | PROT_WRITE, MAP_SHARED, m_hFileDesc, alignedoffset);
m_iMappedSize = *sizep = size; m_iMappedSize = *sizep = size;
#endif #endif
@ -765,7 +796,8 @@ class MMapFile : public IMMap
#ifdef _WIN32 #ifdef _WIN32
HANDLE m_hFile, m_hFileMap; HANDLE m_hFile, m_hFileMap;
#else #else
int m_hFile; FILE *m_hFile;
int m_hFileDesc;
int m_iMappedSize; int m_iMappedSize;
#endif #endif
void *m_pView; void *m_pView;