Whitespace and indentation cleanup. There is a lot of deep

indentation mostly due to read_batch but at least it is now
consistant.

diff --git a/sender.c b/sender.c
index a590ca3..841e81f 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -1,17 +1,17 @@
-/* 
+/*
    Copyright (C) Andrew Tridgell 1996
    Copyright (C) Paul Mackerras 1996
-   
+
    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.
@@ -46,9 +46,9 @@ void read_sum_head(int f, struct sum_struct *sum)
        {
                sum->s2length = csum_length;
        } else {
-               sum->s2length = read_int(f);  
+               sum->s2length = read_int(f);
        }
-       sum->remainder = read_int(f);  
+       sum->remainder = read_int(f);
 }
 
 /**
@@ -68,19 +68,19 @@ static struct sum_struct *receive_sums(int f)
        s->sums = NULL;
 
        if (verbose > 3)
-               rprintf(FINFO,"count=%ld n=%ld rem=%ld\n",
+               rprintf(FINFO, "count=%ld n=%ld rem=%ld\n",
                        (long) s->count, (long) s->blength,
                        (long) s->remainder);
 
-       if (s->count == 0) 
+       if (s->count == 0)
                return(s);
 
        s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
        if (!s->sums) out_of_memory("receive_sums");
 
-       for (i=0; i < (int) s->count;i++) {
+       for (i = 0; i < (int) s->count; i++) {
                s->sums[i].sum1 = read_int(f);
-               read_buf(f,s->sums[i].sum2,s->s2length);
+               read_buf(f, s->sums[i].sum2, s->s2length);
 
                s->sums[i].offset = offset;
                s->sums[i].i = i;
@@ -93,8 +93,8 @@ static struct sum_struct *receive_sums(int f)
                offset += s->sums[i].len;
 
                if (verbose > 3)
-                       rprintf(FINFO,"chunk[%d] len=%d offset=%.0f sum1=%08x\n",
-                               i,s->sums[i].len,(double)s->sums[i].offset,s->sums[i].sum1);
+                       rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+                               i, s->sums[i].len, (double)s->sums[i].offset, s->sums[i].sum1);
        }
 
        s->flength = offset;
@@ -104,17 +104,17 @@ static struct sum_struct *receive_sums(int f)
 
 
 
-void send_files(struct file_list *flist,int f_out,int f_in)
-{ 
+void send_files(struct file_list *flist, int f_out, int f_in)
+{
        int fd = -1;
        struct sum_struct *s;
        struct map_struct *buf = NULL;
        STRUCT_STAT st;
-       char fname[MAXPATHLEN];  
+       char fname[MAXPATHLEN];
        int i;
        struct file_struct *file;
        int phase = 0;
-       extern struct stats stats;              
+       extern struct stats stats;
        struct stats initial_stats;
        extern int write_batch;   /* dw */
        extern int read_batch;    /* dw */
@@ -125,26 +125,26 @@ void send_files(struct file_list *flist,int f_out,int f_in)
        int done;   /* dw */
 
        if (verbose > 2)
-               rprintf(FINFO,"send_files starting\n");
+               rprintf(FINFO, "send_files starting\n");
 
        while (1) {
-               int offset=0;
+               int offset = 0;
 
                i = read_int(f_in);
                if (i == -1) {
-                       if (phase==0) {
+                       if (phase == 0) {
                                phase++;
                                csum_length = SUM_LENGTH;
-                               write_int(f_out,-1);
+                               write_int(f_out, -1);
                                if (verbose > 2)
-                                       rprintf(FINFO,"send_files phase=%d\n",phase);
+                                       rprintf(FINFO, "send_files phase=%d\n", phase);
                                continue;
                        }
                        break;
                }
 
                if (i < 0 || i >= flist->count) {
-                       rprintf(FERROR,"Invalid file index %d (count=%d)\n", 
+                       rprintf(FERROR, "Invalid file index %d (count=%d)\n",
                                i, flist->count);
                        exit_cleanup(RERR_PROTOCOL);
                }
@@ -156,26 +156,26 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
                fname[0] = 0;
                if (file->basedir) {
-                       strlcpy(fname,file->basedir,MAXPATHLEN);
+                       strlcpy(fname, file->basedir, MAXPATHLEN);
                        if (strlen(fname) == MAXPATHLEN-1) {
                                io_error = 1;
                                rprintf(FERROR, "send_files failed on long-named directory %s\n",
                                        fname);
                                return;
                        }
-                       strlcat(fname,"/",MAXPATHLEN);
+                       strlcat(fname, "/", MAXPATHLEN);
                        offset = strlen(file->basedir)+1;
                }
-               strlcat(fname,f_name(file),MAXPATHLEN);
-         
-               if (verbose > 2) 
-                       rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
-         
-               if (dry_run) {  
+               strlcat(fname, f_name(file), MAXPATHLEN);
+
+               if (verbose > 2)
+                       rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
+
+               if (dry_run) {
                        if (!am_server && verbose) {    /* log transfer */
                                rprintf(FINFO, "%s\n", fname+offset);
                        }
-                       write_int(f_out,i);
+                       write_int(f_out, i);
                        continue;
                }
 
@@ -184,124 +184,120 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                s = receive_sums(f_in);
                if (!s) {
                        io_error = 1;
-                       rprintf(FERROR,"receive_sums failed\n");
+                       rprintf(FERROR, "receive_sums failed\n");
                        return;
                }
 
                if (write_batch)
-                   write_batch_csum_info(&i,flist->count,s);
-         
+                       write_batch_csum_info(&i, flist->count, s);
+
                if (!read_batch) {
                        fd = do_open(fname, O_RDONLY, 0);
                        if (fd == -1) {
                                io_error = 1;
-                               rprintf(FERROR,"send_files failed to open %s: %s\n",
-                                       fname,strerror(errno));
+                               rprintf(FERROR, "send_files failed to open %s: %s\n",
+                                       fname, strerror(errno));
                                free_sums(s);
                                continue;
                        }
-         
+
                        /* map the local file */
-                       if (do_fstat(fd,&st) != 0) {
+                       if (do_fstat(fd, &st) != 0) {
                                io_error = 1;
-                               rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+                               rprintf(FERROR, "fstat failed : %s\n", strerror(errno));
                                free_sums(s);
                                close(fd);
                                return;
                        }
-         
+
                        if (st.st_size > 0) {
-                               buf = map_file(fd,st.st_size);
+                               buf = map_file(fd, st.st_size);
                        } else {
                                buf = NULL;
                        }
-         
+
                        if (verbose > 2)
-                               rprintf(FINFO,"send_files mapped %s of size %.0f\n",
-                                       fname,(double)st.st_size);
+                               rprintf(FINFO, "send_files mapped %s of size %.0f\n",
+                                       fname, (double)st.st_size);
+
+                       write_int(f_out, i);
 
-                       write_int(f_out,i);
-         
                        if (write_batch)
-                               write_batch_delta_file((char *)&i,sizeof(i));
+                               write_batch_delta_file((char *)&i, sizeof(i));
 
                        write_sum_head(f_out, s);
                }
-         
-               if (verbose > 2)
-                       if (!read_batch)
-                           rprintf(FINFO,"calling match_sums %s\n",fname);
-         
+
+               if (verbose > 2 && !read_batch)
+                       rprintf(FINFO, "calling match_sums %s\n", fname);
+
                if (!am_server && verbose) {    /* log transfer */
                        rprintf(FINFO, "%s\n", fname+offset);
                }
 
                set_compression(fname);
 
-                if (read_batch) { /* dw */
-                   /* read checksums originally computed on sender side */
-                   read_batch_csum_info(i, s, &checksums_match);
-                   if (checksums_match) {
-                       read_batch_delta_file( (char *) &j, sizeof(int) );
-                       if (j != i) {    /* if flist index entries don't match*/ 
-                          rprintf(FINFO,"index mismatch in send_files\n");
-                          rprintf(FINFO,"read index = %d flist ndx = %d\n",j,i);
-                          close_batch_delta_file();
-                          close_batch_csums_file();
-                          exit_cleanup(1);
-                       }
-                       else {
-                         write_int(f_out,j);
-                        write_sum_head(f_out, s);
-                         done=0;
-                         while (!done) {
-                            read_batch_delta_file( (char *) &buff_len, sizeof(int) );
-                            write_int(f_out,buff_len);
-                            if (buff_len == 0) {
-                               done = 1;
-                            }
-                            else {
-                               if (buff_len > 0) {
-                                  read_batch_delta_file(buff, buff_len);
-                                  write_buf(f_out,buff,buff_len);
-                               }
-                            }
-                         }  /* end while  */
-                         read_batch_delta_file( buff, MD4_SUM_LENGTH);
-                         write_buf(f_out, buff, MD4_SUM_LENGTH);
-
-                       }  /* j=i */
-                   } else {  /* not checksum match */
-                      rprintf (FINFO,"readbatch & checksums don't match\n");
-                      rprintf (FINFO,"filename=%s is being skipped\n",
-                              fname);
-                      continue;
-                   }
-                } else  {
-                   match_sums(f_out,s,buf,st.st_size);
-                   log_send(file, &initial_stats);
-                }
+               if (read_batch) { /* dw */
+                       /* read checksums originally computed on sender side */
+                       read_batch_csum_info(i, s, &checksums_match);
+                       if (checksums_match) {
+                               read_batch_delta_file( (char *) &j, sizeof(int) );
+                               if (j != i) {    /* if flist index entries don't match*/
+                                       rprintf(FINFO, "index mismatch in send_files\n");
+                                       rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
+                                       close_batch_delta_file();
+                                       close_batch_csums_file();
+                                       exit_cleanup(1);
+                               } else {
+                                       write_int(f_out, j);
+                                       write_sum_head(f_out, s);
+                                       done = 0;
+                                       while (!done) {
+                                               read_batch_delta_file( (char *) &buff_len, sizeof(int) );
+                                               write_int(f_out, buff_len);
+                                               if (buff_len == 0) {
+                                                       done = 1;
+                                               } else {
+                                                       if (buff_len > 0) {
+                                                               read_batch_delta_file(buff, buff_len);
+                                                               write_buf(f_out, buff, buff_len);
+                                                       }
+                                               }
+                                       }  /* end while  */
+                                       read_batch_delta_file( buff, MD4_SUM_LENGTH);
+                                       write_buf(f_out, buff, MD4_SUM_LENGTH);
+
+                               }  /* j=i */
+                       } else {  /* not checksum match */
+                               rprintf (FINFO, "readbatch & checksums don't match\n");
+                               rprintf (FINFO, "filename=%s is being skipped\n", fname);
+                               continue;
+                       }
+               } else  {
+                       match_sums(f_out, s, buf, st.st_size);
+                       log_send(file, &initial_stats);
+               }
 
                if (!read_batch) { /* dw */
-                   if (buf) unmap_file(buf);
-                   close(fd);
+                       if (buf) unmap_file(buf);
+                       close(fd);
                }
-         
+
                free_sums(s);
-         
+
                if (verbose > 2)
-                       rprintf(FINFO,"sender finished %s\n",fname);
+                       rprintf(FINFO, "sender finished %s\n", fname);
        }
 
        if (verbose > 2)
-               rprintf(FINFO,"send files finished\n");
+               rprintf(FINFO, "send files finished\n");
 
        match_report();
 
-       write_int(f_out,-1);
+       write_int(f_out, -1);
        if (write_batch || read_batch) { /* dw */
-           close_batch_csums_file();
-           close_batch_delta_file();
+               close_batch_csums_file();
+               close_batch_delta_file();
        }
 
 }