1 files changed, 195 insertions, 194 deletions

diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
index 7bb8914..5400636 100644
--- a/src/main/extractor_ipc_gnu.c
+++ b/src/main/extractor_ipc_gnu.c
@@ -138,10 +138,10 @@ EXTRACTOR_IPC_shared_memory_create_ (size_t size)
   const char *tpath;
 
   if (NULL == (shm = malloc (sizeof (struct EXTRACTOR_SharedMemory))))
-    {
-      LOG_STRERROR ("malloc");
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("malloc");
+    return NULL;
+  }
 #if SOMEBSD
   /* this works on FreeBSD, not sure about others... */
   tpath = getenv ("TMPDIR");
@@ -151,24 +151,24 @@ EXTRACTOR_IPC_shared_memory_create_ (size_t size)
   tpath = "/"; /* Linux */
 #endif
   snprintf (shm->shm_name,
-            MAX_SHM_NAME,
-            "%sLE-%u-%u",
-            tpath, getpid (),
-            (unsigned int) RANDOM());
+            MAX_SHM_NAME,
+            "%sLE-%u-%u",
+            tpath, getpid (),
+            (unsigned int) RANDOM ());
   if (-1 == (shm->shm_id = shm_open (shm->shm_name,
-                                     O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)))
-    {
-      LOG_STRERROR_FILE ("shm_open",
-                         shm->shm_name);
-      free (shm);
-      return NULL;
-    }
+                                     O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)))
+  {
+    LOG_STRERROR_FILE ("shm_open",
+                       shm->shm_name);
+    free (shm);
+    return NULL;
+  }
   if ( (0 != ftruncate (shm->shm_id, size)) ||
        (NULL == (shm->shm_ptr = mmap (NULL,
                                       size,
-                                      PROT_WRITE,
+                                      PROT_WRITE,
                                       MAP_SHARED,
-                                      shm->shm_id,
+                                      shm->shm_id,
                                       0))) ||
        (((void*) -1) == shm->shm_ptr) )
   {
@@ -193,7 +193,7 @@ EXTRACTOR_IPC_shared_memory_create_ (size_t size)
  */
 unsigned int
 EXTRACTOR_IPC_shared_memory_change_rc_ (struct EXTRACTOR_SharedMemory *shm,
-                                        int delta)
+                                        int delta)
 {
   shm->rc += delta;
   return shm->rc;
@@ -228,23 +228,23 @@ EXTRACTOR_IPC_shared_memory_destroy_ (struct EXTRACTOR_SharedMemory *shm)
  */
 ssize_t
 EXTRACTOR_IPC_shared_memory_set_ (struct EXTRACTOR_SharedMemory *shm,
-                                  struct EXTRACTOR_Datasource *ds,
-                                  uint64_t off,
-                                  size_t size)
+                                  struct EXTRACTOR_Datasource *ds,
+                                  uint64_t off,
+                                  size_t size)
 {
   if (-1 ==
       EXTRACTOR_datasource_seek_ (ds,
                                   off,
                                   SEEK_SET))
-    {
-      LOG ("Failed to set IPC memory due to seek error\n");
-      return -1;
-    }
+  {
+    LOG ("Failed to set IPC memory due to seek error\n");
+    return -1;
+  }
   if (size > shm->shm_size)
     size = shm->shm_size;
   return EXTRACTOR_datasource_read_ (ds,
-                                     shm->shm_ptr,
-                                     size);
+                                     shm->shm_ptr,
+                                     size);
 }
 
 
@@ -277,7 +277,7 @@ EXTRACTOR_datasource_get_pos_ (struct EXTRACTOR_Datasource *ds)
  */
 struct EXTRACTOR_Channel *
 EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
-                               struct EXTRACTOR_SharedMemory *shm)
+                               struct EXTRACTOR_SharedMemory *shm)
 {
   struct EXTRACTOR_Channel *channel;
   int p1[2];
@@ -287,74 +287,74 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
   size_t slen;
 
   if (NULL == (channel = malloc (sizeof (struct EXTRACTOR_Channel))))
-    {
-      LOG_STRERROR ("malloc");
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("malloc");
+    return NULL;
+  }
   channel->mdata_size = 1024;
   if (NULL == (channel->mdata = malloc (channel->mdata_size)))
-    {
-      LOG_STRERROR ("malloc");
-      free (channel);
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("malloc");
+    free (channel);
+    return NULL;
+  }
   channel->shm = shm;
   channel->plugin = plugin;
   channel->size = 0;
   if (0 != pipe (p1))
-    {
-      LOG_STRERROR ("pipe");
-      free (channel->mdata);
-      free (channel);
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("pipe");
+    free (channel->mdata);
+    free (channel);
+    return NULL;
+  }
   if (0 != pipe (p2))
-    {
-      LOG_STRERROR ("pipe");
-      (void) close (p1[0]);
-      (void) close (p1[1]);
-      free (channel->mdata);
-      free (channel);
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("pipe");
+    (void) close (p1[0]);
+    (void) close (p1[1]);
+    free (channel->mdata);
+    free (channel);
+    return NULL;
+  }
   pid = fork ();
   if (pid == -1)
-    {
-      LOG_STRERROR ("fork");
-      (void) close (p1[0]);
-      (void) close (p1[1]);
-      (void) close (p2[0]);
-      (void) close (p2[1]);
-      free (channel->mdata);
-      free (channel);
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("fork");
+    (void) close (p1[0]);
+    (void) close (p1[1]);
+    (void) close (p2[0]);
+    (void) close (p2[1]);
+    free (channel->mdata);
+    free (channel);
+    return NULL;
+  }
   if (0 == pid)
-    {
-      (void) close (p1[1]);
-      (void) close (p2[0]);
-      free (channel->mdata);
-      free (channel);
+  {
+    (void) close (p1[1]);
+    (void) close (p2[0]);
+    free (channel->mdata);
+    free (channel);
 #if HAVE_SYS_APPARMOR_H
 #if HAVE_APPARMOR
-      if (0 > aa_change_profile("libextractor"))
+    if (0 > aa_change_profile ("libextractor"))
+    {
+      int eno = errno;
+
+      if ( (EINVAL != eno) &&
+           (ENOENT != eno) )
       {
-        int eno = errno;
-        
-        if ( (EINVAL != eno) &&
-             (ENOENT != eno) )
-        {
-          fprintf (stderr,
-                   "Failure changing AppArmor profile: %s\n",
-                   strerror (errno));
-          _exit(1);
-        }
+        fprintf (stderr,
+                 "Failure changing AppArmor profile: %s\n",
+                 strerror (errno));
+        _exit (1);
       }
+    }
 #endif
 #endif
-      EXTRACTOR_plugin_main_ (plugin, p1[0], p2[1]);
-      _exit (0);
-    }
+    EXTRACTOR_plugin_main_ (plugin, p1[0], p2[1]);
+    _exit (0);
+  }
   (void) close (p1[0]);
   (void) close (p2[1]);
   channel->cpipe_in = p1[1];
@@ -362,11 +362,11 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
   channel->cpid = pid;
   slen = strlen (shm->shm_name) + 1;
   if (NULL == (init = malloc (sizeof (struct InitMessage) + slen)))
-    {
-      LOG_STRERROR ("malloc");
-      EXTRACTOR_IPC_channel_destroy_ (channel);
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("malloc");
+    EXTRACTOR_IPC_channel_destroy_ (channel);
+    return NULL;
+  }
   init->opcode = MESSAGE_INIT_STATE;
   init->reserved = 0;
   init->reserved2 = 0;
@@ -375,14 +375,14 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
   memcpy (&init[1], shm->shm_name, slen);
   if (sizeof (struct InitMessage) + slen !=
       EXTRACTOR_IPC_channel_send_ (channel,
-                                   init,
-                                   sizeof (struct InitMessage) + slen) )
-    {
-      LOG ("Failed to send INIT_STATE message to plugin\n");
-      EXTRACTOR_IPC_channel_destroy_ (channel);
-      free (init);
-      return NULL;
-    }
+                                   init,
+                                   sizeof (struct InitMessage) + slen) )
+  {
+    LOG ("Failed to send INIT_STATE message to plugin\n");
+    EXTRACTOR_IPC_channel_destroy_ (channel);
+    free (init);
+    return NULL;
+  }
   free (init);
   return channel;
 }
@@ -425,24 +425,24 @@ EXTRACTOR_IPC_channel_destroy_ (struct EXTRACTOR_Channel *channel)
  */
 ssize_t
 EXTRACTOR_IPC_channel_send_ (struct EXTRACTOR_Channel *channel,
-                             const void *data,
-                             size_t size)
+                             const void *data,
+                             size_t size)
 {
   const char *cdata = data;
   size_t off = 0;
   ssize_t ret;
 
   while (off < size)
+  {
+    ret = write (channel->cpipe_in, &cdata[off], size - off);
+    if (ret <= 0)
     {
-      ret = write (channel->cpipe_in, &cdata[off], size - off);
-      if (ret <= 0)
-        {
-          if (-1 == ret)
-            LOG_STRERROR ("write");
-          return -1;
-        }
-      off += ret;
+      if (-1 == ret)
+        LOG_STRERROR ("write");
+      return -1;
     }
+    off += ret;
+  }
   return size;
 }
 
@@ -464,9 +464,9 @@ EXTRACTOR_IPC_channel_send_ (struct EXTRACTOR_Channel *channel,
  */
 int
 EXTRACTOR_IPC_channel_recv_ (struct EXTRACTOR_Channel **channels,
-                             unsigned int num_channels,
-                             EXTRACTOR_ChannelMessageProcessor proc,
-                             void *proc_cls)
+                             unsigned int num_channels,
+                             EXTRACTOR_ChannelMessageProcessor proc,
+                             void *proc_cls)
 {
   struct timeval tv;
   fd_set to_check;
@@ -480,105 +480,106 @@ EXTRACTOR_IPC_channel_recv_ (struct EXTRACTOR_Channel **channels,
 
   FD_ZERO (&to_check);
   max = -1;
-  for (i=0;i<num_channels;i++)
+  for (i = 0; i<num_channels; i++)
+  {
+    channel = channels[i];
+    if (NULL == channel)
+      continue;
+    FD_SET (channel->cpipe_out, &to_check);
+    if (max < channel->cpipe_out)
+      max = channel->cpipe_out;
+  }
+  if (-1 == max)
+  {
+    return 1;   /* nothing left to do! */
+  }
+  tv.tv_sec = 0;
+  tv.tv_usec = 500000; /* 500 ms */
+  if (0 >= select (max + 1, &to_check, NULL, NULL, &tv))
+  {
+    /* an error or timeout -> something's wrong or all plugins hung up */
+    closed_channel = 0;
+    for (i = 0; i<num_channels; i++)
     {
       channel = channels[i];
       if (NULL == channel)
-        continue;
-      FD_SET (channel->cpipe_out, &to_check);
-      if (max < channel->cpipe_out)
-        max = channel->cpipe_out;
+        continue;
+      if (-1 == channel->plugin->seek_request)
+      {
+        /* plugin blocked for too long, kill channel */
+        LOG ("Channel blocked, closing channel to %s\n",
+             channel->plugin->libname);
+        channel->plugin->channel = NULL;
+        channel->plugin->round_finished = 1;
+        EXTRACTOR_IPC_channel_destroy_ (channel);
+        channels[i] = NULL;
+        closed_channel = 1;
+      }
     }
-  if (-1 == max)
+    if (1 == closed_channel)
+      return 1;
+    /* strange, no channel is to blame, let's die just to be safe */
+    if ((EINTR != errno) && (0 != errno))
+      LOG_STRERROR ("select");
+    return -1;
+  }
+  for (i = 0; i<num_channels; i++)
+  {
+    channel = channels[i];
+    if (NULL == channel)
+      continue;
+    if (! FD_ISSET (channel->cpipe_out, &to_check))
+      continue;
+    if (channel->mdata_size == channel->size)
     {
-      return 1; /* nothing left to do! */
+      /* not enough space, need to grow allocation (if allowed) */
+      if (MAX_META_DATA == channel->mdata_size)
+      {
+        LOG ("Inbound message from channel too large, aborting\n");
+        EXTRACTOR_IPC_channel_destroy_ (channel);
+        channels[i] = NULL;
+        continue;
+      }
+      channel->mdata_size *= 2;
+      if (channel->mdata_size > MAX_META_DATA)
+        channel->mdata_size = MAX_META_DATA;
+      if (NULL == (ndata = realloc (channel->mdata,
+                                    channel->mdata_size)))
+      {
+        LOG_STRERROR ("realloc");
+        EXTRACTOR_IPC_channel_destroy_ (channel);
+        channels[i] = NULL;
+        continue;
+      }
+      channel->mdata = ndata;
     }
-  tv.tv_sec = 0;
-  tv.tv_usec = 500000; /* 500 ms */
-  if (0 >= select (max + 1, &to_check, NULL, NULL, &tv))
+    if ( (-1 == (iret = read (channel->cpipe_out,
+                              &channel->mdata[channel->size],
+                              channel->mdata_size - channel->size)) ) ||
+         (0 == iret) ||
+         (-1 == (ret = EXTRACTOR_IPC_process_reply_ (channel->plugin,
+                                                     channel->mdata,
+                                                     channel->size + iret,
+                                                     proc, proc_cls)) ) )
     {
-      /* an error or timeout -> something's wrong or all plugins hung up */
-      closed_channel = 0;
-      for (i=0;i<num_channels;i++)
-        {
-          channel = channels[i];
-          if (NULL == channel)
-            continue;
-          if (-1 == channel->plugin->seek_request)
-          {
-            /* plugin blocked for too long, kill channel */
-            LOG ("Channel blocked, closing channel to %s\n",
-                 channel->plugin->libname);
-            channel->plugin->channel = NULL;
-            channel->plugin->round_finished = 1;
-            EXTRACTOR_IPC_channel_destroy_ (channel);
-            channels[i] = NULL;
-            closed_channel = 1;
-          }
-        }
-      if (1 == closed_channel)
-        return 1;
-      /* strange, no channel is to blame, let's die just to be safe */
-      if ((EINTR != errno) && (0 != errno))
-        LOG_STRERROR ("select");
-      return -1;
+      if (-1 == iret)
+        LOG_STRERROR ("read");
+      LOG ("Read error from channel, closing channel %s\n",
+           channel->plugin->libname);
+      EXTRACTOR_IPC_channel_destroy_ (channel);
+      channels[i] = NULL;
+      continue;
     }
-  for (i=0;i<num_channels;i++)
+    else
     {
-      channel = channels[i];
-      if (NULL == channel)
-        continue;
-      if (! FD_ISSET (channel->cpipe_out, &to_check))
-        continue;
-      if (channel->mdata_size == channel->size)
-        {
-          /* not enough space, need to grow allocation (if allowed) */
-          if (MAX_META_DATA == channel->mdata_size)
-            {
-              LOG ("Inbound message from channel too large, aborting\n");
-              EXTRACTOR_IPC_channel_destroy_ (channel);
-              channels[i] = NULL;
-              continue;
-            }
-          channel->mdata_size *= 2;
-          if (channel->mdata_size > MAX_META_DATA)
-            channel->mdata_size = MAX_META_DATA;
-          if (NULL == (ndata = realloc (channel->mdata,
-                                        channel->mdata_size)))
-            {
-              LOG_STRERROR ("realloc");
-              EXTRACTOR_IPC_channel_destroy_ (channel);
-              channels[i] = NULL;
-              continue;
-            }
-          channel->mdata = ndata;
-        }
-      if ( (-1 == (iret = read (channel->cpipe_out,
-                                &channel->mdata[channel->size],
-                                channel->mdata_size - channel->size)) ) ||
-           (0 == iret) ||
-           (-1 == (ret = EXTRACTOR_IPC_process_reply_ (channel->plugin,
-                                                       channel->mdata,
-                                                       channel->size + iret,
-                                                       proc, proc_cls)) ) )
-        {
-          if (-1 == iret)
-            LOG_STRERROR ("read");
-          LOG ("Read error from channel, closing channel %s\n",
-               channel->plugin->libname);
-          EXTRACTOR_IPC_channel_destroy_ (channel);
-          channels[i] = NULL;
-          continue;
-        }
-      else
-        {
-          channel->size = channel->size + iret - ret;
-          memmove (channel->mdata,
-                   &channel->mdata[ret],
-                   channel->size);
-        }
+      channel->size = channel->size + iret - ret;
+      memmove (channel->mdata,
+               &channel->mdata[ret],
+               channel->size);
     }
+  }
   return 1;
 }
 
+
 /* end of extractor_ipc_gnu.c */