Changeset 154 in libcf

Timestamp:

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

Author:

cheese

Message:

#1 fix file-context bug

Location:

trunk

Files:

• include/cf_util.h (modified) (1 diff)
• src/cf_file.c (modified) (6 diffs)
• src/cf_util.c (modified) (2 diffs)
• test/file.c (modified) (1 diff)

trunk/include/cf_util.h

@@ -15 +15 @@
 #define CF_UTIL_DATETIME_LENGTH (sizeof ("0000-00-00 00:00:00.000") - 1)
 
+typedef enum 
+{
+    SUN = 0,    /**< 일요일 */
+    MON,        /**< 월요일 */
+    TUE,        /**< 화요일 */
+    WED,        /**< 수요일 */
+    THU,        /**< 목요일 */
+    FRI,        /**< 금요일 */
+    SAT,        /**< 토요일 */
+} CF_UTIL_WEEK;
+
 typedef struct __cf_util_datetime__
 {
-    int year;
-    int month;
-    int day;
-    int week; /* SUN:0 ~ SAT:6 */
+    int             year;   /**< 년. */
+    int             month;  /**< 월. */
+    int             day;    /**< 일. */
+    CF_UTIL_WEEK    week;   /**< 요일. */
 
-    int hour;
-    int min;
-    int sec;
-    int usec;
+    int             hour;   /**< 시간. */
+    int             min;    /**< 분. */
+    int             sec;    /**< 초. */
+    int             usec;   /**< 마이크로 초. */
 } CF_UTIL_DATETIME;
 

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)

trunk/src/cf_util.c

@@ -100 +100 @@
  * \return 성공 시, CF_OK; 실패 시, 오류 코드
  *
- * \param dt    datetime 구조체 주소
+ * \param dt    CF_UTIL_DATETIME 구조체 주소
  */
 int
@@ -132 +132 @@
  * \return 성공 시, CF_OK; 실패 시, 오류 코드
  *
- * \param dt    datetime 구조체 주소
+ * \param dt    CF_UTIL_DATETIME 구조체 주소
  * \param str   변환한 문자열을 저장할 충분한 공간의 메모리
+ *
+ * \remarks
+ * 날짜/시간 문자열 형식 : yyyy-MM-dd HH:mm:ss.SSS
  */
 int

trunk/test/file.c

@@ -36 +36 @@
         // error
     }
+    CF_File_GetPath (fd, buffer);
+    printf ("file path : %s\n", buffer);
     printf ("file size : %d\n", CF_File_GetSize (name));
     if (CF_File_Read (fd, buffer, sizeof (buffer)) < 0) {