Changeset 5064

Timestamp:

12/03/07 19:07:45 (8 months ago)

Author:

morris

Message:

Handle decomposed file name strings so that we can compare them when searching

Files:

• wired/trunk/wired/files.c (modified) (6 diffs)
• wired/trunk/wired/files.h (modified) (1 diff)

wired/trunk/wired/files.c

@@ -29 +29 @@
-#include "config.h"
-
+#ifdef HAVE_CORESERVICES_CORESERVICES_H
+#import <CoreFoundation/CoreFoundation.h>
+#endif
+
-#include <sys/param.h>
-#include <sys/stat.h>
@@ -631 +635 @@
-                /* get file type */
-                type = wd_files_type_with_stat(filepath, &sb);
-i_string_with
+d_files_path_with_decomposed
-                
-                if(wi_string_contains_string(name, query, WI_STRING_CASE_INSENSITIVE)) {
@@ -874 +878 @@
-        WI_FTS                                  *fts = NULL;
-        WI_FTSENT                               *p;
-
+name, *
-        wi_number_t                             *number;
-        wi_file_offset_t                size;
@@ -954 +958 @@
-                /* get file type & size */
-                type = wd_files_type_with_stat(filepath, &sb);
+                name = wd_files_path_with_decomposed_cstring(p->fts_name);
-
-                switch(type) {
@@ -975 +980 @@
-                
-                wi_file_write(file, WI_STR("%#s%c%#s%#@%c%u%c%llu%c%#@%c%#@\n"),
-p->fts_name,
+name,                
-                                          pathprefix,
-                                          virtualpath,                  WD_FIELD_SEPARATOR,
@@ -1320 +1325 @@
-
-
+wi_string_t * wd_files_path_with_decomposed_cstring(const char *cstring) {
+        wi_string_t                             *path;
+        
+#ifdef HAVE_CORESERVICES_CORESERVICES_H
+        CFMutableStringRef              string;
+        char                                    buffer[WI_PATH_SIZE];
+        
+        string = CFStringCreateMutable(NULL, 0);
+        CFStringAppendCString(string, cstring, kCFStringEncodingUTF8);
+        CFStringNormalize(string, kCFStringNormalizationFormC);
+        CFStringGetCString(string, buffer, sizeof(buffer), kCFStringEncodingUTF8);
+        path = wi_string_with_cstring(buffer);
+        CFRelease(string);
+#else
+        path = wi_string_with_cstring(cstring);
+#endif
+        
+        return path;
+}
+
+
+
-#pragma mark -
-

wired/trunk/wired/files.h

@@ -73 +73 @@
-wi_boolean_t                                                    wd_files_path_is_dropbox(wi_string_t *);
-wi_string_t *                                                   wd_files_real_path(wi_string_t *);
+wi_string_t *                                                   wd_files_path_with_decomposed_cstring(const char *);
-
-