From c25c41bd18639111446bbc270466f1d8a9de329e Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Mon, 26 Feb 2007 19:51:22 +0100 Subject: [PATCH] Used add_shell_quoted_to_string instead of enclosing the text with '"'. The code works both with copiousoutput and without it. --- src/session/download.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/session/download.c b/src/session/download.c index 278d9d13..ddd2480f 100644 --- a/src/session/download.c +++ b/src/session/download.c @@ -810,9 +810,7 @@ subst_file(unsigned char *prog, unsigned char *file) cygwin_conv_to_full_win32_path(file, new_path); add_to_string(&name, new_path); #else - add_char_to_string(&name, '"'); - add_to_string(&name, file); - add_char_to_string(&name, '"'); + add_shell_quoted_to_string(&name, file, strlen(file)); #endif prog++; } @@ -823,9 +821,8 @@ subst_file(unsigned char *prog, unsigned char *file) if (init_string(&s)) { add_to_string(&s, "/bin/cat "); - add_char_to_string(&s, '"'); - add_to_string(&s, file); - add_to_string(&s, "\" | "); + add_shell_quoted_to_string(&s, file, strlen(file)); + add_to_string(&s, " | "); add_string_to_string(&s, &name); done_string(&name); return s.source;