Changeset 7374

Timestamp:

Dec 14, 2008, 1:22:06 AM (12 years ago)

Author:

charles

Message:

(trunk daemon) added --dump option to dump the settings to stderr and exit.

Location:

trunk

Files:

• daemon/daemon.c (modified) (5 diffs)
• libtransmission/session.c (modified) (1 diff)

trunk/daemon/daemon.c

@@ -54 +54 @@
     { 'b', "blocklist", "Enable peer blocklists", "b", 0, NULL },
     { 'B', "no-blocklist", "Disable peer blocklists", "B", 0, NULL },
+    { 'd', "dump-settings", "Dump the settings and exit", "d", 0, NULL },
     { 'f', "foreground", "Run in the foreground instead of daemonizing", "f", 0, NULL },
     { 'g', "config-dir", "Where to look for configuration files", "g", 1, "<path>" },
@@ -181 +182 @@
 {
     int c;
+    int64_t i;
     const char * optarg;
     tr_benc settings;
     tr_bool foreground = FALSE;
+    tr_bool dumpSettings = FALSE;
     const char * configDir = NULL;
 
@@ -210 +213 @@
             case 'B': tr_bencDictAddInt( &settings, TR_PREFS_KEY_BLOCKLIST_ENABLED, 0 );
                       break;
+            case 'd': dumpSettings = TRUE;
+                      break;
             case 'f': foreground = TRUE;
                       break;
@@ -229 +234 @@
                       break;
         }
+    }
+
+    if( dumpSettings )
+    {
+        char * str = tr_bencSaveAsJSON( &settings, NULL );
+        fprintf( stderr, "%s", str );
+        tr_free( str );
+        return 0;
     }
 
@@ -245 +258 @@
     mySession = tr_sessionInit( "daemon", configDir, FALSE, &settings );
 
-    if( tr_bencDictFindInt( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, NULL ) )
+    if( tr_bencDictFindInt( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, &i ) && i!=0 )
         tr_ninf( MY_NAME, "requiring authentication" );
 

trunk/libtransmission/session.c

@@ -340 +340 @@
     }
 
-    tr_inf( "saved \"%s\"", filename );
+    tr_inf( "Saved \"%s\"", filename );
     tr_free( filename );
 }