diff options
| author | TAW Dev <tawdev@taw> | 2009-07-08 11:04:59 -0400 |
|---|---|---|
| committer | TAW Dev <tawdev@taw> | 2009-07-08 11:04:59 -0400 |
| commit | aa0bb68d762f72d8abb2b71079e98a8e27969412 (patch) | |
| tree | 77e38010cc0443cc7480572e823dd13ee7ee555d /src/common/lock.c | |
| parent | e9c1a79b6306783d63655eca5ddbcca0b6d825d0 (diff) | |
| parent | 4673fd3ca06010e74f8223486b0f34e58c7b0a7e (diff) | |
| download | tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.gz tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.bz2 tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.xz tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/common/lock.c')
| -rw-r--r-- | src/common/lock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/lock.c b/src/common/lock.c index 9a2205b..67001f9 100644 --- a/src/common/lock.c +++ b/src/common/lock.c @@ -1,6 +1,7 @@ #include <stdio.h> #include "lock.h" +#include "socket.h" // 書き込みファイルの保護処理 // （書き込みが終わるまで、旧ファイルを保管しておく） @@ -14,9 +15,9 @@ FILE* lock_fopen(const char* filename,int *info) { // 安全なファイル名を得る（手抜き） do { sprintf(newfile,"%s_%04d.tmp",filename,++no); - } while((fp = fopen(newfile,"r")) && (fclose(fp), no<9999) ); + } while((fp = fopen_(newfile,"r")) && (fclose_(fp), no<9999) ); *info = no; - return fopen(newfile,"w"); + return fopen_(newfile,"w"); } // 旧ファイルを削除＆新ファイルをリネーム @@ -24,7 +25,7 @@ int lock_fclose(FILE *fp,const char* filename,int *info) { int ret = 0; char newfile[512]; if(fp != NULL) { - ret = fclose(fp); + ret = fclose_(fp); sprintf(newfile,"%s_%04d.tmp",filename,*info); remove(filename); // このタイミングで落ちると最悪。 |