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 RSYNC_RSH_IO_ENV.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
25cd106
..
f1c2d09
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-241,8
+241,15
@@
static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
args[argc++] = rsync_path;
args[argc++] = rsync_path;
- if ((blocking_io == -1) && (strcmp(cmd, RSYNC_RSH) == 0))
- blocking_io = 1;
+ if (blocking_io == -1) {
+ char *cp = strrchr(cmd, '/');
+ if (cp)
+ cp++;
+ else
+ cp = cmd;
+ if (strcmp(cp, "rsh") == 0 || strcmp(cp, "remsh") == 0)
+ blocking_io = 1;
+ }
server_options(args,&argc);
server_options(args,&argc);
@@
-298,8
+305,8
@@
static char *get_local_name(struct file_list *flist,char *name)
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name, 0)) {
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name, 0)) {
- rprintf(FERROR,
"push_dir %s
: %s (1)\n",
-
name,
strerror(errno));
+ rprintf(FERROR,
"push_dir %s failed
: %s (1)\n",
+
full_fname(name),
strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
return NULL;
exit_cleanup(RERR_FILESELECT);
}
return NULL;
@@
-315,8
+322,8
@@
static char *get_local_name(struct file_list *flist,char *name)
return name;
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
return name;
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
- rprintf(FERROR,
RSYNC_NAME ": mkdir %s
: %s\n",
-
name
, strerror(errno));
+ rprintf(FERROR,
"mkdir %s failed
: %s\n",
+
full_fname(name)
, strerror(errno));
exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
@@
-324,8
+331,8
@@
static char *get_local_name(struct file_list *flist,char *name)
}
if (!push_dir(name, 0)) {
}
if (!push_dir(name, 0)) {
- rprintf(FERROR,
RSYNC_NAME ": push_dir %s: %s
\n",
-
name
, strerror(errno));
+ rprintf(FERROR,
"push_dir %s failed: %s (2)
\n",
+
full_fname(name)
, strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
exit_cleanup(RERR_FILESELECT);
}
@@
-347,7
+354,8
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
if (!relative_paths && !push_dir(dir, 0)) {
rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
if (!relative_paths && !push_dir(dir, 0)) {
- rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno));
+ rprintf(FERROR, "push_dir %s failed: %s (3)\n",
+ full_fname(dir), strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
argc--;
exit_cleanup(RERR_FILESELECT);
}
argc--;
@@
-494,8
+502,8
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
argc--;
argv++;
if (!am_daemon && !push_dir(dir, 0)) {
argc--;
argv++;
if (!am_daemon && !push_dir(dir, 0)) {
- rprintf(FERROR,
"push_dir %s
: %s (4)\n",
-
dir,
strerror(errno));
+ rprintf(FERROR,
"push_dir %s failed
: %s (4)\n",
+
full_fname(dir),
strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
}
exit_cleanup(RERR_FILESELECT);
}
}