Mention some chanages in the patches dir.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 5ebe2dd..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 fuzzy_basis;
 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;
@@ -60,8 +57,6 @@ extern int filesfrom_fd;
 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;
@@ -465,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[])
 {
-       int i;
        struct file_list *flist;
        char *dir = argv[0];
 
@@ -494,14 +488,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *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--;
@@ -679,14 +665,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
        }
        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]);
-       }
 
        status = do_recv(f_in,f_out,flist,local_name);
        exit_cleanup(status);
@@ -874,7 +854,7 @@ static int start_client(int argc, char *argv[])
                if (shell_path) { /* source is remote */
                        char *dummy1;
                        int dummy2;
-                       if (check_for_hostspec(argv[argc], &dummy1, &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);