Moved the sanitizing of the --*-dest args into main.c.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 6f26bea..ee7b522 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1,7 +1,9 @@
-/*  -*- c-file-style: "linux" -*-
+/*
+ * Command-line (and received via daemon-socket) option parsing.
  *
- * Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- * Copyright (C) 2000, 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2002, 2003, 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
@@ -13,9 +15,9 @@
  * 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.
+ * 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.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "rsync.h"
@@ -1046,10 +1048,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                                        MAX_BASIS_DIRS, dest_option);
                                return 0;
                        }
-                       arg = poptGetOptArg(pc);
-                       if (sanitize_paths)
-                               arg = sanitize_path(NULL, arg, NULL, 0);
-                       basis_dir[basis_dir_cnt++] = (char *)arg;
+                       /* We defer sanitizing this arg until we know what
+                        * our destination directory is going to be. */
+                       basis_dir[basis_dir_cnt++] = (char *)poptGetOptArg(pc);
                        break;
 
                case OPT_CHMOD: