Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use AC_SEARCH_LIBS() instead of AC_CHECK_LIB() to figure out if
[rsync/rsync.git]
/
params.c
diff --git
a/params.c
b/params.c
index
be01930
..
f48ed0f
100644
(file)
--- a/
params.c
+++ b/
params.c
@@
-74,10
+74,6
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
-#define BOOL int
-#define False 0
-#define True 1
-#define Realloc realloc
/* -------------------------------------------------------------------------- **
* Constants...
/* -------------------------------------------------------------------------- **
* Constants...
@@
-168,7
+164,7
@@
static int Continuation( char *line, int pos )
*/
{
pos--;
*/
{
pos--;
- while( (pos >= 0) && isspace(
line
[pos]) )
+ while( (pos >= 0) && isspace(
((unsigned char *)line)
[pos]) )
pos--;
return( ((pos >= 0) && ('\\' == line[pos])) ? pos : -1 );
pos--;
return( ((pos >= 0) && ('\\' == line[pos])) ? pos : -1 );
@@
-211,7
+207,7
@@
static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
if( i > (bSize - 2) )
{
bSize += BUFR_INC;
if( i > (bSize - 2) )
{
bSize += BUFR_INC;
- bufr =
Realloc( buf
r, bSize );
+ bufr =
realloc_array( bufr, cha
r, bSize );
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func);
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func);
@@
-305,7
+301,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
if( i > (bSize - 2) ) /* Ensure there's space for next char. */
{
bSize += BUFR_INC;
if( i > (bSize - 2) ) /* Ensure there's space for next char. */
{
bSize += BUFR_INC;
- bufr =
Realloc( buf
r, bSize );
+ bufr =
realloc_array( bufr, cha
r, bSize );
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
@@
-370,7
+366,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
if( i > (bSize - 2) ) /* Make sure there's enough room. */
{
bSize += BUFR_INC;
if( i > (bSize - 2) ) /* Make sure there's enough room. */
{
bSize += BUFR_INC;
- bufr =
Realloc( buf
r, bSize );
+ bufr =
realloc_array( bufr, cha
r, bSize );
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
@@
-390,7
+386,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
c = 0;
else
{
c = 0;
else
{
- for( end = i; (end >= 0) && isspace(
bufr
[end]); end-- )
+ for( end = i; (end >= 0) && isspace(
((unsigned char *) bufr)
[end]); end-- )
;
c = getc( InFile );
}
;
c = getc( InFile );
}
@@
-495,8
+491,8
@@
static FILE *OpenConfFile( char *FileName )
OpenedFile = fopen( FileName, "r" );
if( NULL == OpenedFile )
{
OpenedFile = fopen( FileName, "r" );
if( NULL == OpenedFile )
{
- r
printf(FERROR,"%s Unable to open configuration file \"%s\":\n\t%s\n
",
-
func, FileName, strerror(errno
));
+ r
syserr(FERROR, errno, "rsync: unable to open configuration file \"%s\"
",
+
safe_fname(FileName
));
}
return( OpenedFile );
}
return( OpenedFile );
@@
-534,7
+530,7
@@
BOOL pm_process( char *FileName,
else /* If we don't have a buffer */
{ /* allocate one, then parse, */
bSize = BUFR_INC; /* then free. */
else /* If we don't have a buffer */
{ /* allocate one, then parse, */
bSize = BUFR_INC; /* then free. */
- bufr =
(char *)malloc(
bSize );
+ bufr =
new_array( char,
bSize );
if( NULL == bufr )
{
rprintf(FERROR,"%s memory allocation failure.\n", func);
if( NULL == bufr )
{
rprintf(FERROR,"%s memory allocation failure.\n", func);