From 3534bc0e49bae184a5bd55559d3b06d4fd45d660 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 1 Oct 2014 19:52:07 -0700
Subject: [PATCH] print usage prettier (with an apparent off-by-one error)

---
 xwords4/linux/linuxmain.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/xwords4/linux/linuxmain.c b/xwords4/linux/linuxmain.c
index f7e436212..2d6fc87a6 100644
--- a/xwords4/linux/linuxmain.c
+++ b/xwords4/linux/linuxmain.c
@@ -804,15 +804,31 @@ make_longopts()
 static void
 usage( char* appName, char* msg )
 {
+    const char* param = "<param>";
     int ii;
     if ( msg != NULL ) {
         fprintf( stderr, "Error: %s\n\n", msg );
     }
     fprintf( stderr, "usage: %s \n", appName );
+
+    int maxWidth = 0;
     for ( ii = 0; ii < VSIZE(CmdInfoRecs); ++ii ) {
         const CmdInfoRec* rec = &CmdInfoRecs[ii];
-        fprintf( stderr, "    --%s %-20s # %s\n", rec->param,
-                 rec->hasArg? "<param>" : "", rec->hint );
+        int width = strlen(rec->param) + 1;
+        if ( rec->hasArg ) {
+            width += strlen(param) + 1;
+        }
+        if ( width > maxWidth ) {
+            maxWidth = width;
+        }
+    }
+
+    for ( ii = 0; ii < VSIZE(CmdInfoRecs); ++ii ) {
+        const CmdInfoRec* rec = &CmdInfoRecs[ii];
+        char buf[120];
+        snprintf( buf, sizeof(buf), "--%s %s", rec->param, 
+                 (rec->hasArg ? param : "") );
+        fprintf( stderr, "  %-*s # %s\n", maxWidth, buf, rec->hint );
     }
     fprintf( stderr, "\n(revision: %s)\n", SVN_REV);
     exit(1);