1 files changed, 226 insertions, 219 deletions

diff --git a/src/main/extractor_plugpath.c b/src/main/extractor_plugpath.c
index 461f25e..4374bc5 100644
--- a/src/main/extractor_plugpath.c
+++ b/src/main/extractor_plugpath.c
@@ -41,7 +41,7 @@
  * @param path a directory path
  */
 typedef void (*EXTRACTOR_PathProcessor) (void *cls,
-                                         const char *path);
+                                         const char *path);
 
 
 /**
@@ -51,7 +51,7 @@ typedef void (*EXTRACTOR_PathProcessor) (void *cls,
  * @return NULL if 'in' is NULL, otherwise 'in' with '/bin/' removed
  */
 static char *
-cut_bin (char * in)
+cut_bin (char *in)
 {
   size_t p;
 
@@ -60,21 +60,21 @@ cut_bin (char * in)
   p = strlen (in);
   if (p < 4)
     return in;
-  if ( ('/' == in[p-1]) ||
-       ('\\' == in[p-1]) )
+  if ( ('/' == in[p - 1]) ||
+       ('\\' == in[p - 1]) )
     in[--p] = '\0';
-  if (0 == strcmp (&in[p-4],
-                   "/bin"))
-    {
-      in[p-4] = '\0';
-      p -= 4;
-    }
-  else if (0 == strcmp (&in[p-4],
-                        "\\bin"))
-    {
-      in[p-4] = '\0';
-      p -= 4;
-    }
+  if (0 == strcmp (&in[p - 4],
+                   "/bin"))
+  {
+    in[p - 4] = '\0';
+    p -= 4;
+  }
+  else if (0 == strcmp (&in[p - 4],
+                        "\\bin"))
+  {
+    in[p - 4] = '\0';
+    p -= 4;
+  }
   return in;
 }
 
@@ -100,60 +100,62 @@ get_path_from_proc_exe ()
   FILE *f;
 
   snprintf (fn,
-            sizeof (fn),
-            "/proc/%u/maps",
-            getpid ());
+            sizeof (fn),
+            "/proc/%u/maps",
+            getpid ());
   if (NULL != (f = FOPEN (fn, "r")))
+  {
+    while (NULL != fgets (line, 1024, f))
     {
-      while (NULL != fgets (line, 1024, f))
-        {
-          if ( (1 == sscanf (line,
-                             "%*x-%*x %*c%*c%*c%*c %*x %*2x:%*2x %*u%*[ ]%s",
-                             dir)) &&
-               (NULL != (lestr = strstr (dir,
-                                         "libextractor")) ) )
-            {
-              lestr[0] = '\0';
-              fclose (f);
-              return strdup (dir);
-            }
-        }
-      fclose (f);
+      if ( (1 == sscanf (line,
+                         "%*x-%*x %*c%*c%*c%*c %*x %*2x:%*2x %*u%*[ ]%s",
+                         dir)) &&
+           (NULL != (lestr = strstr (dir,
+                                     "libextractor")) ) )
+      {
+        lestr[0] = '\0';
+        fclose (f);
+        return strdup (dir);
+      }
     }
+    fclose (f);
+  }
   snprintf (fn,
-            sizeof (fn),
-            "/proc/%u/exe",
-            getpid ());
+            sizeof (fn),
+            "/proc/%u/exe",
+            getpid ());
   if (NULL == (lnk = malloc (1029))) /* 1024 + 6 for "/lib/" catenation */
     return NULL;
   size = readlink (fn, lnk, 1023);
   if ( (size <= 0) || (size >= 1024) )
-    {
-      free (lnk);
-      return NULL;
-    }
+  {
+    free (lnk);
+    return NULL;
+  }
   lnk[size] = '\0';
   while ( ('/' != lnk[size]) &&
-          (size > 0) )
+          (size > 0) )
     size--;
   if ( (size < 4) ||
-       ('/' != lnk[size-4]) )
-    {
-      /* not installed in "/bin/" -- binary path probably useless */
-      free (lnk);
-      return NULL;
-    }
+       ('/' != lnk[size - 4]) )
+  {
+    /* not installed in "/bin/" -- binary path probably useless */
+    free (lnk);
+    return NULL;
+  }
   lnk[size] = '\0';
   lnk = cut_bin (lnk);
-  if (NULL == (ret = realloc (lnk, strlen(lnk) + 6)))
-    {
-      LOG_STRERROR ("realloc");
-      free (lnk);
-      return NULL;
-    }
+  if (NULL == (ret = realloc (lnk, strlen (lnk) + 6)))
+  {
+    LOG_STRERROR ("realloc");
+    free (lnk);
+    return NULL;
+  }
   strcat (ret, "/lib/"); /* guess "lib/" as the library dir */
   return ret;
 }
+
+
 #endif
 
 
@@ -162,8 +164,8 @@ static HMODULE le_dll = NULL;
 
 BOOL WINAPI
 DllMain (HINSTANCE hinstDLL,
-         DWORD     fdwReason,
-         LPVOID    lpvReserved)
+         DWORD fdwReason,
+         LPVOID lpvReserved)
 {
   switch (fdwReason)
   {
@@ -175,6 +177,7 @@ DllMain (HINSTANCE hinstDLL,
   return TRUE;
 }
 
+
 /**
  * Try to determine path with win32-specific function
  */
@@ -190,20 +193,22 @@ get_path_from_module_filename ()
   GetModuleFileName (le_dll, path, 4096);
   idx = path + strlen (path);
   while ( (idx > path) &&
-          ('\\' != *idx) &&
-          ('/' != *idx) )
+          ('\\' != *idx) &&
+          ('/' != *idx) )
     idx--;
   *idx = '\0';
   path = cut_bin (path);
-  if (NULL == (ret = realloc (path, strlen(path) + 6)))
-    {
-      LOG_STRERROR ("realloc");
-      free (path);
-      return NULL;
-    }
+  if (NULL == (ret = realloc (path, strlen (path) + 6)))
+  {
+    LOG_STRERROR ("realloc");
+    free (path);
+    return NULL;
+  }
   strcat (ret, "/lib/"); /* guess "lib/" as the library dir */
   return ret;
 }
+
+
 #endif
 
 
@@ -239,8 +244,8 @@ get_path_from_NSGetExecutablePath ()
 
   path = NULL;
   if (NULL == (func =
-               (MyNSGetExecutablePathProto) dlsym (RTLD_DEFAULT,
-                                                   "_NSGetExecutablePath")))
+                 (MyNSGetExecutablePathProto) dlsym (RTLD_DEFAULT,
+                                                     "_NSGetExecutablePath")))
     return NULL;
   path = &zero;
   len = 0;
@@ -249,10 +254,10 @@ get_path_from_NSGetExecutablePath ()
   if (0 == len)
     return NULL;
   if (NULL == (path = malloc (len)))
-    {
-      LOG_STRERROR ("malloc");
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("malloc");
+    return NULL;
+  }
   if (0 != func (path, &len))
   {
     free (path);
@@ -267,9 +272,9 @@ get_path_from_NSGetExecutablePath ()
   path = cut_bin (path);
   if (NULL == (ret = realloc (path, strlen (path) + 5)))
   {
-     LOG_STRERROR ("realloc");
-     free (path);
-     return NULL;
+    LOG_STRERROR ("realloc");
+    free (path);
+    return NULL;
   }
   strcat (ret, "/lib/");
   return ret;
@@ -292,26 +297,28 @@ get_path_from_dyld_image ()
 
   c = _dyld_image_count ();
   for (i = 0; i < c; i++)
+  {
+    if (((void *) _dyld_get_image_header (i)) != (void *) &_mh_dylib_header)
+      continue;
+    path = _dyld_get_image_name (i);
+    if ( (NULL == path) || (0 == strlen (path)) )
+      continue;
+    if (NULL == (p = strdup (path)))
     {
-      if (((void *) _dyld_get_image_header (i)) != (void *) &_mh_dylib_header)
-        continue;
-      path = _dyld_get_image_name (i);
-      if ( (NULL == path) || (0 == strlen (path)) )
-        continue;
-      if (NULL == (p = strdup (path)))
-        {
-          LOG_STRERROR ("strdup");
-          return NULL;
-        }
-      s = p + strlen (p);
-      while ( (s > p) && ('/' != *s) )
-        s--;
-      s++;
-      *s = '\0';
-      return p;
+      LOG_STRERROR ("strdup");
+      return NULL;
     }
+    s = p + strlen (p);
+    while ( (s > p) && ('/' != *s) )
+      s--;
+    s++;
+    *s = '\0';
+    return p;
+  }
   return NULL;
 }
+
+
 #endif
 
 
@@ -322,7 +329,7 @@ get_path_from_dyld_image ()
  * @return path to binary, NULL if not found
  */
 static char *
-get_path_from_PATH()
+get_path_from_PATH ()
 {
   struct stat sbuf;
   char *path;
@@ -335,61 +342,61 @@ get_path_from_PATH()
   if (NULL == (p = getenv ("PATH")))
     return NULL;
   if (NULL == (path = strdup (p))) /* because we write on it */
-    {
-      LOG_STRERROR ("strdup");
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("strdup");
+    return NULL;
+  }
   if (NULL == (buf = malloc (strlen (path) + 20)))
-    {
-      LOG_STRERROR ("malloc");
-      free (path);
-      return NULL;
-    }
+  {
+    LOG_STRERROR ("malloc");
+    free (path);
+    return NULL;
+  }
   pos = path;
-  while (NULL != (end = strchr(pos, ':')))
-    {
-      *end = '\0';
-      sprintf (buf, "%s/%s", pos, "extract");
-      if (0 == stat(buf, &sbuf))
-        {
-          free (buf);
-          if (NULL == (pos = strdup (pos)))
-            {
-              LOG_STRERROR ("strdup");
-              free (path);
-              return NULL;
-            }
-          free (path);
-          pos = cut_bin (pos);
-          if (NULL == (ret = realloc (pos, strlen (pos) + 6)))
-            {
-              LOG_STRERROR ("realloc");
-              free (pos);
-              return NULL;
-            }
-          strcat (ret, "/lib/");
-          return ret;
-        }
-      pos = end + 1;
-    }
-  sprintf (buf, "%s/%s", pos, "extract");
-  if (0 == stat (buf, &sbuf))
+  while (NULL != (end = strchr (pos, ':')))
+  {
+    *end = '\0';
+    sprintf (buf, "%s/%s", pos, "extract");
+    if (0 == stat (buf, &sbuf))
     {
-      pos = strdup (pos);
       free (buf);
+      if (NULL == (pos = strdup (pos)))
+      {
+        LOG_STRERROR ("strdup");
+        free (path);
+        return NULL;
+      }
       free (path);
-      if (NULL == pos)
-        return NULL;
       pos = cut_bin (pos);
       if (NULL == (ret = realloc (pos, strlen (pos) + 6)))
-        {
-          LOG_STRERROR ("realloc");
-          free (pos);
-          return NULL;
-        }
+      {
+        LOG_STRERROR ("realloc");
+        free (pos);
+        return NULL;
+      }
       strcat (ret, "/lib/");
       return ret;
     }
+    pos = end + 1;
+  }
+  sprintf (buf, "%s/%s", pos, "extract");
+  if (0 == stat (buf, &sbuf))
+  {
+    pos = strdup (pos);
+    free (buf);
+    free (path);
+    if (NULL == pos)
+      return NULL;
+    pos = cut_bin (pos);
+    if (NULL == (ret = realloc (pos, strlen (pos) + 6)))
+    {
+      LOG_STRERROR ("realloc");
+      free (pos);
+      return NULL;
+    }
+    strcat (ret, "/lib/");
+    return ret;
+  }
   free (buf);
   free (path);
   return NULL;
@@ -405,7 +412,7 @@ get_path_from_PATH()
  */
 static char *
 append_to_dir (const char *path,
-               const char *fname)
+               const char *fname)
 {
   char *ret;
   size_t slen;
@@ -414,31 +421,31 @@ append_to_dir (const char *path,
     return NULL;
   if (DIR_SEPARATOR == fname[0])
     fname++;
-  ret = malloc (slen + strlen(fname) + 2);
+  ret = malloc (slen + strlen (fname) + 2);
   if (NULL == ret)
     return NULL;
 #ifdef MINGW
-  if ('\\' == path[slen-1])
+  if ('\\' == path[slen - 1])
     sprintf (ret,
-             "%s%s",
-             path,
-             fname);
+             "%s%s",
+             path,
+             fname);
   else
     sprintf (ret,
-             "%s\\%s",
-             path,
-             fname);
+             "%s\\%s",
+             path,
+             fname);
 #else
-  if ('/' == path[slen-1])
+  if ('/' == path[slen - 1])
     sprintf (ret,
-             "%s%s",
-             path,
-             fname);
+             "%s%s",
+             path,
+             fname);
   else
     sprintf (ret,
-             "%s/%s",
-             path,
-             fname);
+             "%s/%s",
+             path,
+             fname);
 #endif
   return ret;
 }
@@ -453,7 +460,7 @@ append_to_dir (const char *path,
  */
 static void
 get_installation_paths (EXTRACTOR_PathProcessor pp,
-                        void *pp_cls)
+                        void *pp_cls)
 {
   const char *p;
   char *path;
@@ -463,19 +470,19 @@ get_installation_paths (EXTRACTOR_PathProcessor pp,
 
   prefix = NULL;
   if (NULL != (p = getenv ("LIBEXTRACTOR_PREFIX")))
+  {
+    if (NULL == (d = strdup (p)))
     {
-      if (NULL == (d = strdup (p)))
-        {
-          LOG_STRERROR ("strdup");
-          return;
-        }
-      for (prefix = strtok_r (d, PATH_SEPARATOR_STR, &saveptr);
-           NULL != prefix;
-           prefix = strtok_r (NULL, PATH_SEPARATOR_STR, &saveptr))
-        pp (pp_cls, prefix);
-      free (d);
+      LOG_STRERROR ("strdup");
       return;
     }
+    for (prefix = strtok_r (d, PATH_SEPARATOR_STR, &saveptr);
+         NULL != prefix;
+         prefix = strtok_r (NULL, PATH_SEPARATOR_STR, &saveptr))
+      pp (pp_cls, prefix);
+    free (d);
+    return;
+  }
 #if GNU_LINUX
   if (NULL == prefix)
     prefix = get_path_from_proc_exe ();
@@ -497,12 +504,12 @@ get_installation_paths (EXTRACTOR_PathProcessor pp,
     return;
   path = append_to_dir (prefix, PLUGINDIR);
   if (NULL != path)
-    {
-      if (0 != strcmp (path,
-                       PLUGININSTDIR))
-        pp (pp_cls, path);
-      free (path);
-    }
+  {
+    if (0 != strcmp (path,
+                     PLUGININSTDIR))
+      pp (pp_cls, path);
+    free (path);
+  }
   free (prefix);
 }
 
@@ -532,7 +539,7 @@ struct SearchContext
  */
 static void
 find_plugin_in_path (void *cls,
-                     const char *path)
+                     const char *path)
 {
   struct SearchContext *sc = cls;
   DIR *dir;
@@ -547,34 +554,34 @@ find_plugin_in_path (void *cls,
   if (NULL == (dir = OPENDIR (path)))
     return;
   while (NULL != (ent = READDIR (dir)))
+  {
+    if ('.' == ent->d_name[0])
+      continue;
+    dlen = strlen (ent->d_name);
+    if ( (dlen < 4) ||
+         ( (0 != strcmp (&ent->d_name[dlen - 3], ".so")) &&
+           (0 != strcasecmp (&ent->d_name[dlen - 4], ".dll")) ) )
+      continue; /* only load '.so' and '.dll' */
+    if (NULL == (sym_name = strrchr (ent->d_name, '_')))
+      continue;
+    sym_name++;
+    if (NULL == (sym = strdup (sym_name)))
+    {
+      LOG_STRERROR ("strdup");
+      CLOSEDIR (dir);
+      return;
+    }
+    dot = strchr (sym, '.');
+    if (NULL != dot)
+      *dot = '\0';
+    if (0 == strcmp (sym, sc->short_name))
     {
-      if ('.' == ent->d_name[0])
-        continue;
-      dlen = strlen (ent->d_name);
-      if ( (dlen < 4) ||
-           ( (0 != strcmp (&ent->d_name[dlen-3], ".so")) &&
-             (0 != strcasecmp (&ent->d_name[dlen-4], ".dll")) ) )
-        continue; /* only load '.so' and '.dll' */
-      if (NULL == (sym_name = strrchr (ent->d_name, '_')))
-        continue;
-      sym_name++;
-      if (NULL == (sym = strdup (sym_name)))
-        {
-          LOG_STRERROR ("strdup");
-          CLOSEDIR (dir);
-          return;
-        }
-      dot = strchr (sym, '.');
-      if (NULL != dot)
-        *dot = '\0';
-      if (0 == strcmp (sym, sc->short_name))
-        {
-          sc->path = append_to_dir (path, ent->d_name);
-          free (sym);
-          break;
-        }
+      sc->path = append_to_dir (path, ent->d_name);
       free (sym);
+      break;
     }
+    free (sym);
+  }
   CLOSEDIR (dir);
 }
 
@@ -591,7 +598,7 @@ EXTRACTOR_find_plugin_ (const char *short_name)
   sc.path = NULL;
   sc.short_name = short_name;
   get_installation_paths (&find_plugin_in_path,
-                          &sc);
+                          &sc);
   return sc.path;
 }
 
@@ -621,7 +628,7 @@ struct DefaultLoaderContext
  */
 static void
 load_plugins_from_dir (void *cls,
-                       const char *path)
+                       const char *path)
 {
   struct DefaultLoaderContext *dlc = cls;
   DIR *dir;
@@ -634,31 +641,31 @@ load_plugins_from_dir (void *cls,
   if (NULL == (dir = opendir (path)))
     return;
   while (NULL != (ent = readdir (dir)))
+  {
+    if (ent->d_name[0] == '.')
+      continue;
+    dlen = strlen (ent->d_name);
+    if ( (dlen < 4) ||
+         ( (0 != strcmp (&ent->d_name[dlen - 3], ".so")) &&
+           (0 != strcasecmp (&ent->d_name[dlen - 4], ".dll")) ) )
+      continue; /* only load '.so' and '.dll' */
+    if (NULL == (sym_name = strrchr (ent->d_name, '_')))
+      continue;
+    sym_name++;
+    if (NULL == (sym = strdup (sym_name)))
     {
-      if (ent->d_name[0] == '.')
-        continue;
-      dlen = strlen (ent->d_name);
-      if ( (dlen < 4) ||
-           ( (0 != strcmp (&ent->d_name[dlen-3], ".so")) &&
-             (0 != strcasecmp (&ent->d_name[dlen-4], ".dll")) ) )
-        continue; /* only load '.so' and '.dll' */
-      if (NULL == (sym_name = strrchr (ent->d_name, '_')))
-        continue;
-      sym_name++;
-      if (NULL == (sym = strdup (sym_name)))
-        {
-          LOG_STRERROR ("strdup");
-          closedir (dir);
-          return;
-        }
-      if (NULL != (dot = strchr (sym, '.')))
-        *dot = '\0';
-      dlc->res = EXTRACTOR_plugin_add (dlc->res,
-                                       sym,
-                                       NULL,
-                                       dlc->flags);
-      free (sym);
+      LOG_STRERROR ("strdup");
+      closedir (dir);
+      return;
     }
+    if (NULL != (dot = strchr (sym, '.')))
+      *dot = '\0';
+    dlc->res = EXTRACTOR_plugin_add (dlc->res,
+                                     sym,
+                                     NULL,
+                                     dlc->flags);
+    free (sym);
+  }
   closedir (dir);
 }
 
@@ -685,7 +692,7 @@ EXTRACTOR_plugin_add_defaults (enum EXTRACTOR_Options flags)
   dlc.res = NULL;
   dlc.flags = flags;
   get_installation_paths (&load_plugins_from_dir,
-                          &dlc);
+                          &dlc);
   return dlc.res;
 }