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
Added solaris IPv6 checking to configure. Fixes #6438.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
75e9a2f
..
8c2307a
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-82,7
+82,7
@@
extern char curr_dir[MAXPATHLEN];
extern char backup_dir_buf[MAXPATHLEN];
extern char *basis_dir[MAX_BASIS_DIRS+1];
extern struct file_list *first_flist;
extern char backup_dir_buf[MAXPATHLEN];
extern char *basis_dir[MAX_BASIS_DIRS+1];
extern struct file_list *first_flist;
-extern
struct filter_list_struc
t daemon_filter_list;
+extern
filter_rule_lis
t daemon_filter_list;
uid_t our_uid;
int am_generator = 0;
uid_t our_uid;
int am_generator = 0;
@@
-825,10
+825,8
@@
static int do_recv(int f_in, int f_out, char *local_name)
exit_cleanup(RERR_SYNTAX);
if (ret)
rprintf(FINFO, "Created backup_dir %s\n", backup_dir_buf);
exit_cleanup(RERR_SYNTAX);
if (ret)
rprintf(FINFO, "Created backup_dir %s\n", backup_dir_buf);
- else if (INFO_GTE(BACKUP, 1)) {
- char *dir = *backup_dir_buf ? backup_dir_buf : ".";
- rprintf(FINFO, "backup_dir is %s\n", dir);
- }
+ else if (INFO_GTE(BACKUP, 1))
+ rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
}
io_flush(NORMAL_FLUSH);
}
io_flush(NORMAL_FLUSH);
@@
-1002,7
+1000,7
@@
static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
if (daemon_filter_list.head) {
char **dir_p;
if (daemon_filter_list.head) {
char **dir_p;
-
struct filter_list_struc
t *elp = &daemon_filter_list;
+
filter_rule_lis
t *elp = &daemon_filter_list;
for (dir_p = basis_dir; *dir_p; dir_p++) {
char *dir = *dir_p;
for (dir_p = basis_dir; *dir_p; dir_p++) {
char *dir = *dir_p;