Changeset 6306

Timestamp:

Jul 9, 2008, 3:31:35 PM (15 years ago)

Author:

charles

Message:

code cleanup

Location:

trunk

Files:

• cli/cli.c (modified) (9 diffs)
• libtransmission/tr-getopt.c (modified) (7 diffs)
• libtransmission/tr-getopt.h (modified) (2 diffs)

trunk/cli/cli.c

@@ -55 +55 @@
 static sig_atomic_t  manualUpdate     = 0;
 
-static const char   * torrentPath   = NULL;
-static const char   * downloadDir   = NULL;
+static const char   * torrentPath  = NULL;
+static const char   * downloadDir  = NULL;
 static const char   * finishCall   = NULL;
 static const char   * announce     = NULL;
@@ -166 +166 @@
                   inf->pieceSize, inf->totalSize % inf->pieceSize );
 
-    if( inf->comment[0] )
+    if( inf->comment && *inf->comment )
         fprintf( out, "comment:\t%s\n", inf->comment );
-    if( inf->creator[0] )
+    if( inf->creator && *inf->creator )
         fprintf( out, "creator:\t%s\n", inf->creator );
     if( inf->isPrivate )
@@ -175 +175 @@
     fprintf( out, "file(s):\n" );
     for( ff=0; ff<inf->fileCount; ++ff )
-        fprintf( out, "\t%s (%"PRIu64")\n", inf->files[ff].name, inf->files[ff].length );
+        fprintf( out, "\t%s (%"PRIu64")\n", inf->files[ff].name,
+                                            inf->files[ff].length );
 }
 
@@ -214 +215 @@
                   st->rateUpload, ratioStr );
     }
-    else if( st->status & TR_STATUS_STOPPED )
-    {
-        *buf = '\0';
-    }
+    else *buf = '\0';
 }
 
@@ -297 +295 @@
     {
         int err;
-        tr_metainfo_builder * builder = tr_metaInfoBuilderCreate( h, sourceFile );
+        tr_metainfo_builder * b = tr_metaInfoBuilderCreate( h, sourceFile );
         tr_tracker_info ti;
         ti.tier = 0;
         ti.announce = (char*) announce;
-        tr_makeMetaInfo( builder, torrentPath, &ti, 1, comment, isPrivate );
-        while( !builder->isDone ) {
+        tr_makeMetaInfo( b, torrentPath, &ti, 1, comment, isPrivate );
+        while( !b->isDone ) {
             tr_wait( 1000 );
             printf( "." );
         }
-        err = builder->result;
-        tr_metaInfoBuilderFree( builder );
+        err = b->result;
+        tr_metaInfoBuilderFree( b );
         return err;
     }
@@ -339 +337 @@
                     ++leftToScrape;
                     tr_webRun( h, url, NULL, scrapeDoneFunc, host );
+                    tr_free( host );
                     tr_free( url );
                 }
@@ -394 +393 @@
         if( gotsig ) {
             gotsig = 0;
-fprintf( stderr, "stopping torrent...\n" );
+            printf( "stopping torrent...\n" );
             tr_torrentStop( tor );
         }
@@ -401 +400 @@
             manualUpdate = 0;
             if ( !tr_torrentCanManualUpdate( tor ) )
-                fprintf( stderr, "\rReceived SIGHUP, but can't send a manual update now\n" );
+                fprintf( stderr, "\nReceived SIGHUP, but can't send a manual update now\n" );
             else {
-                fprintf( stderr, "\rReceived SIGHUP: manual update scheduled\n" );
+                fprintf( stderr, "\nReceived SIGHUP: manual update scheduled\n" );
                 tr_torrentManualUpdate( tor );
             }
@@ -413 +412 @@
 
         getStatusStr( st, line, sizeof( line ) );
-        printf( "%-*s\n", LINEWIDTH, line );
+        printf( "\r%-*s", LINEWIDTH, line );
         if( st->error )
-            printf( "%s\n", st->errorString );
+            printf( "\n%s\n", st->errorString );
     }
 

trunk/libtransmission/tr-getopt.c

@@ -2 +2 @@
  * This file Copyright (C) 2008 Charles Kerr <charles@rebelbase.com>
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
- * so that the bulk of its code can remain under the MIT license. 
- * This exemption does not extend to derived works not owned by
- * the Transmission project.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * $Id:$
@@ -21 +33 @@
 #endif
 
-int option_index = 1;
+int tr_optind = 1;
 
 static const char*
 getArgName( const tr_option * opt )
 {
-    if( !opt->has_arg )   return "";
-    if( opt->argName ) return opt->argName;
-    return "<args>";
+    char * arg;
+
+    if( !opt->has_arg )
+        arg = "";
+    else if( opt->argName )
+        arg = opt->argName;
+    else
+        arg = "<args>";
+
+    return arg;
 }
 
@@ -44 +63 @@
 }
 
+static void
+maxWidth( const struct tr_option * o,
+          int * longWidth, int * shortWidth, int * argWidth )
+{
+    const char * arg;
+
+    if( o->longName ) 
+        *longWidth = MAX( *longWidth, (int)strlen( o->longName ) );
+
+    if( o->shortName )
+        *shortWidth = MAX( *shortWidth, (int)strlen( o->shortName ) );
+
+    if(( arg = getArgName( o )))
+        *argWidth = MAX( *argWidth, (int)strlen( arg ) );
+}
+
 void
-tr_getopt_usage( const char             * progName,
-                 const char             * description,
+tr_getopt_usage( const char              * progName,
+                 const char              * description,
                  const struct tr_option    opts[] )
 {
-  int count;
-  int longWidth = 0;
-  int shortWidth = 0;
-  int argWidth = 0;
-  struct tr_option help;
-
-  for( count=0; opts[count].description; ++count )
-  {
-    const char * arg;
-
-    if( opts[count].longName ) 
-      longWidth = MAX( longWidth, (int)strlen( opts[count].longName ) );
-
-    if( opts[count].shortName )
-      shortWidth = MAX( shortWidth, (int)strlen( opts[count].shortName ) );
-
-    if(( arg = getArgName( &opts[count] )))
-      argWidth = MAX( argWidth, (int)strlen( arg ) );
-  }
-
-  if( !description )
-    description = "Usage: %s [options]";
-  printf( description, progName );
-  printf( "\n\n" );
-  printf( "Options:\n" );
-
-  help.val = -1;
-  help.longName = "help";
-  help.description = "Display this help page and exit";
-  help.shortName = "h";
-  help.has_arg = 0;
-  getopts_usage_line( &help, longWidth, shortWidth, argWidth );
-  
-  for( count=0; opts[count].description; ++count )
-      getopts_usage_line( &opts[count], longWidth, shortWidth, argWidth );
+    int longWidth = 0;
+    int shortWidth = 0;
+    int argWidth = 0;
+    struct tr_option help;
+    const struct tr_option * o;
+
+    for( o=opts; o->val; ++o )
+        maxWidth( o, &longWidth, &shortWidth, &argWidth );
+
+    help.val = -1;
+    help.longName = "help";
+    help.description = "Display this help page and exit";
+    help.shortName = "h";
+    help.has_arg = 0;
+    maxWidth( &help, &longWidth, &shortWidth, &argWidth );
+
+    if( description == NULL )
+        description = "Usage: %s [options]";
+    printf( description, progName );
+    printf( "\n\nOptions:\n" );
+    getopts_usage_line( &help, longWidth, shortWidth, argWidth );
+    for( o=opts; o->val; ++o )
+        getopts_usage_line( o, longWidth, shortWidth, argWidth );
 }
 
@@ -123 +146 @@
     return NULL;
 }
-
-static void
-showUsageAndExit( const char        * appName,
-                  const char        * description,
-                  const tr_option   * opts )
-{
-    tr_getopt_usage( appName, description, opts );
-    exit( 0 );
-}
-
 
 int
@@ -146 +159 @@
 
     *setme_optarg = NULL;  
-
-    if( argc==1 || argc==option_index )
-        return TR_OPT_DONE;
   
     /* handle the builtin 'help' option */
-    for( i=1; i<argc; ++i )
-        if( !strcmp(argv[i], "-h") || !strcmp(argv[i], "--help" ) )
-            showUsageAndExit( argv[0], usage, opts );
-
-    /* out of options */
-    if( option_index >= argc )
+    for( i=1; i<argc; ++i ) {
+        if( !strcmp(argv[i], "-h") || !strcmp(argv[i], "--help" ) ) {
+            tr_getopt_usage( argv[0], usage, opts );
+            exit( 0 );
+        }
+    }
+
+    /* out of options? */
+    if( argc==1 || tr_optind>=argc )
         return TR_OPT_DONE;
 
-    o = findOption( opts, argv[option_index], &nest );
+    o = findOption( opts, argv[tr_optind], &nest );
     if( !o ) {
         /* let the user know we got an unknown option... */
-        *setme_optarg = argv[option_index++];
+        *setme_optarg = argv[tr_optind++];
         return TR_OPT_UNK;
     }
@@ -171 +184 @@
             return TR_OPT_ERR;
         *setme_optarg = NULL;
-        option_index++;
+        tr_optind++;
         return o->val;
     }
@@ -178 +191 @@
     if( nest ) {
         *setme_optarg = nest;
-        option_index++;
+        tr_optind++;
         return o->val;
     }
 
     /* throw an error if the option needed an argument but didn't get one */
-    if( ++option_index >= argc )
+    if( ++tr_optind >= argc )
         return TR_OPT_ERR;
-    if( findOption( opts, argv[option_index], NULL ))
+    if( findOption( opts, argv[tr_optind], NULL ))
         return TR_OPT_ERR;
 
-    *setme_optarg = argv[option_index++];
+    *setme_optarg = argv[tr_optind++];
     return o->val;
 }

trunk/libtransmission/tr-getopt.h

@@ -2 +2 @@
  * This file Copyright (C) 2008 Charles Kerr <charles@rebelbase.com>
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
- * so that the bulk of its code can remain under the MIT license. 
- * This exemption does not extend to derived works not owned by
- * the Transmission project.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * $Id:$
@@ -42 +54 @@
 /**
  * @return TR_GETOPT_DONE, TR_GETOPT_ERR, TR_GETOPT_UNK,
- *         or the matching tr_option's `value' field
+ *         or the matching tr_option's `val' field
  */
 int tr_getopt( const char        * summary,