X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=daa268a62ad873d94f2da9531965f773f6b964f5;hp=d53d10d5cc1df46681c49e294ed13db69f89b282;hb=4f79f9b5b0095b2f81b1ce583f0f82462f9ee36a;hpb=22afe38a1f113ef7f2a46d1fde0141cf10b27eb4 diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp index d53d10d..daa268a 100644 --- a/src/yaz-proxy-main.cpp +++ b/src/yaz-proxy-main.cpp @@ -1,5 +1,5 @@ /* This file is part of YAZ proxy - Copyright (C) 1998-2008 Index Data + Copyright (C) 1998-2011 Index Data YAZ proxy 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 @@ -59,7 +59,7 @@ void usage(char *prog) fprintf (stderr, "%s: [-a log] [-c config] [-D]\n" " [-i sec] [-l log] [-m num] [-n num] [-p pidfile]" " [-t target] [-T sec] [-u uid]\n" - " [-v level] [-X] @:port\n", prog); + " [-v level] [-X] [-V] @:port\n", prog); exit (1); } @@ -76,7 +76,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) char *prog = argv[0]; int ret; - while ((ret = options("o:a:Dt:v:c:u:i:m:l:T:p:n:X", + while ((ret = options("o:a:Dt:v:c:u:i:m:l:T:p:n:VX", argv, argc, &arg)) != -2) { int err; @@ -142,6 +142,15 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) case 'v': yaz_log_init_level (yaz_log_mask_str(arg)); break; + case 'V': + puts( +#ifdef VERSION + VERSION +#else + "unknown" +#endif + ); + exit(0); case 'X': proxy->set_debug_mode(1); daemon_flags = YAZ_DAEMON_DEBUG; @@ -223,7 +232,7 @@ static void child_run(void *data) struct rlimit limit_data; limit_data.rlim_cur = no_limit_files; limit_data.rlim_max = no_limit_files; - + yaz_log(YLOG_LOG, "0 setrlimit NOFILE cur=%ld max=%ld", (long) limit_data.rlim_cur, (long) limit_data.rlim_max); if (setrlimit(RLIMIT_NOFILE, &limit_data)) @@ -238,7 +247,7 @@ static void child_run(void *data) yaz_log(YLOG_LOG, "0 getrlimit NOFILE cur=%ld max=%ld", (long) limit_data.rlim_cur, (long) limit_data.rlim_max); #endif - + while (m->processEvent() > 0) ; @@ -249,7 +258,7 @@ int main(int argc, char **argv) { #if YAZ_HAVE_XSLT xmlInitMemory(); - + LIBXML_TEST_VERSION #endif SocketManager mySocketManager; @@ -267,6 +276,7 @@ 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