- Updated the address for the FSF in the opening comment.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index be0bf47..c8066bd 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,27 +1,24 @@
-/* 
-   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.
-*/
-
-/**
- * @file compat.c
- *
+/*
  * Compatibility routines for older rsync protocol versions.
- **/
+ *
+ * Copyright (C) Andrew Tridgell 1996
+ * Copyright (C) Paul Mackerras 1996
+ * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "rsync.h"
 
@@ -29,12 +26,12 @@ int remote_protocol = 0;
 
 extern int verbose;
 extern int am_server;
-extern int am_sender;
 extern int inplace;
 extern int fuzzy_basis;
 extern int read_batch;
 extern int checksum_seed;
 extern int basis_dir_cnt;
+extern int prune_empty_dirs;
 extern int protocol_version;
 extern char *dest_option;
 
@@ -78,25 +75,38 @@ void setup_protocol(int f_out,int f_in)
                exit_cleanup(RERR_PROTOCOL);
        }
 
-       if (fuzzy_basis && protocol_version < 29) {
-               rprintf(FERROR,
-                       "--fuzzy requires protocol 29 or higher (negotiated %d).\n",
-                       protocol_version);
-               exit_cleanup(RERR_PROTOCOL);
-       }
+       if (protocol_version < 29) {
+               if (fuzzy_basis) {
+                       rprintf(FERROR,
+                           "--fuzzy requires protocol 29 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
 
-       if (basis_dir_cnt && inplace && protocol_version < 29) {
-               rprintf(FERROR,
-                       "%s with --inplace requires protocol 29 or higher (negotiated %d).\n",
-                       dest_option, protocol_version);
-               exit_cleanup(RERR_PROTOCOL);
-       }
+               if (basis_dir_cnt && inplace) {
+                       rprintf(FERROR,
+                           "%s with --inplace requires protocol 29 or higher"
+                           " (negotiated %d).\n",
+                           dest_option, protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
 
-       if (basis_dir_cnt > 1 && protocol_version < 29) {
-               rprintf(FERROR,
-                       "Multiple %s options requires protocol 29 or higher (negotiated %d).\n",
-                       dest_option, protocol_version);
-               exit_cleanup(RERR_PROTOCOL);
+               if (basis_dir_cnt > 1) {
+                       rprintf(FERROR,
+                           "Using more than one %s option requires protocol"
+                           " 29 or higher (negotiated %d).\n",
+                           dest_option, protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+
+               if (prune_empty_dirs) {
+                       rprintf(FERROR,
+                           "--prune-empty-dirs requires protocol 29 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
        }
 
        if (am_server) {