1 files changed, 515 insertions, 500 deletions

diff --git a/src/main/extract.c b/src/main/extract.c
index 2492fa9..144f2c3 100644
--- a/src/main/extract.c
+++ b/src/main/extract.c
@@ -73,6 +73,8 @@ ignore_sigpipe ()
     FPRINTF (stderr,
              "Failed to install SIGPIPE handler: %s\n", strerror (errno));
 }
+
+
 #endif
 
 
@@ -89,17 +91,17 @@ struct Help
   /**
    * Long name of the option.
    */
-  const char * longArg;
+  const char *longArg;
 
   /**
    * Name of the mandatory argument, NULL for no argument.
    */
-  const char * mandatoryArg;
+  const char *mandatoryArg;
 
   /**
    * Help text for the option.
    */
-  const char * description;
+  const char *description;
 };
 
 
@@ -118,8 +120,8 @@ struct Help
  */
 static void
 format_help (const char *general,
-             const char *description,
-             const struct Help *opt)
+             const char *description,
+             const struct Help *opt)
 {
   size_t slen;
   unsigned int i;
@@ -129,79 +131,80 @@ format_help (const char *general,
   char scp[80];
   const char *trans;
 
-  printf (_("Usage: %s\n%s\n\n"),
-          gettext(general),
-          gettext(description));
-  printf (_("Arguments mandatory for long options are also mandatory for short options.\n"));
+  printf (_ ("Usage: %s\n%s\n\n"),
+          gettext (general),
+          gettext (description));
+  printf (_ (
+            "Arguments mandatory for long options are also mandatory for short options.\n"));
   slen = 0;
   i = 0;
   while (NULL != opt[i].description)
+  {
+    if (0 == opt[i].shortArg)
+      printf ("      ");
+    else
+      printf ("  -%c, ",
+              opt[i].shortArg);
+    printf ("--%s",
+            opt[i].longArg);
+    slen = 8 + strlen (opt[i].longArg);
+    if (NULL != opt[i].mandatoryArg)
     {
-      if (0 == opt[i].shortArg)
-        printf ("      ");
-      else
-        printf ("  -%c, ",
-                opt[i].shortArg);
-      printf ("--%s",
-              opt[i].longArg);
-      slen = 8 + strlen(opt[i].longArg);
-      if (NULL != opt[i].mandatoryArg)
-        {
-          printf ("=%s",
-                  opt[i].mandatoryArg);
-          slen += 1+strlen(opt[i].mandatoryArg);
-        }
-      if (slen > BORDER)
-        {
-          printf ("\n%*s", BORDER, "");
-          slen = BORDER;
-        }
-      if (slen < BORDER)
-        {
-          printf ("%*s", (int) (BORDER - slen), "");
-          slen = BORDER;
-        }
-      trans = gettext(opt[i].description);
-      ml = strlen(trans);
-      p = 0;
-    OUTER:
-      while (ml - p > 78 - slen)
-        {
-          for (j=p+78-slen;j>p;j--)
-            {
-              if (isspace( (unsigned char) trans[j]))
-                {
-                  memcpy(scp,
-                         &trans[p],
-                         j-p);
-                  scp[j-p] = '\0';
-                  printf ("%s\n%*s",
-                          scp,
-                          BORDER + 2,
-                          "");
-                  p = j+1;
-                  slen = BORDER + 2;
-                  goto OUTER;
-                }
-            }
-          /* could not find space to break line */
-          memcpy (scp,
-                  &trans[p],
-                  78 - slen);
-          scp[78 - slen] = '\0';
-          printf ("%s\n%*s",
-                  scp,
-                  BORDER+2,
-                  "");
-          slen = BORDER+2;
-          p = p + 78 - slen;
-        }
-      /* print rest */
-      if (p < ml)
-        printf("%s\n",
-               &trans[p]);
-      i++;
+      printf ("=%s",
+              opt[i].mandatoryArg);
+      slen += 1 + strlen (opt[i].mandatoryArg);
+    }
+    if (slen > BORDER)
+    {
+      printf ("\n%*s", BORDER, "");
+      slen = BORDER;
+    }
+    if (slen < BORDER)
+    {
+      printf ("%*s", (int) (BORDER - slen), "");
+      slen = BORDER;
+    }
+    trans = gettext (opt[i].description);
+    ml = strlen (trans);
+    p = 0;
+OUTER:
+    while (ml - p > 78 - slen)
+    {
+      for (j = p + 78 - slen; j>p; j--)
+      {
+        if (isspace ( (unsigned char) trans[j]))
+        {
+          memcpy (scp,
+                  &trans[p],
+                  j - p);
+          scp[j - p] = '\0';
+          printf ("%s\n%*s",
+                  scp,
+                  BORDER + 2,
+                  "");
+          p = j + 1;
+          slen = BORDER + 2;
+          goto OUTER;
+        }
+      }
+      /* could not find space to break line */
+      memcpy (scp,
+              &trans[p],
+              78 - slen);
+      scp[78 - slen] = '\0';
+      printf ("%s\n%*s",
+              scp,
+              BORDER + 2,
+              "");
+      slen = BORDER + 2;
+      p = p + 78 - slen;
     }
+    /* print rest */
+    if (p < ml)
+      printf ("%s\n",
+              &trans[p]);
+    i++;
+  }
 }
 
 
@@ -211,40 +214,43 @@ format_help (const char *general,
 static void
 print_help ()
 {
-  static struct Help help[] =
-    {
-      { 'b', "bibtex", NULL,
-        gettext_noop("print output in bibtex format") },
-      { 'g', "grep-friendly", NULL,
-        gettext_noop("produce grep-friendly output (all results on one line per file)") },
-      { 'h', "help", NULL,
-        gettext_noop("print this help") },
-      { 'i', "in-process", NULL,
-        gettext_noop("run plugins in-process (simplifies debugging)") },
-      { 'm', "from-memory", NULL,
-        gettext_noop("read data from file into memory and extract from memory") },
-      { 'l', "library", "LIBRARY",
-        gettext_noop("load an extractor plugin named LIBRARY") },
-      { 'L', "list", NULL,
-        gettext_noop("list all keyword types") },
-      { 'n', "nodefault", NULL,
-        gettext_noop("do not use the default set of extractor plugins") },
-      { 'p', "print", "TYPE",
-        gettext_noop("print only keywords of the given TYPE (use -L to get a list)") },
-      { 'v', "version", NULL,
-        gettext_noop("print the version number") },
-      { 'V', "verbose", NULL,
-        gettext_noop("be verbose") },
-      { 'x', "exclude", "TYPE",
-        gettext_noop("do not print keywords of the given TYPE") },
-      { 0, NULL, NULL, NULL },
-    };
-  format_help (_("extract [OPTIONS] [FILENAME]*"),
-              _("Extract metadata from files."),
-              help);
+  static struct Help help[] = {
+    { 'b', "bibtex", NULL,
+      gettext_noop ("print output in bibtex format") },
+    { 'g', "grep-friendly", NULL,
+      gettext_noop (
+        "produce grep-friendly output (all results on one line per file)") },
+    { 'h', "help", NULL,
+      gettext_noop ("print this help") },
+    { 'i', "in-process", NULL,
+      gettext_noop ("run plugins in-process (simplifies debugging)") },
+    { 'm', "from-memory", NULL,
+      gettext_noop (
+        "read data from file into memory and extract from memory") },
+    { 'l', "library", "LIBRARY",
+      gettext_noop ("load an extractor plugin named LIBRARY") },
+    { 'L', "list", NULL,
+      gettext_noop ("list all keyword types") },
+    { 'n', "nodefault", NULL,
+      gettext_noop ("do not use the default set of extractor plugins") },
+    { 'p', "print", "TYPE",
+      gettext_noop (
+        "print only keywords of the given TYPE (use -L to get a list)") },
+    { 'v', "version", NULL,
+      gettext_noop ("print the version number") },
+    { 'V', "verbose", NULL,
+      gettext_noop ("be verbose") },
+    { 'x', "exclude", "TYPE",
+      gettext_noop ("do not print keywords of the given TYPE") },
+    { 0, NULL, NULL, NULL },
+  };
+  format_help (_ ("extract [OPTIONS] [FILENAME]*"),
+               _ ("Extract metadata from files."),
+               help);
 
 }
 
+
 #if HAVE_ICONV
 #include "iconv.c"
 #endif
@@ -267,12 +273,12 @@ print_help ()
  */
 static int
 print_selected_keywords (void *cls,
-                         const char *plugin_name,
-                         enum EXTRACTOR_MetaType type,
-                         enum EXTRACTOR_MetaFormat format,
-                         const char *data_mime_type,
-                         const char *data,
-                         size_t data_len)
+                         const char *plugin_name,
+                         enum EXTRACTOR_MetaType type,
+                         enum EXTRACTOR_MetaFormat format,
+                         const char *data_mime_type,
+                         const char *data,
+                         size_t data_len)
 {
   char *keyword;
 #if HAVE_ICONV
@@ -285,59 +291,59 @@ print_selected_keywords (void *cls,
     return 0;
   if (verbose > 3)
     FPRINTF (stdout,
-             _("Found by `%s' plugin:\n"),
-             plugin_name);
+             _ ("Found by `%s' plugin:\n"),
+             plugin_name);
   mt = EXTRACTOR_metatype_to_string (type);
-  stype = (NULL == mt) ? _("unknown") : gettext(mt);
+  stype = (NULL == mt) ? _ ("unknown") : gettext (mt);
   switch (format)
-    {
-    case EXTRACTOR_METAFORMAT_UNKNOWN:
-      FPRINTF (stdout,
-               _("%s - (unknown, %u bytes)\n"),
-               stype,
-               (unsigned int) data_len);
+  {
+  case EXTRACTOR_METAFORMAT_UNKNOWN:
+    FPRINTF (stdout,
+             _ ("%s - (unknown, %u bytes)\n"),
+             stype,
+             (unsigned int) data_len);
+    break;
+  case EXTRACTOR_METAFORMAT_UTF8:
+    if (0 == data_len)
       break;
-    case EXTRACTOR_METAFORMAT_UTF8:
-      if (0 == data_len)
-        break;
-#if HAVE_ICONV
-      cd = iconv_open (nl_langinfo(CODESET), "UTF-8");
-      if (((iconv_t) -1) != cd)
-        keyword = iconv_helper (cd,
-                                data,
-                                data_len);
-      else
-#endif
-        keyword = strdup (data);
-      if (NULL != keyword)
-        {
-          FPRINTF (stdout,
-                   "%s - %s\n",
-                   stype,
-                   keyword);
-          free (keyword);
-        }
 #if HAVE_ICONV
-      if (((iconv_t) -1) != cd)
-        iconv_close (cd);
+    cd = iconv_open (nl_langinfo (CODESET), "UTF-8");
+    if (((iconv_t) -1) != cd)
+      keyword = iconv_helper (cd,
+                              data,
+                              data_len);
+    else
 #endif
-      break;
-    case EXTRACTOR_METAFORMAT_BINARY:
-      FPRINTF (stdout,
-               _("%s - (binary, %u bytes)\n"),
-               stype,
-               (unsigned int) data_len);
-      break;
-    case EXTRACTOR_METAFORMAT_C_STRING:
+    keyword = strdup (data);
+    if (NULL != keyword)
+    {
       FPRINTF (stdout,
-               "%s - %.*s\n",
-               stype,
-               (int) data_len,
-               data);
-      break;
-    default:
-      break;
+               "%s - %s\n",
+               stype,
+               keyword);
+      free (keyword);
     }
+#if HAVE_ICONV
+    if (((iconv_t) -1) != cd)
+      iconv_close (cd);
+#endif
+    break;
+  case EXTRACTOR_METAFORMAT_BINARY:
+    FPRINTF (stdout,
+             _ ("%s - (binary, %u bytes)\n"),
+             stype,
+             (unsigned int) data_len);
+    break;
+  case EXTRACTOR_METAFORMAT_C_STRING:
+    FPRINTF (stdout,
+             "%s - %.*s\n",
+             stype,
+             (int) data_len,
+             data);
+    break;
+  default:
+    break;
+  }
   return 0;
 }
 
@@ -360,12 +366,12 @@ print_selected_keywords (void *cls,
  */
 static int
 print_selected_keywords_grep_friendly (void *cls,
-                                       const char *plugin_name,
-                                       enum EXTRACTOR_MetaType type,
-                                       enum EXTRACTOR_MetaFormat format,
-                                       const char *data_mime_type,
-                                       const char *data,
-                                       size_t data_len)
+                                       const char *plugin_name,
+                                       enum EXTRACTOR_MetaType type,
+                                       enum EXTRACTOR_MetaFormat format,
+                                       const char *data_mime_type,
+                                       const char *data,
+                                       size_t data_len)
 {
   char *keyword;
 #if HAVE_ICONV
@@ -379,51 +385,51 @@ print_selected_keywords_grep_friendly (void *cls,
   if (NULL == mt)
     mt = gettext_noop ("unknown");
   switch (format)
-    {
-    case EXTRACTOR_METAFORMAT_UNKNOWN:
-      break;
-    case EXTRACTOR_METAFORMAT_UTF8:
-      if (0 == data_len)
-        return 0;
-      if (verbose > 1)
-        FPRINTF (stdout,
-                 "%s: ",
-                 gettext(mt));
+  {
+  case EXTRACTOR_METAFORMAT_UNKNOWN:
+    break;
+  case EXTRACTOR_METAFORMAT_UTF8:
+    if (0 == data_len)
+      return 0;
+    if (verbose > 1)
+      FPRINTF (stdout,
+               "%s: ",
+               gettext (mt));
 #if HAVE_ICONV
-      cd = iconv_open (nl_langinfo (CODESET), "UTF-8");
-      if (((iconv_t) -1) != cd)
-        keyword = iconv_helper (cd,
-                                data,
-                                data_len);
-      else
+    cd = iconv_open (nl_langinfo (CODESET), "UTF-8");
+    if (((iconv_t) -1) != cd)
+      keyword = iconv_helper (cd,
+                              data,
+                              data_len);
+    else
 #endif
-        keyword = strdup (data);
-      if (NULL != keyword)
-        {
-          FPRINTF (stdout,
-                   "`%s' ",
-                   keyword);
-          free (keyword);
-        }
+    keyword = strdup (data);
+    if (NULL != keyword)
+    {
+      FPRINTF (stdout,
+               "`%s' ",
+               keyword);
+      free (keyword);
+    }
 #if HAVE_ICONV
-      if (((iconv_t) -1) != cd)
-        iconv_close (cd);
+    if (((iconv_t) -1) != cd)
+      iconv_close (cd);
 #endif
-      break;
-    case EXTRACTOR_METAFORMAT_BINARY:
-      break;
-    case EXTRACTOR_METAFORMAT_C_STRING:
-      if (verbose > 1)
-        FPRINTF (stdout,
-                 "%s ",
-                 gettext(mt));
+    break;
+  case EXTRACTOR_METAFORMAT_BINARY:
+    break;
+  case EXTRACTOR_METAFORMAT_C_STRING:
+    if (verbose > 1)
       FPRINTF (stdout,
-               "`%s'",
-               data);
-      break;
-    default:
-      break;
-    }
+               "%s ",
+               gettext (mt));
+    FPRINTF (stdout,
+             "`%s'",
+             data);
+    break;
+  default:
+    break;
+  }
   return 0;
 }
 
@@ -459,31 +465,30 @@ static char *entry_type;
  * Mapping between bibTeX strings, libextractor
  * meta data types and values for the current document.
  */
-static struct BibTexMap btm[] =
-  {
-    { "title", EXTRACTOR_METATYPE_TITLE, NULL},
-    { "year", EXTRACTOR_METATYPE_PUBLICATION_YEAR, NULL },
-    { "author", EXTRACTOR_METATYPE_AUTHOR_NAME, NULL },
-    { "book", EXTRACTOR_METATYPE_BOOK_TITLE, NULL},
-    { "edition", EXTRACTOR_METATYPE_BOOK_EDITION, NULL},
-    { "chapter", EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER, NULL},
-    { "journal", EXTRACTOR_METATYPE_JOURNAL_NAME, NULL},
-    { "volume", EXTRACTOR_METATYPE_JOURNAL_VOLUME, NULL},
-    { "number", EXTRACTOR_METATYPE_JOURNAL_NUMBER, NULL},
-    { "pages", EXTRACTOR_METATYPE_PAGE_COUNT, NULL },
-    { "pages", EXTRACTOR_METATYPE_PAGE_RANGE, NULL },
-    { "school", EXTRACTOR_METATYPE_AUTHOR_INSTITUTION, NULL},
-    { "publisher", EXTRACTOR_METATYPE_PUBLISHER, NULL },
-    { "address", EXTRACTOR_METATYPE_PUBLISHER_ADDRESS, NULL },
-    { "institution", EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION, NULL },
-    { "series", EXTRACTOR_METATYPE_PUBLISHER_SERIES, NULL},
-    { "month", EXTRACTOR_METATYPE_PUBLICATION_MONTH, NULL },
-    { "url", EXTRACTOR_METATYPE_URL, NULL},
-    { "note", EXTRACTOR_METATYPE_COMMENT, NULL},
-    { "eprint", EXTRACTOR_METATYPE_BIBTEX_EPRINT, NULL },
-    { "type", EXTRACTOR_METATYPE_PUBLICATION_TYPE, NULL },
-    { NULL, 0, NULL }
-  };
+static struct BibTexMap btm[] = {
+  { "title", EXTRACTOR_METATYPE_TITLE, NULL},
+  { "year", EXTRACTOR_METATYPE_PUBLICATION_YEAR, NULL },
+  { "author", EXTRACTOR_METATYPE_AUTHOR_NAME, NULL },
+  { "book", EXTRACTOR_METATYPE_BOOK_TITLE, NULL},
+  { "edition", EXTRACTOR_METATYPE_BOOK_EDITION, NULL},
+  { "chapter", EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER, NULL},
+  { "journal", EXTRACTOR_METATYPE_JOURNAL_NAME, NULL},
+  { "volume", EXTRACTOR_METATYPE_JOURNAL_VOLUME, NULL},
+  { "number", EXTRACTOR_METATYPE_JOURNAL_NUMBER, NULL},
+  { "pages", EXTRACTOR_METATYPE_PAGE_COUNT, NULL },
+  { "pages", EXTRACTOR_METATYPE_PAGE_RANGE, NULL },
+  { "school", EXTRACTOR_METATYPE_AUTHOR_INSTITUTION, NULL},
+  { "publisher", EXTRACTOR_METATYPE_PUBLISHER, NULL },
+  { "address", EXTRACTOR_METATYPE_PUBLISHER_ADDRESS, NULL },
+  { "institution", EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION, NULL },
+  { "series", EXTRACTOR_METATYPE_PUBLISHER_SERIES, NULL},
+  { "month", EXTRACTOR_METATYPE_PUBLICATION_MONTH, NULL },
+  { "url", EXTRACTOR_METATYPE_URL, NULL},
+  { "note", EXTRACTOR_METATYPE_COMMENT, NULL},
+  { "eprint", EXTRACTOR_METATYPE_BIBTEX_EPRINT, NULL },
+  { "type", EXTRACTOR_METATYPE_PUBLICATION_TYPE, NULL },
+  { NULL, 0, NULL }
+};
 
 
 /**
@@ -495,10 +500,10 @@ cleanup_bibtex ()
   unsigned int i;
 
   for (i = 0; NULL != btm[i].bibTexName; i++)
-    {
-      free (btm[i].value);
-      btm[i].value = NULL;
-    }
+  {
+    free (btm[i].value);
+    btm[i].value = NULL;
+  }
   free (entry_type);
   entry_type = NULL;
 }
@@ -522,12 +527,12 @@ cleanup_bibtex ()
  */
 static int
 print_bibtex (void *cls,
-              const char *plugin_name,
-              enum EXTRACTOR_MetaType type,
-              enum EXTRACTOR_MetaFormat format,
-              const char *data_mime_type,
-              const char *data,
-              size_t data_len)
+              const char *plugin_name,
+              enum EXTRACTOR_MetaType type,
+              enum EXTRACTOR_MetaFormat format,
+              const char *data_mime_type,
+              const char *data,
+              size_t data_len)
 {
   unsigned int i;
 
@@ -538,13 +543,13 @@ print_bibtex (void *cls,
   if (EXTRACTOR_METAFORMAT_UTF8 != format)
     return 0;
   if (EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE == type)
-    {
-      entry_type = strdup (data);
-      return 0;
-    }
+  {
+    entry_type = strdup (data);
+    return 0;
+  }
   for (i = 0; NULL != btm[i].bibTexName; i++)
     if ( (NULL == btm[i].value) &&
-         (btm[i].le_type == type) )
+         (btm[i].le_type == type) )
       btm[i].value = strdup (data);
   return 0;
 }
@@ -571,33 +576,33 @@ finish_bibtex (const char *fn)
        (NULL == btm[1].value) ||
        (NULL == btm[2].value) )
     FPRINTF (stdout,
-             "@%s %s { ",
-             et,
-             fn);
+             "@%s %s { ",
+             et,
+             fn);
   else
-    {
-      snprintf (temp,
-                sizeof (temp),
-                "%.5s%.5s%.5s",
-                btm[2].value,
-                btm[1].value,
-                btm[0].value);
-      for (n=strlen (temp)-1;n>=0;n-- )
-        if (! isalnum ( (unsigned char) temp[n]) )
-          temp[n] = '_';
-        else
-          temp[n] = tolower ( (unsigned char) temp[n]);
-      FPRINTF (stdout,
-               "@%s %s { ",
-               et,
-               temp);
-    }
-  for (i=0; NULL != btm[i].bibTexName; i++)
+  {
+    snprintf (temp,
+              sizeof (temp),
+              "%.5s%.5s%.5s",
+              btm[2].value,
+              btm[1].value,
+              btm[0].value);
+    for (n = strlen (temp) - 1; n>=0; n--)
+      if (! isalnum ( (unsigned char) temp[n]) )
+        temp[n] = '_';
+      else
+        temp[n] = tolower ( (unsigned char) temp[n]);
+    FPRINTF (stdout,
+             "@%s %s { ",
+             et,
+             temp);
+  }
+  for (i = 0; NULL != btm[i].bibTexName; i++)
     if (NULL != btm[i].value)
       FPRINTF (stdout,
-               "\t%s = {%s},\n",
-               btm[i].bibTexName,
-               btm[i].value);
+               "\t%s = {%s},\n",
+               btm[i].bibTexName,
+               btm[i].value);
   FPRINTF (stdout, "%s", "}\n\n");
 }
 
@@ -612,7 +617,9 @@ _wchar_to_str (const wchar_t *wstr, char **retstr, UINT cp)
   DWORD error;
 
   SetLastError (0);
-  len = WideCharToMultiByte (cp, 0, wstr, -1, NULL, 0, NULL, (cp == CP_UTF8 || cp == CP_UTF7) ? NULL : &lossy);
+  len = WideCharToMultiByte (cp, 0, wstr, -1, NULL, 0, NULL, (cp == CP_UTF8 ||
+                                                              cp == CP_UTF7) ?
+                             NULL : &lossy);
   error = GetLastError ();
   if (len <= 0)
     return -1;
@@ -620,7 +627,9 @@ _wchar_to_str (const wchar_t *wstr, char **retstr, UINT cp)
   str = malloc (sizeof (char) * len);
 
   SetLastError (0);
-  lenc = WideCharToMultiByte (cp, 0, wstr, -1, str, len, NULL, (cp == CP_UTF8 || cp == CP_UTF7) ? NULL : &lossy);
+  lenc = WideCharToMultiByte (cp, 0, wstr, -1, str, len, NULL, (cp == CP_UTF8 ||
+                                                                cp == CP_UTF7) ?
+                              NULL : &lossy);
   error = GetLastError ();
   if (lenc != len)
   {
@@ -632,6 +641,8 @@ _wchar_to_str (const wchar_t *wstr, char **retstr, UINT cp)
     return 1;
   return 0;
 }
+
+
 #endif
 
 
@@ -711,10 +722,10 @@ _get_utf8_args (int argc, char *const *argv, int *u8argc, char ***u8argv)
 
   *u8argv = _make_continuous_arg_copy (wargc, split_u8argv);
   if (NULL == *u8argv)
-    {
-      free (split_u8argv);
-      return -1;
-    }
+  {
+    free (split_u8argv);
+    return -1;
+  }
   *u8argc = wargc;
 
   for (i = 0; i < wargc; i++)
@@ -756,21 +767,21 @@ main (int argc, char *argv[])
   int utf8_argc;
 
 #if ENABLE_NLS
-  setlocale(LC_ALL, "");
-  textdomain(PACKAGE);
+  setlocale (LC_ALL, "");
+  textdomain (PACKAGE);
 #endif
 #ifndef WINDOWS
   ignore_sigpipe ();
 #endif
   if (NULL == (print = malloc (sizeof (int) * EXTRACTOR_metatype_get_max ())))
-    {
-      FPRINTF (stderr,
-               "malloc failed: %s\n",
-               strerror (errno));
-      return 1;
-    }
+  {
+    FPRINTF (stderr,
+             "malloc failed: %s\n",
+             strerror (errno));
+    return 1;
+  }
   for (i = 0; i < EXTRACTOR_metatype_get_max (); i++)
-    print[i] = YES;             /* default: print everything */
+    print[i] = YES;   /* default: print everything */
 
   if (0 != _get_utf8_args (argc, argv, &utf8_argc, &utf8_argv))
   {
@@ -779,249 +790,252 @@ main (int argc, char *argv[])
   }
 
   while (1)
+  {
+    static struct option long_options[] = {
+      {"bibtex", 0, 0, 'b'},
+      {"grep-friendly", 0, 0, 'g'},
+      {"help", 0, 0, 'h'},
+      {"in-process", 0, 0, 'i'},
+      {"from-memory", 0, 0, 'm'},
+      {"list", 0, 0, 'L'},
+      {"library", 1, 0, 'l'},
+      {"nodefault", 0, 0, 'n'},
+      {"print", 1, 0, 'p'},
+      {"verbose", 0, 0, 'V'},
+      {"version", 0, 0, 'v'},
+      {"exclude", 1, 0, 'x'},
+      {0, 0, 0, 0}
+    };
+    option_index = 0;
+    c = getopt_long (utf8_argc,
+                     utf8_argv,
+                     "abghiml:Lnp:vVx:",
+                     long_options,
+                     &option_index);
+
+    if (c == -1)
+      break;  /* No more flags to process */
+    switch (c)
     {
-      static struct option long_options[] = {
-        {"bibtex", 0, 0, 'b'},
-        {"grep-friendly", 0, 0, 'g'},
-        {"help", 0, 0, 'h'},
-        {"in-process", 0, 0, 'i'},
-        {"from-memory", 0, 0, 'm'},
-        {"list", 0, 0, 'L'},
-        {"library", 1, 0, 'l'},
-        {"nodefault", 0, 0, 'n'},
-        {"print", 1, 0, 'p'},
-        {"verbose", 0, 0, 'V'},
-        {"version", 0, 0, 'v'},
-        {"exclude", 1, 0, 'x'},
-        {0, 0, 0, 0}
-      };
-      option_index = 0;
-      c = getopt_long (utf8_argc,
-                       utf8_argv,
-                       "abghiml:Lnp:vVx:",
-                       long_options,
-                       &option_index);
-
-      if (c == -1)
-        break;                  /* No more flags to process */
-      switch (c)
-        {
-        case 'b':
-          bibtex = YES;
-          if (NULL != processor)
-            {
-              FPRINTF (stderr,
-                       "%s",
-                       _("Illegal combination of options, cannot combine multiple styles of printing.\n"));
-              free (utf8_argv);
-              return 0;
-            }
-          processor = &print_bibtex;
-          break;
-        case 'g':
-          grepfriendly = YES;
-          if (NULL != processor)
-            {
-              FPRINTF (stderr,
-                       "%s",
-                       _("Illegal combination of options, cannot combine multiple styles of printing.\n"));
-              free (utf8_argv);
-              return 0;
-            }
-          processor = &print_selected_keywords_grep_friendly;
-          break;
-        case 'h':
-          print_help ();
-          free (utf8_argv);
-          return 0;
-        case 'i':
-          in_process = YES;
-          break;
-        case 'm':
-          from_memory = YES;
+    case 'b':
+      bibtex = YES;
+      if (NULL != processor)
+      {
+        FPRINTF (stderr,
+                 "%s",
+                 _ (
+                   "Illegal combination of options, cannot combine multiple styles of printing.\n"));
+        free (utf8_argv);
+        return 0;
+      }
+      processor = &print_bibtex;
+      break;
+    case 'g':
+      grepfriendly = YES;
+      if (NULL != processor)
+      {
+        FPRINTF (stderr,
+                 "%s",
+                 _ (
+                   "Illegal combination of options, cannot combine multiple styles of printing.\n"));
+        free (utf8_argv);
+        return 0;
+      }
+      processor = &print_selected_keywords_grep_friendly;
+      break;
+    case 'h':
+      print_help ();
+      free (utf8_argv);
+      return 0;
+    case 'i':
+      in_process = YES;
+      break;
+    case 'm':
+      from_memory = YES;
+      break;
+    case 'l':
+      libraries = optarg;
+      break;
+    case 'L':
+      i = 0;
+      while (NULL != EXTRACTOR_metatype_to_string (i))
+        printf ("%s\n",
+                gettext (EXTRACTOR_metatype_to_string (i++)));
+      free (utf8_argv);
+      return 0;
+    case 'n':
+      nodefault = YES;
+      break;
+    case 'p':
+      if (NULL == optarg)
+      {
+        FPRINTF (stderr,
+                 _ (
+                   "You must specify an argument for the `%s' option (option ignored).\n"),
+                 "-p");
+        break;
+      }
+      if (YES == defaultAll)
+      {
+        defaultAll = NO;
+        i = 0;
+        while (NULL != EXTRACTOR_metatype_to_string (i))
+          print[i++] = NO;
+      }
+      i = 0;
+      while (NULL != EXTRACTOR_metatype_to_string (i))
+      {
+        if ( (0 == strcmp (optarg,
+                           EXTRACTOR_metatype_to_string (i))) ||
+             (0 == strcmp (optarg,
+                           gettext (EXTRACTOR_metatype_to_string (i)))) )
+
+        {
+          print[i] = YES;
           break;
-        case 'l':
-          libraries = optarg;
-          break;
-        case 'L':
-          i = 0;
-          while (NULL != EXTRACTOR_metatype_to_string (i))
-            printf ("%s\n",
-                    gettext(EXTRACTOR_metatype_to_string (i++)));
-          free (utf8_argv);
-          return 0;
-        case 'n':
-          nodefault = YES;
-          break;
-        case 'p':
-          if (NULL == optarg)
-            {
-              FPRINTF(stderr,
-                      _("You must specify an argument for the `%s' option (option ignored).\n"),
-                      "-p");
-              break;
-            }
-          if (YES == defaultAll)
-            {
-              defaultAll = NO;
-              i = 0;
-              while (NULL != EXTRACTOR_metatype_to_string (i))
-                print[i++] = NO;
-            }
-          i = 0;
-          while (NULL != EXTRACTOR_metatype_to_string (i))
-            {
-              if ( (0 == strcmp (optarg,
-                                 EXTRACTOR_metatype_to_string (i))) ||
-                   (0 == strcmp (optarg,
-                                 gettext(EXTRACTOR_metatype_to_string (i)))) )
-
-                {
-                  print[i] = YES;
-                  break;
-                }
-              i++;
-            }
-          if (NULL == EXTRACTOR_metatype_to_string (i))
-            {
-              FPRINTF(stderr,
-                      "Unknown keyword type `%s', use option `%s' to get a list.\n",
-                      optarg,
-                       "-L");
-              free (utf8_argv);
-              return -1;
-            }
-          break;
-        case 'v':
-          printf ("extract v%s\n", PACKAGE_VERSION);
-          free (utf8_argv);
-          return 0;
-        case 'V':
-          verbose++;
-          break;
-        case 'x':
-          i = 0;
-          while (NULL != EXTRACTOR_metatype_to_string (i))
-            {
-              if ( (0 == strcmp (optarg,
-                                 EXTRACTOR_metatype_to_string (i))) ||
-                   (0 == strcmp (optarg,
-                                 gettext(EXTRACTOR_metatype_to_string (i)))) )
-                {
-                  print[i] = NO;
-                  break;
-                }
-              i++;
-            }
-          if (NULL == EXTRACTOR_metatype_to_string (i))
-            {
-              FPRINTF (stderr,
-                       "Unknown keyword type `%s', use option `%s' to get a list.\n",
-                       optarg,
-                       "-L");
-              free (utf8_argv);
-              return -1;
-            }
-          break;
-        default:
-          FPRINTF (stderr,
-                   "%s",
-                   _("Use --help to get a list of options.\n"));
-          free (utf8_argv);
-          return -1;
-        }                       /* end of parsing commandline */
-    }                           /* while (1) */
-  if (optind < 0)
-    {
-      FPRINTF (stderr,
-               "%s", "Unknown error parsing options\n");
-      free (print);
+        }
+        i++;
+      }
+      if (NULL == EXTRACTOR_metatype_to_string (i))
+      {
+        FPRINTF (stderr,
+                 "Unknown keyword type `%s', use option `%s' to get a list.\n",
+                 optarg,
+                 "-L");
+        free (utf8_argv);
+        return -1;
+      }
+      break;
+    case 'v':
+      printf ("extract v%s\n", PACKAGE_VERSION);
       free (utf8_argv);
-      return -1;
-    }
-  if (utf8_argc - optind < 1)
-    {
+      return 0;
+    case 'V':
+      verbose++;
+      break;
+    case 'x':
+      i = 0;
+      while (NULL != EXTRACTOR_metatype_to_string (i))
+      {
+        if ( (0 == strcmp (optarg,
+                           EXTRACTOR_metatype_to_string (i))) ||
+             (0 == strcmp (optarg,
+                           gettext (EXTRACTOR_metatype_to_string (i)))) )
+        {
+          print[i] = NO;
+          break;
+        }
+        i++;
+      }
+      if (NULL == EXTRACTOR_metatype_to_string (i))
+      {
+        FPRINTF (stderr,
+                 "Unknown keyword type `%s', use option `%s' to get a list.\n",
+                 optarg,
+                 "-L");
+        free (utf8_argv);
+        return -1;
+      }
+      break;
+    default:
       FPRINTF (stderr,
-               "%s", "Invoke with list of filenames to extract keywords form!\n");
-      free (print);
+               "%s",
+               _ ("Use --help to get a list of options.\n"));
       free (utf8_argv);
       return -1;
-    }
+    }   /* end of parsing commandline */
+  }         /* while (1) */
+  if (optind < 0)
+  {
+    FPRINTF (stderr,
+             "%s", "Unknown error parsing options\n");
+    free (print);
+    free (utf8_argv);
+    return -1;
+  }
+  if (utf8_argc - optind < 1)
+  {
+    FPRINTF (stderr,
+             "%s", "Invoke with list of filenames to extract keywords form!\n");
+    free (print);
+    free (utf8_argv);
+    return -1;
+  }
 
   /* build list of libraries */
   if (NO == nodefault)
     plugins = EXTRACTOR_plugin_add_defaults (in_process
-                                             ? EXTRACTOR_OPTION_IN_PROCESS
-                                             : EXTRACTOR_OPTION_DEFAULT_POLICY);
+                                             ? EXTRACTOR_OPTION_IN_PROCESS
+                                             : EXTRACTOR_OPTION_DEFAULT_POLICY);
   else
     plugins = NULL;
   if (NULL != libraries)
     plugins = EXTRACTOR_plugin_add_config (plugins,
-                                           libraries,
-                                           in_process
-                                           ? EXTRACTOR_OPTION_IN_PROCESS
-                                           : EXTRACTOR_OPTION_DEFAULT_POLICY);
+                                           libraries,
+                                           in_process
+                                           ? EXTRACTOR_OPTION_IN_PROCESS
+                                           : EXTRACTOR_OPTION_DEFAULT_POLICY);
   if (NULL == processor)
     processor = &print_selected_keywords;
 
   /* extract keywords */
   if (YES == bibtex)
-    FPRINTF(stdout,
-            "%s", _("% BiBTeX file\n"));
+    FPRINTF (stdout,
+             "%s", _ ("% BiBTeX file\n"));
   for (i = optind; i < utf8_argc; i++)
+  {
+    errno = 0;
+    if (YES == grepfriendly)
+      FPRINTF (stdout, "%s ", utf8_argv[i]);
+    else if (NO == bibtex)
+      FPRINTF (stdout,
+               _ ("Keywords for file %s:\n"),
+               utf8_argv[i]);
+    else
+      cleanup_bibtex ();
+    if (NO == from_memory)
+      EXTRACTOR_extract (plugins,
+                         utf8_argv[i],
+                         NULL, 0,
+                         processor,
+                         NULL);
+    else
     {
-      errno = 0;
-      if (YES == grepfriendly)
-        FPRINTF (stdout, "%s ", utf8_argv[i]);
-      else if (NO == bibtex)
-        FPRINTF (stdout,
-                 _("Keywords for file %s:\n"),
-                 utf8_argv[i]);
-      else
-        cleanup_bibtex ();
-      if (NO == from_memory)
-        EXTRACTOR_extract (plugins,
-                           utf8_argv[i],
-                           NULL, 0,
-                           processor,
-                           NULL);
-      else
-        {
-          struct stat sb;
-          unsigned char *data = NULL;
-          int f = OPEN (utf8_argv[i], O_RDONLY
+      struct stat sb;
+      unsigned char *data = NULL;
+      int f = OPEN (utf8_argv[i], O_RDONLY
 #if WINDOWS
-                        | O_BINARY
+                    | O_BINARY
 #endif
-                        );
-          if ( (-1 != f) &&
-               (0 == FSTAT (f, &sb)) &&
-               (NULL != (data = malloc ((size_t) sb.st_size))) &&
-               (sb.st_size == READ (f, data, (size_t) sb.st_size) ) )
-            {
-              EXTRACTOR_extract (plugins,
-                                 NULL,
-                                 data, sb.st_size,
-                                 processor,
-                                 NULL);
-            }
-          else
-            {
-              if (verbose > 0)
-                FPRINTF(stderr,
-                        "%s: %s: %s\n",
-                        utf8_argv[0], utf8_argv[i], strerror(errno));
-              ret = 1;
-            }
-          if (NULL != data)
-            free (data);
-          if (-1 != f)
-            (void) CLOSE (f);
-        }
-      if (YES == grepfriendly)
-        FPRINTF (stdout, "%s", "\n");
-      continue;
+                    );
+      if ( (-1 != f) &&
+           (0 == FSTAT (f, &sb)) &&
+           (NULL != (data = malloc ((size_t) sb.st_size))) &&
+           (sb.st_size == READ (f, data, (size_t) sb.st_size) ) )
+      {
+        EXTRACTOR_extract (plugins,
+                           NULL,
+                           data, sb.st_size,
+                           processor,
+                           NULL);
+      }
+      else
+      {
+        if (verbose > 0)
+          FPRINTF (stderr,
+                   "%s: %s: %s\n",
+                   utf8_argv[0], utf8_argv[i], strerror (errno));
+        ret = 1;
+      }
+      if (NULL != data)
+        free (data);
+      if (-1 != f)
+        (void) CLOSE (f);
     }
+    if (YES == grepfriendly)
+      FPRINTF (stdout, "%s", "\n");
+    continue;
+  }
   if (YES == grepfriendly)
     FPRINTF (stdout, "%s", "\n");
   if (bibtex)
@@ -1036,4 +1050,5 @@ main (int argc, char *argv[])
   return ret;
 }
 
+
 /* end of extract.c */