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
Fix a typo that Andrea Gelmini pointed out.
[rsync/rsync.git]
/
pipe.c
diff --git
a/pipe.c
b/pipe.c
index
5f79ede
..
a33117c
100644
(file)
--- a/
pipe.c
+++ b/
pipe.c
@@
-4,7
+4,7
@@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004-200
8
Wayne Davison
+ * Copyright (C) 2004-200
9
Wayne Davison
*
* 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
@@
-26,8
+26,11
@@
extern int am_sender;
extern int am_server;
extern int blocking_io;
extern int filesfrom_fd;
extern int am_server;
extern int blocking_io;
extern int filesfrom_fd;
+extern int munge_symlinks;
extern mode_t orig_umask;
extern char *logfile_name;
extern mode_t orig_umask;
extern char *logfile_name;
+extern int remote_option_cnt;
+extern const char **remote_options;
extern struct chmod_mode_struct *chmod_modes;
/**
extern struct chmod_mode_struct *chmod_modes;
/**
@@
-49,7
+52,7
@@
pid_t piped_child(char **command, int *f_in, int *f_out)
int to_child_pipe[2];
int from_child_pipe[2];
int to_child_pipe[2];
int from_child_pipe[2];
- if (
verbose >= 2
)
+ if (
DEBUG_GTE(CMD, 1)
)
print_child_argv("opening connection using:", command);
if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
print_child_argv("opening connection using:", command);
if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
@@
-131,6
+134,7
@@
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
am_sender = 0;
am_server = 1;
filesfrom_fd = -1;
am_sender = 0;
am_server = 1;
filesfrom_fd = -1;
+ munge_symlinks = 0; /* Each side needs its own option. */
chmod_modes = NULL; /* Let the sending side handle this. */
/* Let the client side handle this. */
chmod_modes = NULL; /* Let the sending side handle this. */
/* Let the client side handle this. */
@@
-139,6
+143,15
@@
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
logfile_close();
}
logfile_close();
}
+ if (remote_option_cnt) {
+ int rc = remote_option_cnt + 1;
+ const char **rv = remote_options;
+ if (!parse_arguments(&rc, &rv)) {
+ option_error();
+ exit_cleanup(RERR_SYNTAX);
+ }
+ }
+
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||