Changeset 2e5f594

Timestamp:

2022-06-22T11:52:03Z (2 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

b82ba4a

Parents:

cc0ad0a

Message:

conf: Improve bitlbee -V output

File:

• conf.c (modified) (2 diffs)

conf.c

@@ -43 +43 @@
         conf_t *conf;
         int opt, i, config_missing = 0;
+        int version_happened = 0;
 
         conf = g_new0(conf_t, 1);
@@ -142 +143 @@
                         return NULL;
                 } else if (opt == 'V') {
-                        printf("BitlBee %s\nAPI version %06x\nConfigure args: %s\n",
-                               BITLBEE_VERSION, BITLBEE_VERSION_CODE, BITLBEE_CONFIGURE_ARGS);
-                        conf_free(conf);
-                        return NULL;
+                        printf("BitlBee %s\n", BITLBEE_VERSION);
+                        /* the rest of the version string is displayed below, for ld -vvv compatibility*/
+                        version_happened = TRUE;
                 } else if (opt == 'u') {
                         g_free(conf->user);
                         conf->user = g_strdup(optarg);
                 }
+        }
+
+        if (version_happened) {
+                printf("API version %06x\nConfigure args: %s\n",
+                       BITLBEE_VERSION_CODE, BITLBEE_CONFIGURE_ARGS);
+                conf_free(conf);
+                return NULL;
         }