libextractor

commit e7de8dae744c4a59001c60efdfbfb3ac7a22e1f1
parent 19302d2a84beb380858e7fe4a9bff42bac207c8d
Author: Nils Durner <durner@gnunet.org>
Date:   Sat,  3 Mar 2007 23:59:29 +0000

also extract keywords from directory names

Diffstat:
M
src/main/extractor.c
 | 
64
++++++++++++++++++++++++++++++++++++++++------------------------

1 file changed, 40 insertions(+), 24 deletions(-)
diff --git a/src/main/extractor.c b/src/main/extractor.c
@@ -1186,40 +1186,56 @@ EXTRACTOR_getKeywords (EXTRACTOR_ExtractorList * extractor,
   void * buffer;
   struct stat fstatbuf;
   size_t size;
-  int eno;
+  int eno, dir;
 
+  if (-1 == STAT(filename, &fstatbuf))
+    return NULL;
+
+  if (!S_ISDIR(fstatbuf.st_mode)) {
+    dir = 0;
+      
 #ifdef O_LARGEFILE
-  file = fileopen(filename, O_RDONLY | O_LARGEFILE);
+    file = fileopen(filename, O_RDONLY | O_LARGEFILE);
 #else
-  file = fileopen(filename, O_RDONLY);
+    file = fileopen(filename, O_RDONLY);
 #endif
-  if (-1 == file)
-    return NULL;
-  if (-1 == FSTAT(file, &fstatbuf)) {
-    close(file);
-    return NULL;
-  }
-  size = fstatbuf.st_size;
-  if (size == 0) {
-    close(file);
-    return NULL;
+    if (-1 == file)
+      return NULL;
+  
+    size = fstatbuf.st_size;
+    if (size == 0) {
+      close(file);
+      return NULL;
+    }
+  
+    if (size > MAX_READ)
+      size = MAX_READ; /* do not mmap/read more than 1 GB! */
+    buffer = MMAP(NULL, size, PROT_READ, MAP_PRIVATE, file, 0);
+    if ( (buffer == NULL) || (buffer == (void *) -1) ) {
+      eno = errno;
+      close(file);
+      errno = eno;
+      return NULL;
+    }
   }
-
-  if (size > MAX_READ)
-    size = MAX_READ; /* do not mmap/read more than 1 GB! */
-  buffer = MMAP(NULL, size, PROT_READ, MAP_PRIVATE, file, 0);
-  if ( (buffer == NULL) || (buffer == (void *) -1) ) {
-    eno = errno;
-    close(file);
-    errno = eno;
-    return NULL;
+  else {
+    dir = 1;
+    
+    size = 0;
+    buffer = malloc(1);
   }
+  
   result = getKeywords(extractor,
 		       filename,
 		       buffer,
 		       size);
-  MUNMAP (buffer, size);
-  close(file);
+  
+  if (dir)
+    free(buffer);
+  else {
+    MUNMAP (buffer, size);
+    close(file);
+  }
   return result;
 }