[sword-cvs] sword/src/modules/common rawstr.cpp,1.40,1.41 rawstr4.cpp,1.22,1.23 rawverse.cpp,1.33,1.34 zstr.cpp,1.23,1.24 zverse.cpp,1.34,1.35
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 15 Jan 2004 20:42:45 -0700
Update of /cvs/core/sword/src/modules/common
In directory www:/tmp/cvs-serv22315/src/modules/common
Modified Files:
rawstr.cpp rawstr4.cpp rawverse.cpp zstr.cpp zverse.cpp
Log Message:
WINCE fixes
Index: rawstr.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/common/rawstr.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- rawstr.cpp 16 Jul 2003 12:26:09 -0000 1.40
+++ rawstr.cpp 16 Jan 2004 03:42:42 -0000 1.41
@@ -536,13 +536,13 @@
path[strlen(path)-1] = 0;
sprintf(buf, "%s.dat", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s.idx", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
FileMgr::systemFileMgr.close(fd2);
Index: rawstr4.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/common/rawstr4.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- rawstr4.cpp 16 Jul 2003 12:26:09 -0000 1.22
+++ rawstr4.cpp 16 Jan 2004 03:42:42 -0000 1.23
@@ -542,13 +542,13 @@
path[strlen(path)-1] = 0;
sprintf(buf, "%s.dat", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s.idx", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
FileMgr::systemFileMgr.close(fd2);
Index: rawverse.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/common/rawverse.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- rawverse.cpp 21 Nov 2003 06:13:15 -0000 1.33
+++ rawverse.cpp 16 Jan 2004 03:42:42 -0000 1.34
@@ -307,24 +307,24 @@
path[strlen(path)-1] = 0;
sprintf(buf, "%s/ot", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s/nt", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s/ot.vss", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
sprintf(buf, "%s/nt.vss", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
Index: zstr.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/common/zstr.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- zstr.cpp 12 Aug 2003 05:53:11 -0000 1.23
+++ zstr.cpp 16 Jan 2004 03:42:42 -0000 1.24
@@ -687,25 +687,25 @@
path[strlen(path)-1] = 0;
sprintf(buf, "%s.dat", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s.idx", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
FileMgr::systemFileMgr.close(fd2);
sprintf(buf, "%s.zdt", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
FileMgr::systemFileMgr.close(fd2);
sprintf(buf, "%s.zdx", path);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
FileMgr::systemFileMgr.close(fd2);
Index: zverse.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/common/zverse.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- zverse.cpp 12 Aug 2003 20:30:01 -0000 1.34
+++ zverse.cpp 16 Jan 2004 03:42:42 -0000 1.35
@@ -419,36 +419,36 @@
path[strlen(path)-1] = 0;
sprintf(buf, "%s/ot.%czs", path, uniqueIndexID[blockBound]);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s/nt.%czs", path, uniqueIndexID[blockBound]);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s/ot.%czz", path, uniqueIndexID[blockBound]);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s/nt.%czz", path, uniqueIndexID[blockBound]);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();
FileMgr::systemFileMgr.close(fd);
sprintf(buf, "%s/ot.%czv", path, uniqueIndexID[blockBound]);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd->getFd();
sprintf(buf, "%s/nt.%czv", path, uniqueIndexID[blockBound]);
- unlink(buf);
+ FileMgr::removeFile(buf);
fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
fd2->getFd();