Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
61e1646
)
We now send all the option args to the pre-exec command.
author
Wayne Davison
<wayned@samba.org>
Thu, 12 Jan 2006 19:15:31 +0000
(19:15 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 12 Jan 2006 19:15:31 +0000
(19:15 +0000)
clientserver.c
patch
|
blob
|
blame
|
history
diff --git
a/clientserver.c
b/clientserver.c
index
c0ace0c
..
f3adfe9
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-59,8
+59,6
@@
int module_id = -1;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
-#define MAX_REQ_LEN (MAXPATHLEN + 255)
-
/**
* Run a client connected to an rsyncd. The alternative to this
* function for remote-shell connections is do_cmd().
/**
* Run a client connected to an rsyncd. The alternative to this
* function for remote-shell connections is do_cmd().
@@
-218,16
+216,19
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
return 0;
}
return 0;
}
-static char *finish_pre_exec(pid_t pid, int fd, char *request)
+static char *finish_pre_exec(pid_t pid, int fd, char *request,
+ int argc, char *argv[])
{
{
- int status = -1;
+ int
j,
status = -1;
if (request) {
if (request) {
- int len = strlen(request);
- if (len > MAX_REQ_LEN)
- len = MAX_REQ_LEN;
- write(fd, request, len);
+ write_buf(fd, request, strlen(request)+1);
+ for (j = 0; j < argc; j++)
+ write_buf(fd, argv[j], strlen(argv[j])+1);
}
}
+
+ write_byte(fd, 0);
+
close(fd);
if (wait_process(pid, &status, 0) < 0
close(fd);
if (wait_process(pid, &status, 0) < 0
@@
-240,6
+241,23
@@
static char *finish_pre_exec(pid_t pid, int fd, char *request)
return NULL;
}
return NULL;
}
+static int read_arg_from_pipe(int fd, char *buf, int limit)
+{
+ char *bp = buf, *eob = buf + limit - 1;
+
+ while (1) {
+ if (read(fd, bp, 1) != 1)
+ return -1;
+ if (*bp == '\0')
+ break;
+ if (bp < eob)
+ bp++;
+ }
+ *bp = '\0';
+
+ return bp - buf;
+}
+
static int rsync_module(int f_in, int f_out, int i)
{
int argc = 0;
static int rsync_module(int f_in, int f_out, int i)
{
int argc = 0;
@@
-423,18
+441,29
@@
static int rsync_module(int f_in, int f_out, int i)
return -1;
}
if (pre_exec_pid == 0) {
return -1;
}
if (pre_exec_pid == 0) {
- char buf[
MAX_REQ_LEN+1
];
- int len;
+ char buf[
BIGPATHBUFLEN
];
+ int
j,
len;
close(fds[1]);
set_blocking(fds[0]);
close(fds[1]);
set_blocking(fds[0]);
- len = read(fds[0], buf, MAX_REQ_LEN);
- close(fds[0]);
+ len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN);
if (len <= 0)
_exit(1);
if (len <= 0)
_exit(1);
- buf[len] = '\0';
if (asprintf(&p, "RSYNC_REQUEST=%s", buf) < 0)
out_of_memory("rsync_module");
putenv(p);
if (asprintf(&p, "RSYNC_REQUEST=%s", buf) < 0)
out_of_memory("rsync_module");
putenv(p);
+ for (j = 0; ; j++) {
+ len = read_arg_from_pipe(fds[0], buf,
+ BIGPATHBUFLEN);
+ if (len <= 0) {
+ if (!len)
+ break;
+ _exit(1);
+ }
+ if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) < 0)
+ out_of_memory("rsync_module");
+ putenv(p);
+ }
+ close(fds[0]);
close(STDIN_FILENO);
close(STDOUT_FILENO);
status = system(lp_prexfer_exec(i));
close(STDIN_FILENO);
close(STDOUT_FILENO);
status = system(lp_prexfer_exec(i));
@@
-565,7
+594,8
@@
static int rsync_module(int f_in, int f_out, int i)
case 1:
if (pre_exec_pid) {
err_msg = finish_pre_exec(pre_exec_pid,
case 1:
if (pre_exec_pid) {
err_msg = finish_pre_exec(pre_exec_pid,
- pre_exec_fd, p);
+ pre_exec_fd, p,
+ argc, argv);
pre_exec_pid = 0;
}
request = strdup(p);
pre_exec_pid = 0;
}
request = strdup(p);
@@
-578,8
+608,10
@@
static int rsync_module(int f_in, int f_out, int i)
}
}
}
}
- if (pre_exec_pid)
- err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request);
+ if (pre_exec_pid) {
+ err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request,
+ argc, argv);
+ }
verbose = 0; /* future verbosity is controlled by client options */
ret = parse_arguments(&argc, (const char ***) &argv, 0);
verbose = 0; /* future verbosity is controlled by client options */
ret = parse_arguments(&argc, (const char ***) &argv, 0);