From: Wayne Davison Date: Fri, 21 Mar 2003 18:33:48 +0000 (+0000) Subject: - Fixed lots of line-indentation problems, including a really huge section X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/d9c7edf63f9da2d30dced5629734551dc874e47a - Fixed lots of line-indentation problems, including a really huge section of non-batch-mode code that was indented at the same level as its surrounding "if" statement. - Moved the heavily-used am_* flags into global extern vars instead of externing them again and again in individual functions. - Got rid of line-ending whitespace. --- diff --git a/main.c b/main.c index b571b3a8..95e25b30 100644 --- a/main.c +++ b/main.c @@ -1,19 +1,19 @@ /* -*- c-file-style: "linux" -*- - + Copyright (C) 1996-2001 by Andrew Tridgell Copyright (C) Paul Mackerras 1996 Copyright (C) 2001, 2002 by Martin Pool - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -24,6 +24,9 @@ time_t starttime = 0; extern struct stats stats; +extern int am_server; +extern int am_sender; +extern int am_daemon; extern int verbose; /* there's probably never more than at most 2 outstanding child processes, @@ -50,7 +53,7 @@ void wait_process(pid_t pid, int *status) msleep(20); io_flush(); } - + if ((waited_pid == -1) && (errno == ECHILD)) { /* status of requested child no longer available. * check to see if it was processed by the sigchld_handler. @@ -64,20 +67,17 @@ void wait_process(pid_t pid, int *status) } } - /* TODO: If the child exited on a signal, then log an - * appropriate error message. Perhaps we should also accept a - * message describing the purpose of the child. Also indicate - * this to the caller so that thhey know something went - * wrong. */ + /* TODO: If the child exited on a signal, then log an + * appropriate error message. Perhaps we should also accept a + * message describing the purpose of the child. Also indicate + * this to the caller so that thhey know something went + * wrong. */ *status = WEXITSTATUS(*status); } static void report(int f) { time_t t = time(NULL); - extern int am_server; - extern int am_sender; - extern int am_daemon; extern int do_stats; extern int remote_version; int send_stats; @@ -98,7 +98,7 @@ static void report(int f) if (am_sender && send_stats) { int64 w; /* store total_written in a temporary - because write_longint changes it */ + * because write_longint changes it */ w = stats.total_written; write_longint(f,stats.total_read); write_longint(f,w); @@ -108,7 +108,7 @@ static void report(int f) } /* this is the client */ - + if (!am_sender && send_stats) { int64 r; stats.total_written = read_longint(f); @@ -120,37 +120,37 @@ static void report(int f) if (do_stats) { if (!am_sender && !send_stats) { - /* missing the bytes written by the generator */ - rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n"); - rprintf(FINFO, "Use --stats -v to show stats\n"); - return; + /* missing the bytes written by the generator */ + rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n"); + rprintf(FINFO, "Use --stats -v to show stats\n"); + return; } rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files); - rprintf(FINFO,"Number of files transferred: %d\n", - stats.num_transferred_files); - rprintf(FINFO,"Total file size: %.0f bytes\n", - (double)stats.total_size); - rprintf(FINFO,"Total transferred file size: %.0f bytes\n", - (double)stats.total_transferred_size); - rprintf(FINFO,"Literal data: %.0f bytes\n", - (double)stats.literal_data); - rprintf(FINFO,"Matched data: %.0f bytes\n", - (double)stats.matched_data); + rprintf(FINFO,"Number of files transferred: %d\n", + stats.num_transferred_files); + rprintf(FINFO,"Total file size: %.0f bytes\n", + (double)stats.total_size); + rprintf(FINFO,"Total transferred file size: %.0f bytes\n", + (double)stats.total_transferred_size); + rprintf(FINFO,"Literal data: %.0f bytes\n", + (double)stats.literal_data); + rprintf(FINFO,"Matched data: %.0f bytes\n", + (double)stats.matched_data); rprintf(FINFO,"File list size: %d\n", stats.flist_size); - rprintf(FINFO,"Total bytes written: %.0f\n", - (double)stats.total_written); - rprintf(FINFO,"Total bytes read: %.0f\n\n", - (double)stats.total_read); + rprintf(FINFO,"Total bytes written: %.0f\n", + (double)stats.total_written); + rprintf(FINFO,"Total bytes read: %.0f\n\n", + (double)stats.total_read); } - + if (verbose || do_stats) { rprintf(FINFO,"wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n", - (double)stats.total_written, - (double)stats.total_read, - (stats.total_written+stats.total_read)/(0.5 + (t-starttime))); + (double)stats.total_written, + (double)stats.total_read, + (stats.total_written+stats.total_read)/(0.5 + (t-starttime))); rprintf(FINFO,"total size is %.0f speedup is %.2f\n", - (double)stats.total_size, - (1.0*stats.total_size)/(stats.total_written+stats.total_read)); + (double)stats.total_size, + (1.0*stats.total_size)/(stats.total_written+stats.total_read)); } fflush(stdout); @@ -165,9 +165,6 @@ static void show_malloc_stats(void) { #ifdef HAVE_MALLINFO struct mallinfo mi; - extern int am_server; - extern int am_sender; - extern int am_daemon; mi = mallinfo(); @@ -210,14 +207,14 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int if (!cmd) cmd = RSYNC_RSH; cmd = strdup(cmd); - if (!cmd) + if (!cmd) goto oom; for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) { args[argc++] = tok; } - /* check to see if we've already been given '-l user' in + /* check to see if we've already been given '-l user' in the remote-shell command */ for (i = 0; i < argc-1; i++) { if (!strcmp(args[i], "-l") && args[i+1][0] != '-') @@ -250,7 +247,7 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int args[argc++] = "."; - if (!daemon_over_rsh && path && *path) + if (!daemon_over_rsh && path && *path) args[argc++] = path; args[argc] = NULL; @@ -264,7 +261,7 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int if (local_server) { if (read_batch) - create_flist_from_batch(); /* sets batch_flist */ + create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out, child_main); } else { ret = piped_child(args,f_in,f_out); @@ -288,10 +285,10 @@ static char *get_local_name(struct file_list *flist,char *name) extern int orig_umask; if (verbose > 2) - rprintf(FINFO,"get_local_name count=%d %s\n", + rprintf(FINFO,"get_local_name count=%d %s\n", flist->count, NS(name)); - if (!name) + if (!name) return NULL; if (do_stat(name,&st) == 0) { @@ -345,17 +342,17 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) if (verbose > 2) 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)); exit_cleanup(RERR_FILESELECT); } argc--; argv++; - + if (strcmp(dir,".")) { int l = strlen(dir); - if (strcmp(dir,"/") == 0) + if (strcmp(dir,"/") == 0) l = 0; for (i=0;icount == 0) { exit_cleanup(0); @@ -376,7 +373,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) io_flush(); report(f_out); if (remote_version >= 24) { - /* final goodbye message */ + /* final goodbye message */ read_int(f_in); } io_flush(); @@ -415,7 +412,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) rprintf(FERROR,"error pipe failed in do_recv\n"); exit_cleanup(RERR_SOCKETIO); } - + io_flush(); if ((pid=do_fork()) == 0) { @@ -476,9 +473,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) char *dir = NULL; extern int delete_mode; extern int delete_excluded; - extern int am_daemon; extern int module_id; - extern int am_sender; extern int read_batch; extern struct file_list *batch_flist; @@ -491,7 +486,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) return; } - + if (argc > 0) { dir = argv[0]; argc--; @@ -500,22 +495,22 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) rprintf(FERROR,"push_dir %s : %s (4)\n", dir,strerror(errno)); exit_cleanup(RERR_FILESELECT); - } + } } if (delete_mode && !delete_excluded) recv_exclude_list(f_in); if (read_batch) - flist = batch_flist; + flist = batch_flist; else - flist = recv_file_list(f_in); + flist = recv_file_list(f_in); if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); } - - if (argc > 0) { + + if (argc > 0) { if (strcmp(dir,".")) { argv[0] += strlen(dir); if (argv[0][0] == '/') argv[0]++; @@ -538,7 +533,6 @@ int child_main(int argc, char *argv[]) void start_server(int f_in, int f_out, int argc, char *argv[]) { extern int cvs_exclude; - extern int am_sender; extern int remote_version; extern int read_batch; @@ -552,9 +546,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) if (am_sender) { if (!read_batch) { - recv_exclude_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); + recv_exclude_list(f_in); + if (cvs_exclude) + add_cvs_excludes(); } do_server_sender(f_in, f_out, argc, argv); } else { @@ -573,7 +567,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) struct file_list *flist = NULL; int status = 0, status2 = 0; char *local_name = NULL; - extern int am_sender; extern int remote_version; extern pid_t cleanup_child_pid; extern int write_batch; @@ -582,7 +575,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) cleanup_child_pid = pid; if (read_batch) - flist = batch_flist; + flist = batch_flist; set_nonblocking(f_in); set_nonblocking(f_out); @@ -591,23 +584,23 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (remote_version >= 23) io_start_multiplex_in(f_in); - + if (am_sender) { extern int cvs_exclude; extern int delete_mode; extern int delete_excluded; if (cvs_exclude) add_cvs_excludes(); - if (delete_mode && !delete_excluded) + if (delete_mode && !delete_excluded) send_exclude_list(f_out); if (!read_batch) /* dw -- don't write to pipe */ - flist = send_file_list(f_out,argc,argv); - if (verbose > 3) + flist = send_file_list(f_out,argc,argv); + if (verbose > 3) rprintf(FINFO,"file list sent\n"); send_files(flist,f_out,f_in); if (remote_version >= 24) { - /* final goodbye message */ + /* final goodbye message */ read_int(f_in); } if (pid != -1) { @@ -624,29 +617,29 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) extern int list_only; list_only = 1; } - + if (!write_batch) - send_exclude_list(f_out); - + send_exclude_list(f_out); + flist = recv_file_list(f_in); if (!flist || flist->count == 0) { rprintf(FINFO, "client: nothing to do: " - "perhaps you need to specify some filenames or " - "the --recursive option?\n"); + "perhaps you need to specify some filenames or " + "the --recursive option?\n"); exit_cleanup(0); } - + local_name = get_local_name(flist,argv[0]); - + status2 = do_recv(f_in,f_out,flist,local_name); - + if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid); io_flush(); wait_process(pid, &status); } - + return MAX(status, status2); } @@ -656,7 +649,7 @@ static char *find_colon(char *s) p = strchr(s,':'); if (!p) return NULL; - + /* now check to see if there is a / in the string before the : - if there is then discard the colon on the assumption that the : is part of a filename */ p2 = strchr(s,'/'); @@ -700,7 +693,6 @@ static int start_client(int argc, char *argv[]) pid_t pid; int f_in,f_out; extern int local_server; - extern int am_sender; extern char *shell_cmd; extern int rsync_port; extern int daemon_over_rsh; @@ -708,7 +700,7 @@ static int start_client(int argc, char *argv[]) int rc; /* Don't clobber argv[] so that ps(1) can still show the right - command line. */ + * command line. */ if ((rc = copy_argv(argv))) return rc; @@ -734,84 +726,83 @@ static int start_client(int argc, char *argv[]) if (!read_batch) { p = find_colon(argv[0]); - - if (p) { - if (p[1] == ':') { /* double colon */ - *p = 0; - if (!shell_cmd) { - return start_socket_client(argv[0], p+2, - argc-1, argv+1); + if (p) { + if (p[1] == ':') { /* double colon */ + *p = 0; + if (!shell_cmd) { + return start_socket_client(argv[0], p+2, + argc-1, argv+1); + } + p++; + daemon_over_rsh = 1; } - p++; - daemon_over_rsh = 1; - } - if (argc < 1) { - usage(FERROR); - exit_cleanup(RERR_SYNTAX); - } - - am_sender = 0; - *p = 0; - shell_machine = argv[0]; - shell_path = p+1; - argc--; - argv++; - } else { - am_sender = 1; - - /* rsync:// destination uses rsync server over direct socket */ - if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) { - char *host, *path; + if (argc < 1) { + usage(FERROR); + exit_cleanup(RERR_SYNTAX); + } - host = argv[argc-1] + strlen(URL_PREFIX); - p = strchr(host,'/'); - if (p) { - *p = 0; - path = p+1; - } else { - path = ""; + am_sender = 0; + *p = 0; + shell_machine = argv[0]; + shell_path = p+1; + argc--; + argv++; + } else { + am_sender = 1; + + /* rsync:// destination uses rsync server over direct socket */ + if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) { + char *host, *path; + + host = argv[argc-1] + strlen(URL_PREFIX); + p = strchr(host,'/'); + if (p) { + *p = 0; + path = p+1; + } else { + path = ""; + } + p = strchr(host,':'); + if (p) { + rsync_port = atoi(p+1); + *p = 0; + } + return start_socket_client(host, path, argc-1, argv); } - p = strchr(host,':'); - if (p) { - rsync_port = atoi(p+1); + + p = find_colon(argv[argc-1]); + if (!p) { + local_server = 1; + } else if (p[1] == ':') { /* double colon */ *p = 0; + if (!shell_cmd) { + return start_socket_client(argv[argc-1], p+2, + argc-1, argv); + } + p++; + daemon_over_rsh = 1; } - return start_socket_client(host, path, argc-1, argv); - } - p = find_colon(argv[argc-1]); - if (!p) { - local_server = 1; - } else if (p[1] == ':') { /* double colon */ - *p = 0; - if (!shell_cmd) { - return start_socket_client(argv[argc-1], p+2, - argc-1, argv); + if (argc < 2) { + usage(FERROR); + exit_cleanup(RERR_SYNTAX); } - p++; - daemon_over_rsh = 1; - } - if (argc < 2) { - usage(FERROR); - exit_cleanup(RERR_SYNTAX); - } - - if (local_server) { - shell_machine = NULL; - shell_path = argv[argc-1]; - } else { - *p = 0; - shell_machine = argv[argc-1]; - shell_path = p+1; + if (local_server) { + shell_machine = NULL; + shell_path = argv[argc-1]; + } else { + *p = 0; + shell_machine = argv[argc-1]; + shell_path = p+1; + } + argc--; } - argc--; - } } else { - am_sender = 1; - local_server = 1; - shell_path = argv[argc-1]; + am_sender = 1; + local_server = 1; + shell_path = argv[argc-1]; } if (shell_machine) { @@ -830,7 +821,7 @@ static int start_client(int argc, char *argv[]) shell_user?shell_user:"", shell_path?shell_path:""); } - + if (!am_sender && argc > 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX); @@ -840,7 +831,7 @@ static int start_client(int argc, char *argv[]) extern int list_only; list_only = 1; } - + pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path, &f_in,&f_out); @@ -878,7 +869,7 @@ static RETSIGTYPE sigchld_handler(int UNUSED(val)) { int cnt, status; pid_t pid; /* An empty waitpid() loop was put here by Tridge and we could never - * get him to explain why he put it in, so rather than taking it + * get him to explain why he put it in, so rather than taking it * out we're instead saving the child exit statuses for later use. * The waitpid() loop presumably eliminates all possibility of leaving * zombie children, maybe that's why he did it. @@ -949,12 +940,10 @@ static RETSIGTYPE rsync_panic_handler(int UNUSED(whatsig)) int main(int argc,char *argv[]) -{ +{ extern int am_root; extern int orig_umask; extern int dry_run; - extern int am_daemon; - extern int am_server; int ret; extern int write_batch; int orig_argc; @@ -988,8 +977,8 @@ int main(int argc,char *argv[]) orig_umask = (int)umask(0); if (!parse_arguments(&argc, (const char ***) &argv, 1)) { - /* FIXME: We ought to call the same error-handling - * code here, rather than relying on getopt. */ + /* FIXME: We ought to call the same error-handling + * code here, rather than relying on getopt. */ option_error(); exit_cleanup(RERR_SYNTAX); } @@ -1009,7 +998,7 @@ int main(int argc,char *argv[]) push_dir(NULL,0); if (write_batch && !am_server) { - write_batch_argvs_file(orig_argc, orig_argv); + write_batch_argvs_file(orig_argc, orig_argv); } if (am_daemon && !am_server) @@ -1039,7 +1028,7 @@ int main(int argc,char *argv[]) } ret = start_client(argc, argv); - if (ret == -1) + if (ret == -1) exit_cleanup(RERR_STARTCLIENT); else exit_cleanup(ret);