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
Don't force the user to start from the master branch when any
[rsync/rsync.git]
/
params.c
diff --git
a/params.c
b/params.c
index
e543cd7
..
7610ac7
100644
(file)
--- a/
params.c
+++ b/
params.c
@@
-4,7
+4,7
@@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version
2
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-13,8
+13,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
/* -------------------------------------------------------------------------- **
*/
/* -------------------------------------------------------------------------- **
@@
-75,6
+74,7
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "ifuncs.h"
/* -------------------------------------------------------------------------- **
* Constants...
/* -------------------------------------------------------------------------- **
* Constants...
@@
-211,7
+211,7
@@
static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
- rprintf(F
ERROR
, "%s Memory re-allocation failure.", func);
+ rprintf(F
LOG
, "%s Memory re-allocation failure.", func);
return( False );
}
}
return( False );
}
}
@@
-223,7
+223,7
@@
static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
bufr[end] = '\0';
if( 0 == end ) /* Don't allow an empty name. */
{
bufr[end] = '\0';
if( 0 == end ) /* Don't allow an empty name. */
{
- rprintf(F
ERROR
, "%s Empty section name in configuration file.\n", func );
+ rprintf(F
LOG
, "%s Empty section name in configuration file.\n", func );
return( False );
}
if( !sfunc( bufr ) ) /* Got a valid name. Deal with it. */
return( False );
}
if( !sfunc( bufr ) ) /* Got a valid name. Deal with it. */
@@
-236,7
+236,7
@@
static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
if( i < 0 )
{
bufr[end] = '\0';
if( i < 0 )
{
bufr[end] = '\0';
- rprintf(F
ERROR
, "%s Badly formed line in configuration file: %s\n",
+ rprintf(F
LOG
, "%s Badly formed line in configuration file: %s\n",
func, bufr );
return( False );
}
func, bufr );
return( False );
}
@@
-261,7
+261,7
@@
static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
}
/* We arrive here if we've met the EOF before the closing bracket. */
}
/* We arrive here if we've met the EOF before the closing bracket. */
- rprintf(F
ERROR
, "%s Unexpected EOF in the configuration file: %s\n", func, bufr );
+ rprintf(F
LOG
, "%s Unexpected EOF in the configuration file: %s\n", func, bufr );
return( False );
} /* Section */
return( False );
} /* Section */
@@
-305,7
+305,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
- rprintf(F
ERROR
, "%s Memory re-allocation failure.", func) ;
+ rprintf(F
LOG
, "%s Memory re-allocation failure.", func) ;
return( False );
}
}
return( False );
}
}
@@
-315,7
+315,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
case '=': /* Equal sign marks end of param name. */
if( 0 == end ) /* Don't allow an empty name. */
{
case '=': /* Equal sign marks end of param name. */
if( 0 == end ) /* Don't allow an empty name. */
{
- rprintf(F
ERROR
, "%s Invalid parameter name in config. file.\n", func );
+ rprintf(F
LOG
, "%s Invalid parameter name in config. file.\n", func );
return( False );
}
bufr[end++] = '\0'; /* Mark end of string & advance. */
return( False );
}
bufr[end++] = '\0'; /* Mark end of string & advance. */
@@
-329,7
+329,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
if( i < 0 )
{
bufr[end] = '\0';
if( i < 0 )
{
bufr[end] = '\0';
- rprintf(F
ERROR
, "%s Ignoring badly formed line in configuration file: %s\n",
+ rprintf(F
LOG
, "%s Ignoring badly formed line in configuration file: %s\n",
func, bufr );
return( True );
}
func, bufr );
return( True );
}
@@
-340,7
+340,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
case '\0': /* Shouldn't have EOF within param name. */
case EOF:
bufr[i] = '\0';
case '\0': /* Shouldn't have EOF within param name. */
case EOF:
bufr[i] = '\0';
- rprintf(F
ERROR
, "%s Unexpected end-of-file at: %s\n", func, bufr );
+ rprintf(F
LOG
, "%s Unexpected end-of-file at: %s\n", func, bufr );
return( True );
default:
return( True );
default:
@@
-370,7
+370,7
@@
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
- rprintf(F
ERROR
, "%s Memory re-allocation failure.", func) ;
+ rprintf(F
LOG
, "%s Memory re-allocation failure.", func) ;
return( False );
}
}
return( False );
}
}
@@
-485,14
+485,14
@@
static FILE *OpenConfFile( char *FileName )
if( NULL == FileName || 0 == *FileName )
{
if( NULL == FileName || 0 == *FileName )
{
- rprintf(F
ERROR,
"%s No configuration filename specified.\n", func);
+ rprintf(F
LOG,
"%s No configuration filename specified.\n", func);
return( NULL );
}
OpenedFile = fopen( FileName, "r" );
if( NULL == OpenedFile )
{
return( NULL );
}
OpenedFile = fopen( FileName, "r" );
if( NULL == OpenedFile )
{
- rsyserr(F
ERROR
, errno, "unable to open configuration file \"%s\"",
+ rsyserr(F
LOG
, errno, "unable to open configuration file \"%s\"",
FileName);
}
FileName);
}
@@
-534,7
+534,7
@@
BOOL pm_process( char *FileName,
bufr = new_array( char, bSize );
if( NULL == bufr )
{
bufr = new_array( char, bSize );
if( NULL == bufr )
{
- rprintf(F
ERROR,
"%s memory allocation failure.\n", func);
+ rprintf(F
LOG,
"%s memory allocation failure.\n", func);
fclose(InFile);
return( False );
}
fclose(InFile);
return( False );
}
@@
-548,7
+548,7
@@
BOOL pm_process( char *FileName,
if( !result ) /* Generic failure. */
{
if( !result ) /* Generic failure. */
{
- rprintf(F
ERROR,
"%s Failed. Error returned from params.c:parse().\n", func);
+ rprintf(F
LOG,
"%s Failed. Error returned from params.c:parse().\n", func);
return( False );
}
return( False );
}