Changeset 3294 in MondoRescue

Timestamp:

Jun 3, 2014, 8:20:52 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a compilation issue in libmondo-archive.c on mindi call with lack of parameter
• Fix compilation warnings in mr_mem.c
• Adds function mr_str_substitute in mr_str (not yet used) and test code

Location:

branches/3.2/mondo

Files:

• src/common/libmondo-archive.c (modified) (2 diffs)
• src/lib/mr_conf.c (modified) (2 diffs)
• src/lib/mr_mem.c (modified) (2 diffs)
• src/lib/mr_str.c (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/test-mr_stresc.c (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -841 +841 @@
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' %ld '%s' '%s' '%s' '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' '%s' 2>&1 > %s", 
+    mr_asprintf(command, 
+            "mindi %s --custom %s %s/images '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%ld' '%d' '%s' '%s' 2>&1 > %s", 
+            //     1           2   3          4   5    6     7     8    9   10   11   12   13    14   15   16   17   18    19   20   21         23
             tmp2, 
             bkpinfo->tmpdir,    // parameter #2
@@ -864 +866 @@
             use_lzma_sz,        // parameter #20 (STRING)
             value,          // parameter #21 (STRING)
-            MONDO_LOGFILE,      // redirect to log file
+            MONDO_LOGFILE       // redirect to log file
             );
 

branches/3.2/mondo/src/lib/mr_conf.c

@@ -4 +4 @@
  *
  * Based on the work done by Anton (c)2002-2004 Anton Kulchitsky  mailto:anton@kulchitsky.org
- * Code (c)2006 Bruno Cornec <bruno@mondorescue.org>
+ * Code (c)2006-2014 Bruno Cornec <bruno@mondorescue.org>
  *   
  *     Main file of mr_conf : a very small and simple
@@ -174 +174 @@
         p += strlen(field_name);
         while ((*p != '\n') && (*p != '\0') && (*p != '=')) {
-                p++;
+            p++;
         }
         if (*p != '=') {

branches/3.2/mondo/src/lib/mr_mem.c

@@ -77 +77 @@
         /* free a variable which should be already free */
         mr_msg_int(1,line,file,"mr_getline_ found a non freed variable here");
-        mr_free_int(lineptr,line,file);
+        mr_free_int((void **)lineptr,line,file);
     }
     ret = getline(lineptr,&n,fd);
@@ -86 +86 @@
     /*  We reached end of file, allocating empty string */
     if (ret == -1) {
-        mr_free_int(lineptr,line,file);
+        mr_free_int((void **)lineptr,line,file);
         mr_asprintf_int(lineptr,line,file,"");
     }

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

@@ -194 +194 @@
 }
 
+char *mr_str_substitute(const char *in, const char *token, const char *subst) {
+
+char *output = NULL;
+char *tmp = NULL;
+int i = 0;
+
+mr_asprintf(output, "%s", in);
+tmp = strstr(output, token);
+if (tmp == NULL) {
+    // token not found returning initial string unmodified
+    return(output);
+}
+// token found end string here for now
+*tmp = '\0';
+
+// Add subst content to the string
+mr_strcat(output,subst);
+
+// now add the rest of in
+tmp = strstr(in, token);
+for (; i < strlen(token) ; i++) {
+    tmp++;
+}
+mr_strcat(output,tmp);
+return(output);
+}
+
 
 /*

branches/3.2/mondo/test/Makefile.am

@@ -3 +3 @@
 ## The program
 mrtestdir                 = $(pkglibdir)/test
-mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc
+mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc mrtest_str_substitute
 mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
 mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
@@ -10 +10 @@
 mrtest_stresc_SOURCES     = test-mr_stresc.c
 mrtest_stresc_LDADD       = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+mrtest_str_substitute_SOURCES = test-mr_str_substitute.c
+mrtest_str_substitute_LDADD   = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@

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

@@ -38 +38 @@
         int i;
 
-        for (i = 1; strl[i] != NULL ; i++) {
+        for (i = 0; strl[i] != NULL ; i++) {
                 printf("Test %2d Original chain is %s\n",i,strl[i]);
                 p = mr_stresc(strl[i], "`$\\\"(){}'[]&*?|!#~", '\\', '"');