-/*
- This modules is based on the params.c module from Samba, written by Karl Auer
- and much modifed by Christopher Hertel.
+/* This modules is based on the params.c module from Samba, written by Karl Auer
+ and much modifed by Christopher Hertel. */
+/*
* 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,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * -------------------------------------------------------------------------- **
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
+ */
+
+/* -------------------------------------------------------------------------- **
*
* Module name: params
*
*/
#include "rsync.h"
+#include "ifuncs.h"
/* -------------------------------------------------------------------------- **
* Constants...
*/
{
pos--;
- while( (pos >= 0) && isspace((int) line[pos]) )
+ while( pos >= 0 && isSpace(line + pos) )
pos--;
return( ((pos >= 0) && ('\\' == line[pos])) ? pos : -1 );
if( i > (bSize - 2) )
{
bSize += BUFR_INC;
- bufr = Realloc( bufr, bSize );
+ bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
- rprintf(FERROR, "%s Memory re-allocation failure.", func);
+ rprintf(FLOG, "%s Memory re-allocation failure.", func);
return( False );
}
}
bufr[end] = '\0';
if( 0 == end ) /* Don't allow an empty name. */
{
- rprintf(FERROR, "%s Empty section name in configuration file.\n", func );
+ rprintf(FLOG, "%s Empty section name in configuration file.\n", func );
return( False );
}
if( !sfunc( bufr ) ) /* Got a valid name. Deal with it. */
if( i < 0 )
{
bufr[end] = '\0';
- rprintf(FERROR, "%s Badly formed line in configuration file: %s\n",
+ rprintf(FLOG, "%s Badly formed line in configuration file: %s\n",
func, bufr );
return( False );
}
}
/* We arrive here if we've met the EOF before the closing bracket. */
- rprintf(FERROR, "%s Unexpected EOF in the configuration file: %s\n", func, bufr );
+ rprintf(FLOG, "%s Unexpected EOF in the configuration file: %s\n", func, bufr );
return( False );
} /* Section */
if( i > (bSize - 2) ) /* Ensure there's space for next char. */
{
bSize += BUFR_INC;
- bufr = Realloc( bufr, bSize );
+ bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
- rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
+ rprintf(FLOG, "%s Memory re-allocation failure.", func) ;
return( False );
}
}
case '=': /* Equal sign marks end of param name. */
if( 0 == end ) /* Don't allow an empty name. */
{
- rprintf(FERROR, "%s Invalid parameter name in config. file.\n", func );
+ rprintf(FLOG, "%s Invalid parameter name in config. file.\n", func );
return( False );
}
bufr[end++] = '\0'; /* Mark end of string & advance. */
if( i < 0 )
{
bufr[end] = '\0';
- rprintf(FERROR, "%s Ignoring badly formed line in configuration file: %s\n",
+ rprintf(FLOG, "%s Ignoring badly formed line in configuration file: %s\n",
func, bufr );
return( True );
}
case '\0': /* Shouldn't have EOF within param name. */
case EOF:
bufr[i] = '\0';
- rprintf(FERROR, "%s Unexpected end-of-file at: %s\n", func, bufr );
+ rprintf(FLOG, "%s Unexpected end-of-file at: %s\n", func, bufr );
return( True );
default:
if( i > (bSize - 2) ) /* Make sure there's enough room. */
{
bSize += BUFR_INC;
- bufr = Realloc( bufr, bSize );
+ bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
- rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
+ rprintf(FLOG, "%s Memory re-allocation failure.", func) ;
return( False );
}
}
c = 0;
else
{
- for( end = i; (end >= 0) && isspace((int) bufr[end]); end-- )
+ for( end = i; end >= 0 && isSpace(bufr + end); end-- )
;
c = getc( InFile );
}
if( NULL == FileName || 0 == *FileName )
{
- rprintf(FERROR,"%s No configuration filename specified.\n", func);
+ rprintf(FLOG, "%s No configuration filename specified.\n", func);
return( NULL );
}
OpenedFile = fopen( FileName, "r" );
if( NULL == OpenedFile )
{
- rprintf(FERROR,"%s Unable to open configuration file \"%s\":\n\t%s\n",
- func, FileName, strerror(errno));
+ rsyserr(FLOG, errno, "unable to open configuration file \"%s\"",
+ FileName);
}
return( OpenedFile );
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);
+ rprintf(FLOG, "%s memory allocation failure.\n", func);
fclose(InFile);
return( False );
}
if( !result ) /* Generic failure. */
{
- rprintf(FERROR,"%s Failed. Error returned from params.c:parse().\n", func);
+ rprintf(FLOG, "%s Failed. Error returned from params.c:parse().\n", func);
return( False );
}