(libT) let tr_getopt() support short options' arguments to be embedded, such as ...

diff --git a/cli/cli.c b/cli/cli.c
index f2874b4119f5cbb886b9dfa0cde449372902c216..99851ea37364e24c54147dd2eed6c1b608e0c41f 100644 (file)
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -239,11 +239,11 @@ main( int argc, char ** argv )
         return EXIT_FAILURE;
     }
     if( peerPort < 1 || peerPort > 65535 ) {
-        printf( "Invalid port '%d'\n", peerPort );
+        printf( "Error: Port must between 1 and 65535; got %d\n", peerPort );
         return EXIT_FAILURE;
     }
     if( peerSocketTOS < 0 || peerSocketTOS > 255 ) {
-        printf( "Invalid TOS '%d'\n", peerSocketTOS );
+        printf( "Error: Port must between 0 and 255; got %d\n", peerSocketTOS );
         return EXIT_FAILURE;
     }
 
@@ -392,7 +392,7 @@ main( int argc, char ** argv )
 
         if( gotsig ) {
             gotsig = 0;
-            printf( "stopping torrent...\n" );
+            printf( "\nStopping torrent...\n" );
             tr_torrentStop( tor );
         }
         

diff --git a/libtransmission/tr-getopt.c b/libtransmission/tr-getopt.c
index fc394d3c2981e529de66602badd7865adcab2787..286547d89e8271a962020ba9e89fd8b15356a2a3 100644 (file)
--- a/libtransmission/tr-getopt.c
+++ b/libtransmission/tr-getopt.c
@@ -136,8 +136,9 @@ findOption( const tr_option   * opts,
                 return o;
             }
             len = strlen( o->shortName );
-            if( !memcmp( o->shortName, str+1, len ) && str[len+1]=='=' ) {
-                if( nested ) *nested = str+len+2;
+            if( !memcmp( o->shortName, str+1, len ) ) {
+                if( nested )
+                    *nested = str[len+1]=='=' ? str+len+2 : str+len+1;
                 return o;
             }
         }