X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0b76cd63ee0eacb95285dfb5d2cac2992e1794ef..3e8369b6dc77c2b14e9d744b4ed9cb6109bbe3c0:/params.c diff --git a/params.c b/params.c index b89d034c..6d02053e 100644 --- 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 */ /* -------------------------------------------------------------------------- */ +