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 a union for idlist's name/max_id value. Fixes bug 8137.
[rsync/rsync.git]
/
params.c
diff --git
a/params.c
b/params.c
index
aa79953
..
0fbd986
100644
(file)
--- a/
params.c
+++ b/
params.c
@@
-75,6
+75,7
@@
#include "rsync.h"
#include "ifuncs.h"
#include "rsync.h"
#include "ifuncs.h"
+#include "itypes.h"
/* -------------------------------------------------------------------------- **
* Constants...
/* -------------------------------------------------------------------------- **
* Constants...
@@
-427,6
+428,7
@@
static int name_cmp(const void *n1, const void *n2)
static int include_config(char *include, int manage_globals)
{
STRUCT_STAT sb;
static int include_config(char *include, int manage_globals)
{
STRUCT_STAT sb;
+ char *match = manage_globals ? "*.conf" : "*.inc";
int ret;
if (do_stat(include, &sb) < 0) {
int ret;
if (do_stat(include, &sb) < 0) {
@@
-456,7
+458,7
@@
static int include_config(char *include, int manage_globals)
while ((di = readdir(d)) != NULL) {
char *dname = d_name(di);
while ((di = readdir(d)) != NULL) {
char *dname = d_name(di);
- if (!wildmatch(
"*.conf"
, dname))
+ if (!wildmatch(
match
, dname))
continue;
bpp = EXPAND_ITEM_LIST(&conf_list, char *, 32);
pathjoin(buf, sizeof buf, include, dname);
continue;
bpp = EXPAND_ITEM_LIST(&conf_list, char *, 32);
pathjoin(buf, sizeof buf, include, dname);