[GNUnet-SVN] r9822 - Extractor/src/main

[gnunet]

Author: grothoff
Date: 2009-12-20 02:42:07 +0100 (Sun, 20 Dec 2009)
New Revision: 9822

Modified:
   Extractor/src/main/extract.c
   Extractor/src/main/extractor.c
Log:
fix bugs

Modified: Extractor/src/main/extract.c
===================================================================
--- Extractor/src/main/extract.c        2009-12-20 00:44:37 UTC (rev 9821)
+++ Extractor/src/main/extract.c        2009-12-20 01:42:07 UTC (rev 9822)
@@ -697,13 +697,15 @@
 
   /* build list of libraries */
   if (nodefault == NO)
-    plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_NONE);
+    plugins = EXTRACTOR_plugin_add_defaults (in_process
+                                            ? EXTRACTOR_OPTION_NONE
+                                            : EXTRACTOR_OPTION_AUTO_RESTART);
   else
     plugins = NULL;
   if (libraries != NULL)
     plugins = EXTRACTOR_plugin_add_config (plugins, 
                                           libraries,
-                                          in_process 
+                                          in_process
                                           ? EXTRACTOR_OPTION_NONE
                                           : EXTRACTOR_OPTION_AUTO_RESTART);
   if (binary != NULL) 
@@ -727,7 +729,7 @@
       plugins = EXTRACTOR_plugin_add_last(plugins,
                                          name,
                                          NULL,
-                                         in_process 
+                                         in_process
                                          ? EXTRACTOR_OPTION_NONE
                                          : EXTRACTOR_OPTION_AUTO_RESTART);
       free(name);

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2009-12-20 00:44:37 UTC (rev 9821)
+++ Extractor/src/main/extractor.c      2009-12-20 01:42:07 UTC (rev 9822)
@@ -1060,8 +1060,8 @@
   FILE *fin;
   void *ptr;
   int shmid;
-  struct stat sbuf;
   struct IpcHeader hdr;
+  size_t size;
 
   if (0 != plugin_load (plugin))
     {
@@ -1073,12 +1073,16 @@
   fin = fdopen (in, "r");
   while (NULL != fgets (fn, sizeof(fn), fin))
     {
+      if (strlen (fn) == 0)
+       break;
+      fn[strlen(fn)-1] = '\0'; /* kill newline */
       if ( (-1 != (shmid = shm_open (fn, O_RDONLY, 0))) &&
-          (0 == fstat (shmid, &sbuf)) &&
-          (NULL != (ptr = shmat (shmid, NULL, SHM_RDONLY))) )
+          (((off_t)-1) != (size = lseek (shmid, 0, SEEK_END))) &&
+          (NULL != (ptr = mmap (NULL, size, PROT_READ, MAP_SHARED, shmid, 0))) 
&&
+          (ptr != (void*) -1) )
        {
          if (0 != plugin->extractMethod (ptr,
-                                         sbuf.st_size,
+                                         size,
                                          &transmit_reply,
                                          &out,
                                          plugin->plugin_options))
@@ -1087,7 +1091,7 @@
            break;
        }
       if (ptr != NULL)
-       shmdt (ptr);
+       munmap (ptr, size);
       if (-1 != shmid)
        close (shmid);
     }
@@ -1105,7 +1109,7 @@
   int p1[2];
   int p2[2];
   pid_t pid;
-  
+
   if (0 != pipe (p1))
     {
       plugin->cpid = -1;
@@ -1138,10 +1142,12 @@
       process_requests (plugin, p1[0], p2[1]);
       _exit (0);
     }
-  plugin->cpid = 0;
+  plugin->cpid = pid;
   close (p1[0]);
   close (p2[1]);
   plugin->cpipe_in = fdopen (p1[1], "w");
+  if (plugin->cpipe_in == NULL)
+    perror ("fdopen");
   plugin->cpipe_out = p2[0];
 }
 
@@ -1166,7 +1172,9 @@
   char mimetype[MAX_MIME_LEN + 1];
   char *data;
 
-  if (0 <= fprintf (plugin->cpipe_in, "%s\n", shmfn))
+  if (plugin->cpid == -1)
+    return 0;
+  if (0 >= fprintf (plugin->cpipe_in, "%s\n", shmfn))
     {
       stop_process (plugin);
       plugin->cpid = -1;
@@ -1174,6 +1182,7 @@
        plugin->flags = EXTRACTOR_OPTION_DISABLED;
       return 0;
     }
+  fflush (plugin->cpipe_in);
   while (1)
     {
       if (0 != read_all (plugin->cpipe_out,
@@ -1267,14 +1276,14 @@
        case EXTRACTOR_OPTION_NONE:
          break;
        case EXTRACTOR_OPTION_OUT_OF_PROCESS:
-         if (0 == plugins->cpid)
-           start_process (plugins);
+         if (0 == ppos->cpid)
+           start_process (ppos);
          want_shm = 1;
          break;
        case EXTRACTOR_OPTION_AUTO_RESTART:
-         if ( (0 == plugins->cpid) ||
-              (-1 == plugins->cpid) )
-           start_process (plugins);
+         if ( (0 == ppos->cpid) ||
+              (-1 == ppos->cpid) )
+           start_process (ppos);
          want_shm = 1;
          break;
        case EXTRACTOR_OPTION_DISABLED:
@@ -1282,19 +1291,20 @@
        }      
       ppos = ppos->next;
     }
-
   if (want_shm)
     {
-      sprintf (fn,
-              "/tmp/libextractor-shm-%u-XXXXXX",
-              getpid());          
-      mktemp (fn);
+      snprintf (fn,
+               sizeof(fn),
+               "/libextractor-shm-%u-%u",
+               getpid(),
+               (unsigned int) random());
       shmid = shm_open (fn, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
       ptr = NULL;
       if (shmid != -1)
        {
          if ( (0 != ftruncate (shmid, size)) ||
-              (NULL == (ptr = shmat (shmid, NULL, 0))) )
+              (NULL == (ptr = mmap (NULL, size, PROT_WRITE, MAP_SHARED, shmid, 
0))) ||
+              (ptr == (void*) -1) )
            {
              close (shmid);    
              shmid = -1;
@@ -1302,6 +1312,8 @@
          memcpy (ptr, data, size);
        }
     }
+  if (want_shm && (shmid == -1))
+    _exit(1);
   ppos = plugins;
   while (NULL != ppos)
     {
@@ -1334,11 +1346,10 @@
   if (want_shm)
     {
       if (NULL != ptr)
-       shmdt (ptr);
+       munmap (ptr, size);
       if (shmid != -1)
        close (shmid);
       shm_unlink (fn);
-      unlink (fn);
     }
 }