X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdictext.c;h=11dce88af1dd028435b264412515e3ec12799368;hp=124e46147f52c43fdee0f51764d33e17902698fc;hb=732870c555c7d32c5d2b6a4914c6fa7232eb26b2;hpb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4

diff --git a/dict/dictext.c b/dict/dictext.c
index 124e461..11dce88 100644
--- a/dict/dictext.c
+++ b/dict/dictext.c
@@ -1,8 +1,5 @@
-/* $Id: dictext.c,v 1.12 2005-03-30 09:25:23 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,13 +12,16 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -29,10 +29,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <ctype.h>
 
 #include <idzebra/util.h>
+#include <yaz/yaz-util.h>
 
 char *prog;
 
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
     char *arg;
     int ret;
@@ -42,7 +43,7 @@ int main (int argc, char **argv)
     char ipf_buf[1024];
 
     prog = *argv;
-    while ((ret = options ("8vh", argv, argc, &arg)) != -2)
+    while ((ret = options("8vh", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -50,38 +51,38 @@ int main (int argc, char **argv)
                 inputfile = arg;
             else
             {
-                yaz_log (YLOG_FATAL, "too many files specified\n");
-                exit (1);
+                yaz_log(YLOG_FATAL, "too many files specified\n");
+                exit(1);
             }
         }
         else if (ret == 'v')
         {
-            yaz_log_init (yaz_log_mask_str(arg), prog, NULL);
+            yaz_log_init(yaz_log_mask_str(arg), prog, NULL);
         }
         else if (ret == 'h')
         {
-            fprintf (stderr, "usage:\n"
-                     "  %s [-8] [-h] [-v n] [file]\n", prog);
-            exit (1);
+            fprintf(stderr, "usage:\n"
+                    "  %s [-8] [-h] [-v n] [file]\n", prog);
+            exit(1);
         }
         else if (ret == '8')
             use8 = 1;
         else
         {
-            yaz_log (YLOG_FATAL, "Unknown option '-%s'", arg);
-            exit (1);
+            yaz_log(YLOG_FATAL, "Unknown option '-%s'", arg);
+            exit(1);
         }
     }
     if (inputfile)
     {
-        ipf = fopen (inputfile, "r");
+        ipf = fopen(inputfile, "r");
         if (!ipf)
         {
-            yaz_log (YLOG_FATAL|YLOG_ERRNO, "cannot open '%s'", inputfile);
-            exit (1);
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "cannot open '%s'", inputfile);
+            exit(1);
         }
     }
-    while (fgets (ipf_buf, 1023, ipf))
+    while (fgets(ipf_buf, 1023, ipf))
     {
         char *ipf_ptr = ipf_buf;
         for (;*ipf_ptr && *ipf_ptr != '\n';ipf_ptr++)
@@ -97,7 +98,7 @@ int main (int argc, char **argv)
                     i++;
                 if (ipf_ptr[i])
                     ipf_ptr[i++] = '\0';
-                printf ("%s\n", ipf_ptr);
+                printf("%s\n", ipf_ptr);
                 ipf_ptr += (i-1);
             }
         }
@@ -107,3 +108,12 @@ int main (int argc, char **argv)
 
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+