From: Roger Dingledine <arma@torproject.org>
Date: Sun, 16 Jan 2005 02:21:14 +0000 (+0000)
Subject: make tor-resolve print the Tor version on --version too
X-Git-Tag: tor-0.1.0.1-rc~462
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=372832d8fec7cb82a9ae5030206f146a40e73b32;p=thirdparty%2Ftor.git

make tor-resolve print the Tor version on --version too


svn:r3358
---

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index f269ee63bb..65a6300cfa 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -181,6 +181,11 @@ main(int argc, char **argv)
   if (!n_args)
     usage();
 
+  if (!strcmp(arg[0],"--version")) {
+    printf("Tor version %s.\n",VERSION);
+    return 0;
+  }
+
   if (!strcmp("-v", arg[0])) {
     add_stream_log(LOG_DEBUG, LOG_ERR, "<stderr>", stderr);
     ++arg; --n_args;
@@ -213,7 +218,7 @@ main(int argc, char **argv)
 
   if (network_init()<0) {
     log_fn(LOG_ERR,"Error initializing network; exiting.");
-    return -1;
+    return 1;
   }
 
   if (do_resolve(arg[0], sockshost, socksport, &result))