Changeset 3171 in MondoRescue

Timestamp:

Jul 28, 2013, 7:37:35 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #673 by improving single quote management in mr_stresc, and using single call for getfacl/getfattr and adding tests to test suite.

Location:

branches/3.0/mondo

Files:

• src/common/libmondo-devices.c (modified) (1 diff)
• src/common/libmondo-filelist.c (modified) (4 diffs)
• src/include/mr_str.h (modified) (1 diff)
• src/lib/mr_str.c (modified) (7 diffs)
• test/test-mr_stresc.c (modified) (2 diffs)

branches/3.0/mondo/src/common/libmondo-devices.c

@@ -2820 +2820 @@
                 mr_asprintf(&g_getfacl,"getfacl");
             }
+            log_it("Backup of extended attributes");
         }
 // Interactive mode:

branches/3.0/mondo/src/common/libmondo-filelist.c

@@ -470 +470 @@
         }
         log_msg(8, "Analyzing %s", file_to_analyze);
-        tmp = mr_stresc(file_to_analyze, " `$\\\"(){}[]'*?&|!#~", '\\');
-        mr_asprintf(&strtmp, syscall_sprintf, tmp);
+        tmp = mr_stresc(file_to_analyze, "'", '\\', '\'');
+        mr_asprintf(&syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);   // " MONDO_LOGFILE);
         paranoid_free(tmp);
-        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);  // " MONDO_LOGFILE);
-        paranoid_free(strtmp);
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -496 +494 @@
         mr_free(command);
 
-        retval =
-            gen_aux_list(filelist, "getfacl --all-effective -P \"%s\"",
-                         facl_fname);
+        retval = gen_aux_list(filelist, "getfacl --all-effective -P ", facl_fname);
     }
     return (retval);
@@ -513 +509 @@
         run_program_and_log_output(command, 8);
         mr_free(command);
-        retval =
-            gen_aux_list(filelist, "getfattr --en=hex -m - -h -d \"%s\"",
-                         fattr_fname);
+        retval = gen_aux_list(filelist, "getfattr --en=hex -m - -h -d ", fattr_fname);
     }
     return (retval);
@@ -1350 +1344 @@
 
     /* dir is needed when we pass it to the shell */
-    dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
+    dir = mr_stresc(dir1, "'", '\\', '\'');
     p = strrchr(dir1, '/');
     if (p) {

branches/3.0/mondo/src/include/mr_str.h

@@ -16 +16 @@
 
 extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
-extern char *mr_stresc(char *instr, char *toesc, const char escchr);
+extern char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr);
 extern inline char *mr_date(void);
 extern void mr_strip_spaces(char *in_out);

branches/3.0/mondo/src/lib/mr_str.c

@@ -12 +12 @@
 
 #include "mr_mem.h"
+
+// to get bool type
+#define _MY_STUFF_H_
+#include "my-stuff.h"
  
 /**
@@ -66 +70 @@
  * @note this function allocates memory that needs to be freed by caller
  **/
-char *mr_stresc(char *instr, char *toesc, const char escchr) {
+char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr) {
     char *inptr = NULL;
     char *retstr = NULL;
@@ -72 +76 @@
     char *escptr = NULL;
     int cnt = 0;
+    bool found = FALSE;
 
     inptr = instr;
-
     // Count how many characters need escaping.
     while (*inptr != '\0') {
@@ -82 +86 @@
                 // Found it, skip the rest.
                 cnt++;
+                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+                if (*inptr == specialchr) {
+                    cnt += 2;
+                }
                 break;
             }
@@ -88 +96 @@
         inptr++;
     }
+
     inptr = instr;
-
     retstr = (char *) mr_malloc(strlen(inptr) + cnt + 1);
     retptr = retstr;
@@ -99 +107 @@
             if (*inptr == *escptr) {
                 // Found it, skip the rest.
-                *retptr = escchr;
-                retptr++;
+                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+                if (*inptr == specialchr) {
+                    *retptr = specialchr;
+                    retptr++;
+                    *retptr = escchr;
+                    retptr++;
+                    found = TRUE;
+                } else {
+                    *retptr = escchr;
+                    retptr++;
+                }
                 break;
             }
@@ -108 +125 @@
         retptr++;
         inptr++;
+        if (found) {
+            // finish to put the remaining specialchr
+            *retptr = specialchr;
+            retptr++;
+            found = FALSE;
+        }
     }
     *retptr = '\0';

branches/3.0/mondo/test/test-mr_stresc.c

@@ -8 +8 @@
 #include <stdlib.h>
 #include "mr_str.h"
+#include "mr_mem.h"
 #include "my-stuff.h"
 
@@ -39 +40 @@
         for (i = 1; strl[i] != NULL ; i++) {
                 printf("Test %2d Original chain is %s\n",i,strl[i]);
-                p = mr_stresc(strl[i], "`$\\\"(){}'[]&*?|!#~", '\\');
-                printf("Test %2d Transformed chain is %s\n",i,p);
+                p = mr_stresc(strl[i], "`$\\\"(){}'[]&*?|!#~", '\\', '"');
+                printf("Test %2d Transformed chain (with \") is %s\n",i,p);
+                mr_free(p);
+                p = mr_stresc(strl[i], "`$\\\"(){}'[]&*?|!#~", '\\', '\'');
+                printf("Test %2d Transformed chain (with ') is %s\n",i,p);
+                mr_free(p);
         }
 exit(0);