Changeset 90 in libcf for trunk/src/cf_file.c

Timestamp:

05/18/13 18:57:13 (11 years ago)

Author:

cheese

Message:

#1 fix bug on codec and arrange file flag

File:

• trunk/src/cf_file.c (modified) (8 diffs)

trunk/src/cf_file.c

@@ -8 +8 @@
 
 #include <stdio.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <sys/stat.h>
@@ -51 +52 @@
         return CF_ERROR_FILE_INVALID_ARGS
 
+static int
+CF_File_Local_ConvertFlag (const CF_FILE_FLAG flag)
+{
+    int result = 0;
+
+    if (flag & CF_FILE_READ)    result |= O_RDONLY;
+    if (flag & CF_FILE_WRITE)   result |= O_WRONLY;
+    if (flag & CF_FILE_RW)      result |= O_RDWR;
+    if (flag & CF_FILE_CREATE)  result |= O_CREAT;
+    if (flag & CF_FILE_TRUNC)   result |= O_TRUNC;
+    if (flag & CF_FILE_APPEND)  result |= O_APPEND;
+
+    return result;
+}
+
 /**
  * 파일 열기
@@ -69 +85 @@
     ASSERT_ARGS (path == NULL);
 
-    result = open (path, (int)(flag|O_BINARY));
-
+    result = open (path, CF_File_Local_ConvertFlag (flag) | O_BINARY);
     if (result < 0)
         return CF_ERROR_FILE_OPEN;
@@ -88 +103 @@
 {
     int result = 0;
+    int flag = 0;
     
     ASSERT_ARGS (path == NULL);
 
-    result = open (path, CF_FILE_CREATE|CF_FILE_WRITE|CF_FILE_TRUNC, FILE_MODE);
-
+    flag = CF_File_Local_ConvertFlag (CF_FILE_CREATE|
+                                      CF_FILE_WRITE |
+                                      CF_FILE_TRUNC);
+
+    result = open (path, flag, FILE_MODE);
     if (result < 0)
         return CF_ERROR_FILE_CREATE;
@@ -114 +133 @@
 
     result = close (fd);
-
     if (result < 0)
         return CF_ERROR_FILE_CLOSE;
@@ -141 +159 @@
 
     result = (int) read (fd, buf, len);
-
     if (result < 0)
         return CF_ERROR_FILE_READ;
@@ -168 +185 @@
 
     result = (int) write (fd, buf, len);
-
     if (result != len)
       return CF_ERROR_FILE_WRITE;
@@ -190 +206 @@
 
     result = (int) lseek (fd, 0, SEEK_END);
-
     if (result < 0 || lseek (fd, 0, SEEK_SET) < 0)
         return CF_ERROR_FILE_GET_SIZE;