Ticket #147: escaping-patch-rev3.patch

src/command.c

@@ -64 +64 @@
     const char *t;
 
     /* Tilde expansion */
+    path = unescape_string(path);
     path_tilde = tilde_expand (path);
 
     /* Leave space for further expansion */

src/complete.c

@@ -40 +40 @@
 #include "wtools.h"
 #include "complete.h"
 #include "main.h"
+#include "util.h"
 #include "key.h"                /* XCTRL and ALT macros */
 
 typedef char *CompletionFunction (char *, int);
@@ -911 +912 @@
 static int
 complete_engine (WInput *in, int what_to_do)
 {
+    char *complete = NULL;
     if (in->completions && in->point != end)
         free_completions (in);
     if (!in->completions){
@@ -924 +926 @@
     }
     if (in->completions){
         if (what_to_do & DO_INSERTION || ((what_to_do & DO_QUERY) && !in->completions[1])) {
-            if (insert_text (in, in->completions [0], strlen (in->completions [0]))){
+            complete = escape_string(in->completions [0]);
+            if (insert_text (in, complete, strlen (complete))){
                 if (in->completions [1])
                     beep ();
                 else
@@ -940 +943 @@
             Dlg_head *query_dlg;
             WListbox *query_list;
             
-            for (p=in->completions + 1; *p; count++, p++)
+            for (p=in->completions + 1; *p; count++, p++) {
+            *p = escape_string(*p);
                 if ((i = strlen (*p)) > maxlen)
                     maxlen = i;
+                        }
             start_x = in->widget.x;
             start_y = in->widget.y;
             if (start_y - 2 >= count) {

src/file.c

@@ -63 +63 @@
 #include "widget.h"
 #include "wtools.h"
 #include "background.h"         /* we_are_background */
+#include "util.h"
 
 /* Needed for current_panel, other_panel and WTree */
 #include "dir.h"
@@ -791 +792 @@
             }
         }
 
-        if (!appending) {
+        if (!appending && ctx->preserve) {
             while (mc_chmod (dst_path, (src_mode & ctx->umask_kill))) {
                 temp_status = file_error (
                         _(" Cannot chmod target file \"%s\" \n %s "), dst_path);
@@ -1872 +1873 @@
                 dest = temp2;
                 temp = NULL;
 
+                source_with_path = unescape_string(source_with_path);
+                dest = unescape_string(dest);
                 switch (operation) {
                 case OP_COPY:
                     /*
@@ -1963 +1966 @@
                 else {
                     char *temp2 = concat_dir_and_file (dest, temp);
 
+                        source_with_path = unescape_string(source_with_path);
+                        temp2 = unescape_string(temp2);
+                        
                     switch (operation) {
                     case OP_COPY:
                         /*

src/util.c

@@ -1525 +1525 @@
     return (sep != NULL) ? sep + 1 : result;
 }
 
+/* Unescape paths or other strings for e.g the internal cd  */
+char *
+unescape_string(const char *in) {
+    GString *str;
+    const char * src;
+    char *result;
+
+    str = g_string_new("");
+
+    for (src = in; *src != '\0'; src++) {
+        if (src[0] == '\\' && strchr(" !#$%&'()*;<>?[]`{|}~", src[1])) {
+            g_string_append_c(str, src[1]);
+            src++;
+        } else {
+            g_string_append_c(str, src[0]);
+        }
+    }
+
+    result = str->str;
+    g_string_free(str, FALSE);
+    return result;
+}
+/* To be compatible with the general posix command lines we have to escape *
+ * strings for the command line                                                                                    */
+char *
+escape_string ( const char * in ) {
+        GString *str;
+        const char * src;
+        char *result;
+
+        str = g_string_new("");
+
+        for (src = in;src[0] != '\0';src++) {
+                if ( (src[-1] != '\\') && strchr(" !#$%&'()*;<>?[]`{|}~",src[0])) {
+                        g_string_append_c(str,'\\');
+                        g_string_append_c(str,src[0]);
+                } else {
+                        g_string_append_c(str,src[0]);
+                }
+        }
+
+        result = str->str;
+        g_string_free(str, FALSE);
+        return result;
+}

src/util.h

@@ -14 +14 @@
 extern const char *cstrcasestr (const char *haystack, const char *needle);
 extern const char *cstrstr (const char *haystack, const char *needle);
 
+char *unescape_string ( const char * in );
+char *escape_string ( const char * in );
 void str_replace(char *s, char from, char to);
 int  is_printable (int c);
 void msglen (const char *text, /*@out@*/ int *lines, /*@out@*/ int *columns);