Updated footer comment

[metaproxy-moved-to-github.git] / src / metaproxy_prog.cpp

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index b8625c8..5ef52a4 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -31,6 +31,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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)
@@ -52,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)
@@ -72,6 +79,7 @@ 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;
@@ -85,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;
@@ -97,7 +112,7 @@ 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);
         }
 
@@ -140,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
  */
+