From b9a7eb084480541b120c997a15685348779a13df Mon Sep 17 00:00:00 2001
From: Sei Lisa <sei-lisa@email.fake>
Date: Thu, 5 Oct 2017 19:33:21 +0200
Subject: [PATCH] Accept --version to show short version info, and --help for
 usage.

-V gives the long version info; --version gives a short one, easier to parse.

There was no explicit flag for showing usage, so add one that returns a graceful return code rather than a failure code.

Fixes #43
---
 lslmini.cc | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lslmini.cc b/lslmini.cc
index 02c2b77..37cfc8d 100644
--- a/lslmini.cc
+++ b/lslmini.cc
@@ -841,7 +841,9 @@ void usage(char *name) {
 #ifdef COMPILE_ENABLED
    printf("\t-c\t\tFlag: Compile (default off)\n");
 #endif /* COMPILE_ENABLED */
-   printf("\t-V\t\tPrint version and exit.\n");
+   printf("\t-V\t\tPrint long version info and exit.\n");
+   printf("\t--version\tPrint short version info and exit.\n");
+   printf("\t--help\t\tPrint this help text and exit.\n");
    printf("\n");
    printf("Options that are flags can have a - sign at the end to disable them\n");
    printf("(e.g. -m- to disable Mono and enable LSO)\n");
@@ -887,6 +889,10 @@ void version() {
    fprintf(stderr, "VS 2015  by: Xenhat    @ https://github.com/Ociidii-Works/lslint\n");
 }
 
+void short_version() {
+   fprintf(stderr, "lslint %s\n", VERSION);
+}
+
 int yylex_init( void ** );
 void yyset_in( FILE *, void *);
 int yylex_destroy( void *) ;
@@ -903,6 +909,21 @@ int main(int argc, char **argv) {
    bool compile   = true;
 #endif
 
+   // HACK: Parse long options before anything else.
+   for ( i = 1; i < argc; ++i ) {
+      if (argv[i][0] == '-' && argv[i][1] == '-') {
+         char *optiontext = argv[i] + 2;
+         if ( !strcmp(optiontext, "version") ) {
+            short_version();
+            return 0;
+         }
+         if ( !strcmp(optiontext, "help") ) {
+            usage(argv[0]);
+            return 0;
+         }
+      }
+   }
+
    for ( i = 1; i < argc; ++i ) {
       if ( argv[i][0] == '-' ) {
          for ( j = 1 ; argv[i][j]; ++j ) {
@@ -966,7 +987,7 @@ int main(int argc, char **argv) {
                   } else compile = true;
                   break;
 #endif /* COMPILE_ENABLED */
-               default: usage(argv[0]); exit(1);
+               default: usage(argv[0]); return 1;
             }
          }
       } else {