Receiving an @ERROR line from the server is (I think) always fatal, so

[rsync/rsync.git] / params.c

diff --git a/params.c b/params.c
index b89d034..6d02053 100644 (file)
--- a/params.c
+++ b/params.c
@@ -74,10 +74,6 @@
  */
 
 #include "rsync.h"
-#define BOOL int
-#define False 0
-#define True 1
-#define Realloc realloc
 
 /* -------------------------------------------------------------------------- **
  * Constants...
@@ -168,7 +164,7 @@ static int Continuation( char *line, int pos )
    */
   {
   pos--;
-  while( (pos >= 0) && isspace(line[pos]) )
+  while( (pos >= 0) && isspace((int) line[pos]) )
      pos--;
 
   return( ((pos >= 0) && ('\\' == line[pos])) ? pos : -1 );
@@ -390,7 +386,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
           c = 0;
         else
           {
-          for( end = i; (end >= 0) && isspace(bufr[end]); end-- )
+          for( end = i; (end >= 0) && isspace((int) bufr[end]); end-- )
             ;
           c = getc( InFile );
           }
@@ -451,10 +447,11 @@ static BOOL Parse( FILE *InFile,
         break;
 
       case '[':                         /* Section Header. */
-        if( !Section( InFile, sfunc ) )
-          return( False );
-        c = EatWhitespace( InFile );
-        break;
+             if (!sfunc) return True;
+             if( !Section( InFile, sfunc ) )
+                     return( False );
+             c = EatWhitespace( InFile );
+             break;
 
       case '\\':                        /* Bogus backslash. */
         c = EatWhitespace( InFile );
@@ -558,3 +555,4 @@ BOOL pm_process( char *FileName,
   } /* pm_process */
 
 /* -------------------------------------------------------------------------- */
+