I hate failed merges

[pazpar2-moved-to-github.git] / src / pazpar2.c

diff --git a/src/pazpar2.c b/src/pazpar2.c
index e3ab4d7..3352fa0 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 Index Data
 
 Pazpar2 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
@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "database.h"
 #include "settings.h"
 #include <yaz/daemon.h>
+
 #include <yaz/sc.h>
 
 void child_handler(void *data)
@@ -60,7 +61,7 @@ static void show_version(void)
     yaz_version(yaz_version_str, 0);
 
     printf("Configuration:");
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
     printf(" icu:?");
 #endif
     printf(" yaz:%s", yaz_version_str);
@@ -82,7 +83,9 @@ static int tcpip_init (void)
 #endif
 
 
-static int sc_main(yaz_sc_t s, int argc, char **argv)
+static int sc_main(
+    yaz_sc_t s, 
+    int argc, char **argv)
 {
     int daemon = 0;
     int ret;
@@ -90,10 +93,7 @@ static int sc_main(yaz_sc_t s, int argc, char **argv)
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
-    int i;
 
-    for (i = 0; i < argc; i++)
-        yaz_log(YLOG_LOG, "arg%d: %s", i, argv[i]);
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
@@ -102,10 +102,7 @@ static int sc_main(yaz_sc_t s, int argc, char **argv)
 #endif
 
     yaz_log_init_prefix("pazpar2");
-#if YAZ_VERSIONL >= 0x03001B
     yaz_log_xml_errors(0, YLOG_WARN);
-#endif
-
 
     while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
@@ -154,6 +151,10 @@ static int sc_main(yaz_sc_t s, int argc, char **argv)
                     "    -u uid\n"
                     "    -V                      show version\n"
                     "    -X                      debug mode\n"
+#ifdef WIN32
+                    "    -install                install windows service\n"
+                    "    -remove                 remove windows service\n"
+#endif
                 );
             return 1;
        }
@@ -207,7 +208,9 @@ 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
  */
+