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
Changed RERR_CRASH to RERR_CRASHED.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
4cc1d3c
..
c6bf54d
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-46,11
+46,8
@@
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
-extern int fuzzy_basis;
extern int relative_paths;
extern int rsync_port;
extern int relative_paths;
extern int rsync_port;
-extern int inplace;
-extern int make_backups;
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int whole_file;
extern int read_batch;
extern int write_batch;
@@
-60,8
+57,6
@@
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
-extern char *partial_dir;
-extern char *basis_dir[];
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
@@
-175,7
+170,7
@@
static void handle_stats(int f)
stats.flist_buildtime = read_longint(f);
stats.flist_xfertime = read_longint(f);
}
stats.flist_buildtime = read_longint(f);
stats.flist_xfertime = read_longint(f);
}
- } else if (write_batch
&& !am_server
) {
+ } else if (write_batch) {
/* The --read-batch process is going to be a client
* receiver, so we need to give it the stats. */
write_longint(batch_fd, total_read);
/* The --read-batch process is going to be a client
* receiver, so we need to give it the stats. */
write_longint(batch_fd, total_read);
@@
-186,7
+181,10
@@
static void handle_stats(int f)
write_longint(batch_fd, stats.flist_xfertime);
}
}
write_longint(batch_fd, stats.flist_xfertime);
}
}
+}
+static void output_summary(void)
+{
if (do_stats) {
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
if (do_stats) {
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
@@
-214,12
+212,6
@@
static void handle_stats(int f)
(double)total_read);
}
(double)total_read);
}
- fflush(stdout);
- fflush(stderr);
-}
-
-static void output_summary(void)
-{
if (verbose || do_stats) {
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
if (verbose || do_stats) {
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
@@
-296,7
+288,7
@@
static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
/* Comparison leaves rooms for server_options(). */
for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
/* Comparison leaves rooms for server_options(). */
- if (argc >= MAX_ARGS -
100
) {
+ if (argc >= MAX_ARGS -
MAX_SERVER_ARGS
) {
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
@@
-468,7
+460,6
@@
static void read_final_goodbye(int f_in, int f_out)
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
- int i;
struct file_list *flist;
char *dir = argv[0];
struct file_list *flist;
char *dir = argv[0];
@@
-497,14
+488,6
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
argc--;
argv++;
argc--;
argv++;
- if (strcmp(dir,".")) {
- int l = strlen(dir);
- if (strcmp(dir,"/") == 0)
- l = 0;
- for (i = 0; i < argc; i++)
- argv[i] += l+1;
- }
-
if (argc == 0 && (recurse || list_only)) {
argc = 1;
argv--;
if (argc == 0 && (recurse || list_only)) {
argc = 1;
argv--;
@@
-682,14
+665,8
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
the_file_list = flist;
}
the_file_list = flist;
- if (argc > 0) {
- if (strcmp(dir,".")) {
- argv[0] += strlen(dir);
- if (argv[0][0] == '/')
- argv[0]++;
- }
+ if (argc > 0)
local_name = get_local_name(flist,argv[0]);
local_name = get_local_name(flist,argv[0]);
- }
status = do_recv(f_in,f_out,flist,local_name);
exit_cleanup(status);
status = do_recv(f_in,f_out,flist,local_name);
exit_cleanup(status);
@@
-875,6
+852,13
@@
static int start_client(int argc, char *argv[])
argc--;
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
argc--;
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
+ char *dummy1;
+ int dummy2;
+ if (argc && check_for_hostspec(argv[argc], &dummy1, &dummy2)) {
+ rprintf(FERROR,
+ "The source and destination cannot both be remote.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
argv++;
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
argv++;
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {