From 918e39086b0a686a6a0417fd8e898a830567bc28 Mon Sep 17 00:00:00 2001
From: Artem Chudinov <arzeth0@gmail.com>
Date: Fri, 30 Oct 2015 19:12:14 +0500
Subject: b2sum: Support --help

---
 b2sum/b2sum.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'b2sum')

diff --git a/b2sum/b2sum.c b/b2sum/b2sum.c
index 073b60f..9d64900 100644
--- a/b2sum/b2sum.c
+++ b/b2sum/b2sum.c
@@ -228,12 +228,13 @@ cleanup_buffer:
 typedef int ( *blake2fn )( FILE *, void * );
 
 
-static void usage( char **argv )
+static void usage( char **argv, int errcode )
 {
-  fprintf( stderr, "Usage: %s [-a HASH] [FILE]...\n", argv[0] );
-  fprintf( stderr, "\tHASH in blake2b blake2s blake2bp blake2sp\n" );
-  fprintf( stderr, "\tWith no FILE, or when FILE is -, read standard input.\n" );
-  exit( 111 );
+  FILE *out = errcode ? stderr : stdout;
+  fprintf( out, "Usage: %s [-a HASH] [FILE]...\n", argv[0] );
+  fprintf( out, "\tHASH in blake2b blake2s blake2bp blake2sp\n" );
+  fprintf( out, "\tWith no FILE, or when FILE is -, read standard input.\n" );
+  exit( errcode );
 }
 
 
@@ -245,12 +246,22 @@ int main( int argc, char **argv )
   int c;
   opterr = 1;
 
-  if ( argc == 1 ) usage( argv ); /* show usage upon no-argument */
-
-  while( ( c = getopt( argc, argv, "a:" ) ) != -1 )
+  while( 1 )
   {
+    int this_option_optind = optind ? optind : 1;
+    int option_index = 0;
+    static struct option long_options[] = {
+      { "help", no_argument, 0, 0 },
+      { NULL, 0, NULL, 0 }
+    };
+    c = getopt_long( argc, argv, "a:", long_options, &option_index );
+    if( c == -1 ) break;
     switch( c )
     {
+    case 0:
+      if( 0 == strcmp( "help", long_options[option_index].name ) )
+        usage( argv, 0 );
+      break;
     case 'a':
       if( 0 == strcmp( optarg, "blake2b" ) )
       {
@@ -275,10 +286,14 @@ int main( int argc, char **argv )
       else
       {
         printf( "Invalid function name: `%s'\n", optarg );
-        usage( argv );
+        usage( argv, 111 );
       }
 
       break;
+
+    case '?':
+      usage( argv, 1 );
+      break;
     }
   }
 
-- 
cgit v1.2.3