adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using dynamically allocated buffer for copyFile; even a relatively small

Browse Source 
buffer can be too large for a specific thread.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@798 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-02-22 17:32:48 +00:00
parent e8c9e86121
commit 27ee1f2b98
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/file/files.c
+18 -7
View File
@@ -25,8 +25,10 @@
#include "config.h" #include "config.h"
#include "types.h" #include "types.h"
#include "filintrn.h" #include "filintrn.h"
#include "misc.h"
static int copyError(int srcFd, int dstFd, const char *unlinkPath); static int copyError(int srcFd, int dstFd, const char *unlinkPath,
uint8 *buf);
BOOLEAN BOOLEAN
fileExists (const char *name) fileExists (const char *name)
@@ -51,7 +53,7 @@ copyFile (const char *srcName, const char *newName)
int src, dst; int src, dst;
struct stat sb; struct stat sb;
#define BUFSIZE 65536 #define BUFSIZE 65536
uint8 buf[BUFSIZE], *bufPtr; uint8 *buf, *bufPtr;
ssize_t numInBuf, numWritten; ssize_t numInBuf, numWritten;
src = open (srcName, O_RDONLY); src = open (srcName, O_RDONLY);
@@ -59,20 +61,24 @@ copyFile (const char *srcName, const char *newName)
return -1; return -1;
if (fstat (src, &sb) == -1) if (fstat (src, &sb) == -1)
return copyError (src, -1, NULL); return copyError (src, -1, NULL, NULL);
dst = open (newName, O_WRONLY | O_CREAT | O_EXCL, dst = open (newName, O_WRONLY | O_CREAT | O_EXCL,
sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO)); sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO));
if (dst == -1) if (dst == -1)
return copyError (src, -1, NULL); return copyError (src, -1, NULL, NULL);
buf = HMalloc(BUFSIZE);
// This was originally a statically allocated buffer,
// but as this function might be run from a thread with
// a small Stack, this is better.
while (1) { while (1) {
numInBuf = read (src, buf, BUFSIZE); numInBuf = read (src, buf, BUFSIZE);
if (numInBuf == -1) if (numInBuf == -1)
{ {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
return copyError (src, dst, newName); return copyError (src, dst, newName, buf);
} }
if (numInBuf == 0) if (numInBuf == 0)
break; break;
@@ -84,13 +90,14 @@ copyFile (const char *srcName, const char *newName)
{ {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
return copyError (src, dst, newName); return copyError (src, dst, newName, buf);
} }
numInBuf -= numWritten; numInBuf -= numWritten;
bufPtr += numWritten; bufPtr += numWritten;
} while (numInBuf > 0); } while (numInBuf > 0);
} }
HFree(buf);
close(src); close(src);
close(dst); close(dst);
errno = 0; errno = 0;
@@ -101,11 +108,12 @@ copyFile (const char *srcName, const char *newName)
* Closes srcFd if it's not -1. * Closes srcFd if it's not -1.
* Closes dstFd if it's not -1. * Closes dstFd if it's not -1.
* Removes unlinkpath if it's not NULL. * Removes unlinkpath if it's not NULL.
* Frees 'buf' if not NULL.
* Always returns -1. * Always returns -1.
* errno is what was before the call. * errno is what was before the call.
*/ */
static int static int
copyError(int srcFd, int dstFd, const char *unlinkPath) copyError(int srcFd, int dstFd, const char *unlinkPath, uint8 *buf)
{ {
int savedErrno; int savedErrno;
@@ -124,6 +132,9 @@ copyError(int srcFd, int dstFd, const char *unlinkPath)
if (unlinkPath != NULL) if (unlinkPath != NULL)
unlink (unlinkPath); unlink (unlinkPath);
if (buf != NULL)
HFree(buf);
errno = savedErrno; errno = savedErrno;
return -1; return -1;
} }