Quoting tweaks.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bdd95cf83d4a46519ecfbabdbdfbee04fc09a20..c2db9da9a881daa0204c6c2ffd20845881e3c62d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14  Micah Cowan  <micah@cowan.name>
+
+       * ftp.c (ftp_retrieve_list): Symlinks and other filenames
+       should be fully quoted.
+
 2008-04-16  Steven Schubiger  <schubiger@gmail.com>
 
        * ftp.c: Use Gnulib's quote function for printing filenames and

diff --git a/src/ftp.c b/src/ftp.c
index 06e449316795c976877af6bde732fcd0d861915a..59ba1c1669a6907a130e325e3ead32e30e9e77ae 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1492,15 +1492,15 @@ The sizes do not match (local %s) -- retrieving.\n\n"),
                             {
                               logprintf (LOG_VERBOSE, _("\
 Already have correct symlink %s -> %s\n\n"),
-                                         con->target, 
-                                         quotearg_style (escape_quoting_style, f->linkto));
+                                         quote (con->target),
+                                         quote (f->linkto));
                               dlthis = false;
                               break;
                             }
                         }
                     }
                   logprintf (LOG_VERBOSE, _("Creating symlink %s -> %s\n"),
-                             con->target, quotearg_style (escape_quoting_style, f->linkto));
+                             quote (con->target), quote (f->linkto));
                   /* Unlink before creating symlink!  */
                   unlink (con->target);
                   if (symlink (f->linkto, con->target) == -1)
@@ -1531,7 +1531,7 @@ Already have correct symlink %s -> %s\n\n"),
           break;
         case FT_UNKNOWN:
           logprintf (LOG_NOTQUIET, _("%s: unknown/unsupported file type.\n"),
-                     quotearg_style (escape_quoting_style, f->name));
+                     quote (f->name));
           break;
         }       /* switch */