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
Build & run mkrounding to make the rounding.h file used by flist.c.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
1cb6a09
..
b777125
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-110,7
+110,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
return ret ? ret : client_run(fd, fd, -1, argc, argv);
}
return ret ? ret : client_run(fd, fd, -1, argc, argv);
}
-int start_inband_exchange(char *user, char *path, int f_in, int f_out,
+int start_inband_exchange(c
onst c
har *user, char *path, int f_in, int f_out,
int argc)
{
int i;
int argc)
{
int i;
@@
-244,7
+244,9
@@
static char *finish_pre_exec(pid_t pid, int fd, char *request,
if (wait_process(pid, &status, 0) < 0
|| !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
char *e;
if (wait_process(pid, &status, 0) < 0
|| !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
char *e;
- if (asprintf(&e, "pre-xfer exec returned failure (%d)\n", status) < 0)
+ if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n",
+ status, status < 0 ? ": " : "",
+ status < 0 ? strerror(errno) : "") < 0)
out_of_memory("finish_pre_exec");
return e;
}
out_of_memory("finish_pre_exec");
return e;
}
@@
-340,7
+342,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
if (am_root) {
p = lp_uid(i);
if (!name_to_uid(p, &uid)) {
if (am_root) {
p = lp_uid(i);
if (!name_to_uid(p, &uid)) {
- if (!is
digit(*(unsigned char *)
p)) {
+ if (!is
Digit(
p)) {
rprintf(FLOG, "Invalid uid %s\n", p);
io_printf(f_out, "@ERROR: invalid uid %s\n", p);
return -1;
rprintf(FLOG, "Invalid uid %s\n", p);
io_printf(f_out, "@ERROR: invalid uid %s\n", p);
return -1;
@@
-350,7
+352,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
p = lp_gid(i);
if (!name_to_gid(p, &gid)) {
p = lp_gid(i);
if (!name_to_gid(p, &gid)) {
- if (!is
digit(*(unsigned char *)
p)) {
+ if (!is
Digit(
p)) {
rprintf(FLOG, "Invalid gid %s\n", p);
io_printf(f_out, "@ERROR: invalid gid %s\n", p);
return -1;
rprintf(FLOG, "Invalid gid %s\n", p);
io_printf(f_out, "@ERROR: invalid gid %s\n", p);
return -1;
@@
-678,7
+680,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
if (!ret || err_msg) {
if (err_msg)
if (!ret || err_msg) {
if (err_msg)
- r
printf(FERROR, err_msg
);
+ r
write(FERROR, err_msg, strlen(err_msg)
);
else
option_error();
msleep(400);
else
option_error();
msleep(400);