A hack I've been wanting for a while: when building a -dev version

from an SVN repository, use the current svn revision in the platform
string and in the output of --version.



svn:r9976

1 files changed, 9 insertions, 1 deletions

diff --git a/src/or/config.c b/src/or/config.c
index c7b7fdf24..568cd934b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2982,6 +2982,8 @@ check_nickname_list(const char *lst, const char *name, char **msg)
   return r;
 }
 
+extern const char tor_svn_revision[]; /* from main.c */
+
 /** Read a configuration file into <b>options</b>, finding the configuration
  * file location based on the command line.  After loading the options,
  * validate them for consistency, then take actions based on them.
@@ -3018,7 +3020,13 @@ options_init_from_torrc(int argc, char **argv)
   }
 
   if (argc > 1 && (!strcmp(argv[1],"--version"))) {
-    printf("Tor version %s.\n",VERSION);
+    char vbuf[128];
+    if (tor_svn_revision && strlen(tor_svn_revision)) {
+      tor_snprintf(vbuf, sizeof(vbuf), " (r%s)", tor_svn_revision);
+    } else {
+      vbuf[0] = 0;
+    }
+    printf("Tor version %s%s.\n",VERSION,vbuf);
     if (argc > 2 && (!strcmp(argv[2],"--version"))) {
       print_svn_version();
     }