generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-11-04 12:17:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122 from miloyip/issue114tmpnam

Browse Source 
Replace tmpname() by mkstemp() on non-MSVC compilers
This commit is contained in:
Milo Yip
2014-08-29 00:01:12 +09:00
parent e27f7e7123 6f4c83ad30
commit 1fafc38ee2
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/unittest/encodedstreamtest.cpp
View File

@@ -158,9 +158,7 @@ protected:
// Test FileWriteStream // Test FileWriteStream
{ {
char filename[L_tmpnam]; char filename[L_tmpnam];
TempFilename(filename); FILE* fp = TempFile(filename);
FILE *fp = fopen(filename, "wb");
char buffer[16]; char buffer[16];
FileWriteStream os(fp, buffer, sizeof(buffer)); FileWriteStream os(fp, buffer, sizeof(buffer));
EncodedOutputStream<FileEncoding, FileWriteStream> eos(os, putBOM); EncodedOutputStream<FileEncoding, FileWriteStream> eos(os, putBOM);
@@ -193,9 +191,8 @@ protected:
// Test FileWriteStream // Test FileWriteStream
{ {
char filename[L_tmpnam]; char filename[L_tmpnam];
TempFilename(filename); FILE* fp = TempFile(filename);
FILE *fp = fopen(filename, "wb");
char buffer[16]; char buffer[16];
FileWriteStream os(fp, buffer, sizeof(buffer)); FileWriteStream os(fp, buffer, sizeof(buffer));
AutoUTFOutputStream<unsigned, FileWriteStream> eos(os, type, putBOM); AutoUTFOutputStream<unsigned, FileWriteStream> eos(os, type, putBOM);

3
test/unittest/filestreamtest.cpp
View File

@@ -98,9 +98,8 @@ TEST_F(FileStreamTest, FileReadStream) {
TEST_F(FileStreamTest, FileWriteStream) { TEST_F(FileStreamTest, FileWriteStream) {
char filename[L_tmpnam]; char filename[L_tmpnam];
TempFilename(filename); FILE* fp = TempFile(filename);
FILE *fp = fopen(filename, "wb");
char buffer[65536]; char buffer[65536];
FileWriteStream os(fp, buffer, sizeof(buffer)); FileWriteStream os(fp, buffer, sizeof(buffer));
for (size_t i = 0; i < length_; i++) for (size_t i = 0; i < length_; i++)

10
test/unittest/unittest.h
View File

@@ -67,13 +67,21 @@ inline Ch* StrDup(const Ch* str) {
return buffer; return buffer;
} }
inline void TempFilename(char *filename) { inline FILE* TempFile(char *filename) {
#if _MSC_VER
filename = tmpnam(filename); filename = tmpnam(filename);
// For Visual Studio, tmpnam() adds a backslash in front. Remove it. // For Visual Studio, tmpnam() adds a backslash in front. Remove it.
if (filename[0] == '\\') if (filename[0] == '\\')
for (int i = 0; filename[i] != '\0'; i++) for (int i = 0; filename[i] != '\0'; i++)
filename[i] = filename[i + 1]; filename[i] = filename[i + 1];
return fopen(filename, "wb");
#else
strcpy(filename, "/tmp/fileXXXXXX");
int fd = mkstemp(filename);
return fdopen(fd, "w");
#endif
} }
// Use exception for catching assert // Use exception for catching assert