-/*
- 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...
static char *bufr = NULL;
static int bSize = 0;
+static BOOL (*the_sfunc)(char *);
+static BOOL (*the_pfunc)(char *, char *);
/* -------------------------------------------------------------------------- **
* Functions...
*/
{
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 );
}
return( pfunc( bufr, &bufr[vstart] ) ); /* Pass name & value to pfunc(). */
} /* Parameter */
-static BOOL Parse( FILE *InFile,
+static int name_cmp(const void *n1, const void *n2)
+{
+ return strcmp(*(char * const *)n1, *(char * const *)n2);
+}
+
+static int include_config(char *include, int manage_globals)
+{
+ item_list conf_list;
+ struct dirent *di;
+ char buf[MAXPATHLEN], **bpp;
+ int ret = 1;
+ size_t j;
+ DIR *d;
+
+ memset(&conf_list, 0, sizeof conf_list);
+
+ if ((d = opendir(include)) != NULL) {
+ while ((di = readdir(d)) != NULL) {
+ char *dname = d_name(di);
+ if (!wildmatch("*.conf", dname))
+ continue;
+ bpp = EXPAND_ITEM_LIST(&conf_list, char *, 32);
+ pathjoin(buf, sizeof buf, include, dname);
+ *bpp = strdup(buf);
+ }
+ closedir(d);
+ } else {
+ STRUCT_STAT sb;
+ if (stat(include, &sb) < 0)
+ return 0;
+ bpp = EXPAND_ITEM_LIST(&conf_list, char *, 1);
+ *bpp = strdup(include);
+ }
+
+ if (conf_list.count > 1)
+ qsort(conf_list.items, conf_list.count, sizeof (char *), name_cmp);
+
+ bpp = conf_list.items;
+ for (j = 0; j < conf_list.count; j++) {
+ if (manage_globals && the_sfunc)
+ the_sfunc(j == 0 ? "]push" : "]reset");
+ if ((ret = pm_process(bpp[j], the_sfunc, the_pfunc)) != 1)
+ break;
+ }
+
+ if (manage_globals && the_sfunc && conf_list.count)
+ the_sfunc("]pop");
+
+ for (j = 0; j < conf_list.count; j++)
+ free(bpp[j]);
+
+ return ret;
+}
+
+static int parse_directives(char *name, char *val)
+{
+ if (strcasecmp(name, "include") == 0)
+ return include_config(val, 1);
+ if (strcasecmp(name, "merge") == 0)
+ return include_config(val, 0);
+ rprintf(FLOG, "Unknown directive: &%s.\n", name);
+ return 0;
+}
+
+static int Parse( FILE *InFile,
BOOL (*sfunc)(char *),
BOOL (*pfunc)(char *, char *) )
/* ------------------------------------------------------------------------ **
* pfunc - Function to be called when a parameter is scanned.
* See Parameter().
*
- * Output: True if the file was successfully scanned, else False.
+ * Output: 1 if the file was successfully scanned, 2 if the file was
+ * scanned until a section header with no section function, else 0.
*
* Notes: The input can be viewed in terms of 'lines'. There are four
* types of lines:
* The remainder of the line is ignored.
* Section - First non-whitespace character is a '['.
* Parameter - The default case.
- *
+ *
* ------------------------------------------------------------------------ **
*/
{
break;
case '[': /* Section Header. */
- if (!sfunc) return True;
- if( !Section( InFile, sfunc ) )
- return( False );
- c = EatWhitespace( InFile );
- break;
+ if (!sfunc)
+ return 2;
+ if( !Section( InFile, sfunc ) )
+ return 0;
+ c = EatWhitespace( InFile );
+ break;
case '\\': /* Bogus backslash. */
c = EatWhitespace( InFile );
break;
+ case '&': /* Handle directives */
+ the_sfunc = sfunc;
+ the_pfunc = pfunc;
+ c = EatWhitespace( InFile );
+ c = Parameter( InFile, parse_directives, c );
+ if (c != 1)
+ return c;
+ c = EatWhitespace( InFile );
+ break;
+
default: /* Parameter line. */
if( !Parameter( InFile, pfunc, c ) )
- return( False );
+ return 0;
c = EatWhitespace( InFile );
break;
}
}
- return( True );
+ return 1;
} /* Parse */
static FILE *OpenConfFile( char *FileName )
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 );
} /* OpenConfFile */
-BOOL pm_process( char *FileName,
+int pm_process( char *FileName,
BOOL (*sfunc)(char *),
BOOL (*pfunc)(char *, char *) )
/* ------------------------------------------------------------------------ **
* pfunc - A pointer to a function that will be called when
* a parameter name and value are discovered.
*
- * Output: TRUE if the file was successfully parsed, else FALSE.
+ * Output: 1 if the file was successfully parsed, 2 if parsing ended at a
+ * section header w/o a section function, else 0.
*
* ------------------------------------------------------------------------ **
*/
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);
- return( False );
+ rprintf(FLOG, "%s Failed. Error returned from params.c:parse().\n", func);
+ return 0;
}
- return( True ); /* Generic success. */
+ return result;
} /* pm_process */
/* -------------------------------------------------------------------------- */
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff