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

Timestamp:

11/04/13 16:24:55 (11 years ago)

Author:

cheese

Message:

#1 fix file-context bug

File:

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

trunk/src/cf_file.c

@@ -49 +49 @@
 #endif // #if defined(_WIN32) || defined(_WIN64)
 
-#define DIRECTORY_MODE  S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH
-#define FILE_MODE       S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH
-
 #define ASSERT_CTX(__ctx)   \
     if (__ctx == NULL)      \
@@ -120 +117 @@
         osflag = CF_File_Local_ConvertFlag (flag) | O_BINARY;
 
+#define FILE_MODE   (S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH)
         fd = open (path, osflag, FILE_MODE);
         if (fd < 0)
@@ -127 +125 @@
         }
         context->fd = fd;
+        snprintf (context->path, sizeof (context->path) - 1, "%s", path);
 
         *ctx = context;
@@ -236 +235 @@
 {
     int length = 0;
-    int fd = 0;
+    int result = 0;
 
     CF_FILE_CONTEXT * context = NULL;
@@ -242 +241 @@
     ASSERT_ARGS (path == NULL);
 
-    fd = CF_File_Open ((cf_ctx *)&context, path, CF_FILE_READ);
-    if (fd < 0)
+    result = CF_File_Open ((cf_ctx *)&context, path, CF_FILE_READ);
+    if (result < 0)
         return CF_ERROR_FILE_OPEN;
 
-    length = (int) lseek (fd, 0, SEEK_END);
+    length = (int) lseek (context->fd, 0, SEEK_END);
     if (length < 0)
         return CF_ERROR_FILE_GET_SIZE;
@@ -306 +305 @@
             continue;
 
+#define DIRECTORY_MODE  (S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
         result = mkdir (stepPath, DIRECTORY_MODE);
         if (result && errno != EEXIST)