Ticket #147: 147_escape_use_MHL.patch

mhl/escape.h

@@ -6 +6 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifndef FALSE
+#       define FALSE 0
+#endif
+
+#ifndef TRUE
+#       define TRUE 1
+#endif
+
 #define mhl_shell_escape_toesc(x)       \
     (((x)==' ')||((x)=='!')||((x)=='#')||((x)=='$')||((x)=='%')||       \
      ((x)=='(')||((x)==')')||((x)=='\'')||((x)=='&')||((x)=='~')||      \
@@ -16 +24 @@
 #define mhl_shell_escape_nottoesc(x)    \
     (((x)!=0) && (!mhl_shell_escape_toesc((x))))
 
+/** To be compatible with the general posix command lines we have to escape
+ strings for the command line
+
+ /params const char * in
+ string for escaping
+ /returns
+ return escaped string (later need to free)
+ */
 static inline char* mhl_shell_escape_dup(const char* src)
 {
     if ((src==NULL)||(!(*src)))
@@ -48 +64 @@
     }
 }
 
-/* shell-unescape within a given buffer (writing to it!) */
+/** Unescape paths or other strings for e.g the internal cd
+    shell-unescape within a given buffer (writing to it!)
+
+ /params const char * in
+ string for unescaping
+ /returns
+ return unescaped string 
+*/
 static inline char* mhl_shell_unescape_buf(char* text)
 {
     if (!text)
@@ -109 +132 @@
     return text;
 }
 
+/** Check if char in pointer contain escape'd chars
+
+ /params const char * in
+ string for checking
+ /returns
+ return TRUE if string contain escaped chars
+ otherwise return FALSE
+ */
+static inline int
+mhl_shell_is_char_escaped ( const char *in ) {
+    if (in == NULL || !*in || in[0] != '\\') return FALSE;
+    if (mhl_shell_escape_toesc(in[1])){
+        return TRUE;
+    }
+    return FALSE;
+}
+
 #endif

src/command.c

@@ -28 +28 @@
 #include <string.h>
 
 #include "mhl/memory.h"
+#include "mhl/escape.h"
 
 #include "global.h"             /* home_dir */
 #include "tty.h"
@@ -66 +67 @@
     const char *t;
 
     /* Tilde expansion */
-    path = unescape_string(path);
+    path = mhl_shell_unescape_buf(path);
     path_tilde = tilde_expand (path);
 
     /* Leave space for further expansion */
@@ -138 +139 @@
     }
     g_free (q);
     g_free (path_tilde);
-    mhl_mem_free(path);
+//    mhl_mem_free(path);
     return result;
 }
 

src/complete.c

@@ -32 +32 @@
 #include <unistd.h>
 
 #include "mhl/memory.h"
+#include "mhl/escape.h"
 
 #include "global.h"
 #include "tty.h"
@@ -74 +75 @@
         g_free (filename);
         g_free (users_dirname);
 
-        text = unescape_string(text);
+        text = mhl_shell_unescape_buf(text);
         if ((*text) && (temp = strrchr (text, PATH_SEP))){
             filename = g_strdup (++temp);
             dirname = g_strndup (text, temp - text);
@@ -82 +83 @@
             dirname = g_strdup (".");
             filename = g_strdup (text);
         }
-        mhl_mem_free(text);
 
         /* We aren't done yet.  We also support the "~user" syntax. */
 
@@ -956 +956 @@
     }
     if (in->completions){
         if (what_to_do & DO_INSERTION || ((what_to_do & DO_QUERY) && !in->completions[1])) {
-            complete = escape_string(in->completions [0]);
+            complete = mhl_shell_escape_dup(in->completions [0]);
             if (insert_text (in, complete, strlen (complete))){
                 if (in->completions [1])
                     beep ();
@@ -976 +976 @@
 
             for (p=in->completions + 1; *p; count++, p++) {
                 q = *p;
-                *p = escape_string(*p);
+                *p = mhl_shell_escape_dup(*p);
                 mhl_mem_free(q);
                 if ((i = strlen (*p)) > maxlen)
                     maxlen = i;

src/file.c

@@ -51 +51 @@
 #include <unistd.h>
 
 #include "mhl/memory.h"
+#include "mhl/escape.h"
 
 #include "global.h"
 #include "tty.h"
@@ -179 +180 @@
     for (next_reg = 1, j = 0, k = 0; j < strlen (ctx->dest_mask); j++) {
         switch (ctx->dest_mask[j]) {
         case '\\':
-            if (is_escaped_string (&ctx->dest_mask[j])){
+            if (mhl_shell_is_char_escaped (&ctx->dest_mask[j])){
                 fntarget[k++] = ctx->dest_mask[j++];
                 fntarget[k++] = ctx->dest_mask[j];
                 break;
@@ -1973 +1974 @@
                     char *temp2 = concat_dir_and_file (dest, temp);
                     char *temp3;
 
-                    temp3 = source_with_path;
-                    source_with_path = unescape_string(source_with_path);
-                    mhl_mem_free(temp3);
-                    temp3 = temp2;
-                    temp2 = unescape_string(temp2);
-                    mhl_mem_free(temp3);
+                    source_with_path = mhl_shell_unescape_buf(source_with_path);
+                    temp2 = mhl_shell_unescape_buf(temp2);
 
                     switch (operation) {
                     case OP_COPY:

src/util.c

@@ -35 +35 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "mhl/escape.h"
+
 #include "global.h"
 #include "profile.h"
 #include "main.h"               /* mc_home */

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 * );
-char *escape_string ( const char * );
-int is_escaped_string ( const char * );
-
 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);