Changeset 10705

Timestamp:

May 30, 2010, 9:38:02 PM (12 years ago)

Author:

charles

Message:

(trunk daemon) #3241 "transmission-remote doesn't return an error code" -- use better patch from rb07

File:

• trunk/daemon/remote.c (modified) (15 diffs)

trunk/daemon/remote.c

@@ -1691 +1691 @@
             {
                 case 'a': /* add torrent */
-                    if( tadd != 0 ) flush( host, port, &tadd );
-                    if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); flush( host, port, &tset ); }
+                    if( tadd != 0 ) status |= flush( host, port, &tadd );
+                    if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); status |= flush( host, port, &tset ); }
                     tadd = tr_new0( tr_benc, 1 );
                     tr_bencInitDict( tadd, 3 );
@@ -1713 +1713 @@
 
                 case 't': /* set current torrent */
-                    if( tadd != 0 ) flush( host, port, &tadd );
-                    if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); flush( host, port, &tset ); }
+                    if( tadd != 0 ) status |= flush( host, port, &tadd );
+                    if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); status |= flush( host, port, &tset ); }
                     tr_strlcpy( id, optarg, sizeof( id ) );
                     break;
@@ -1756 +1756 @@
             fields = tr_bencDictAddList( args, "fields", 0 );
 
-            if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); flush( host, port, &tset ); }
+            if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); status |= flush( host, port, &tset ); }
             
             switch( c )
@@ -1781 +1781 @@
             }
 
-            flush( host, port, &top );
+            status |= flush( host, port, &top );
         }
         else if( stepMode == MODE_SESSION_SET )
@@ -1976 +1976 @@
                 tr_bencDictAddBool( args, "move", FALSE );
                 addIdArg( args, id );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -1988 +1988 @@
                 tr_bencDictAddStr( top, "method", "session-get" );
                 tr_bencDictAddInt( top, "tag", TAG_SESSION );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2000 +2000 @@
                     tr_bencDictAddStr( top, "method", "torrent-start" );
                     addIdArg( tr_bencDictAddDict( top, ARGUMENTS, 1 ), id );
-                    flush( host, port, &top );
+                    status |= flush( host, port, &top );
                 }
                 break;
@@ -2013 +2013 @@
                     tr_bencDictAddStr( top, "method", "torrent-stop" );
                     addIdArg( tr_bencDictAddDict( top, ARGUMENTS, 1 ), id );
-                    flush( host, port, &top );
+                    status |= flush( host, port, &top );
                 }
                 break;
@@ -2034 +2034 @@
                 tr_bencInitDict( top, 1 );
                 tr_bencDictAddStr( top, "method", "blocklist-update" );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2043 +2043 @@
                 tr_bencDictAddStr( top, "method", "session-stats" );
                 tr_bencDictAddInt( top, "tag", TAG_STATS );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2052 +2052 @@
                 tr_bencDictAddStr( top, "method", "port-test" );
                 tr_bencDictAddInt( top, "tag", TAG_PORTTEST );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2058 +2058 @@
             {
                 tr_benc * top;
-                if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); flush( host, port, &tset ); }
+                if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); status |= flush( host, port, &tset ); }
                 top = tr_new0( tr_benc, 1 );
                 tr_bencInitDict( top, 2 );
                 tr_bencDictAddStr( top, "method", "torrent-verify" );
                 addIdArg( tr_bencDictAddDict( top, ARGUMENTS, 1 ), id );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2076 +2076 @@
                 tr_bencDictAddBool( args, "delete-local-data", c=='R' );
                 addIdArg( args, id );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2089 +2089 @@
                 tr_bencDictAddBool( args, "move", TRUE );
                 addIdArg( args, id );
-                flush( host, port, &top );
+                status |= flush( host, port, &top );
                 break;
             }
@@ -2101 +2101 @@
     }
 
-    if( tadd != 0 ) flush( host, port, &tadd );
-    if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); flush( host, port, &tset ); }
-    if( sset != 0 ) flush( host, port, &sset );
+    if( tadd != 0 ) status |= flush( host, port, &tadd );
+    if( tset != 0 ) { addIdArg( tr_bencDictFind( tset, ARGUMENTS ), id ); status |= flush( host, port, &tset ); }
+    if( sset != 0 ) status |= flush( host, port, &sset );
     return status;
 }