X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=5ef52a4d81ee87a44c6d1de5bb34b4ea238f67e0;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=6b5d43740203d40cd9cf1a8184ee17c089862fa6;hpb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 6b5d437..5ef52a4 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,7 +1,5 @@
-/* $Id: metaproxy_prog.cpp,v 1.14 2008-02-20 15:07:52 adam Exp $
-   Copyright (c) 2005-2008, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 Index Data
 
 Metaproxy 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
@@ -14,10 +12,9 @@ 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 Metaproxy; see the file LICENSE.  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
+*/
 
 #include "config.hpp"
 
@@ -34,6 +31,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "router_flexml.hpp"
 #include "factory_static.hpp"
 
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef WIN32
+#include <direct.h>
+#endif
+
 namespace mp = metaproxy_1;
 
 static void handler(void *data)
@@ -55,7 +59,7 @@ int main(int argc, char **argv)
         const char *pidfile = 0;
         const char *uid = 0;
 
-        while ((ret = options("c{config}:Dh{help}l:p:u:V{version}X", 
+        while ((ret = options("c{config}:Dh{help}l:p:u:V{version}w:X", 
                               argv, argc, &arg)) != -2)
         {
             switch (ret)
@@ -75,12 +79,12 @@ int main(int argc, char **argv)
                     " -l f          log file f\n"
                     " -p f          pid file f\n"
                     " -u id         change uid to id\n"
+                    " -w dir        changes working directory to dir\n"
                     " -X            debug mode (no fork/daemon mode)\n"
                           << std::endl;
                 break;
             case 'l':
                 yaz_log_init_file(arg);
-                yaz_log(YLOG_LOG, "Metaproxy " VERSION " started");
                 break;
             case 'p':
                 pidfile = arg;
@@ -89,8 +93,15 @@ int main(int argc, char **argv)
                 uid = arg;
                 break;
             case 'V':
-                std::cout << "Metaproxy " VERSION "\n";
+                std::cout << VERSION "\n";
+                std::exit(0);
                 break;
+            case 'w':
+                if (chdir(arg)) 
+                {
+                    std::cerr << "chdir " << arg << " failed" << std::endl;
+                    std::exit(1);
+                }
             case 'X':
                 mode = YAZ_DAEMON_DEBUG;
                 break;
@@ -101,10 +112,11 @@ int main(int argc, char **argv)
         }
         if (!fname)
         {
-            std::cerr << "No configuration given\n";
+            std::cerr << "No configuration given; use -h for help\n";
             std::exit(1);
         }
 
+        yaz_log(YLOG_LOG, "Metaproxy " VERSION " started");
         xmlDocPtr doc = xmlReadFile(fname,
                                     NULL, 
                                     XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
@@ -143,8 +155,9 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+