Changeset ae3dc99 for conf.c

Timestamp:

2010-04-24T17:02:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c521362

Parents:

b5b40ff (diff), f1b7711 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging stuff from mainline (1.2.6).

File:

• conf.c (modified) (2 diffs)

conf.c

@@ -82 +82 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:V" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -148 +148 @@
                                 "  -d  Specify alternative user configuration directory\n"
                                 "  -x  Command-line interface to password encryption/hashing\n"
-                                "  -h  Show this help page.\n" );
+                                "  -h  Show this help page.\n"
+                                "  -V  Show version info.\n" );
+                        return NULL;
+                }
+                else if( opt == 'V' )
+                {
+                        printf( "BitlBee %s\nAPI version %06x\n",
+                                BITLBEE_VERSION, BITLBEE_VERSION_CODE );
                         return NULL;
                 }