Changeset 2309 in MondoRescue

Timestamp:

Jul 28, 2009, 2:14:23 AM (15 years ago)

Author:

Bruno Cornec

Message:

Cosmetic changes to allow for quality to not giv false positive

Location:

branches/2.2.9

Files:

• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-cli.c (modified) (3 diffs)
• tools/quality (modified) (2 diffs)

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

@@ -867 +867 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
-    mr_asprintf(&command,
 /*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 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",*/
-            "mindi %s --custom %s %s/images '%s' '%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'", tmp2, bkpinfo->tmpdir,    // parameter #2

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -1175 +1175 @@
 
     if (flag_set['b']) {
-        mr_asprintf(&psz, flag_val['b']);
+        mr_asprintf(&psz, "%s", flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -1573 +1573 @@
     case SIGKILL:
         mr_asprintf(&tmp, "SIGKILL");
-        mr_asprintf(&tmp2,
-               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(&tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
@@ -1586 +1585 @@
     case SIGSEGV:
         mr_asprintf(&tmp, "SIGSEGV");
-        mr_asprintf(&tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(&tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:

branches/2.2.9/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free; do
-    echo "monodrescue $s usage : "
+for s in asprintf mr_asprintf sprintf snprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
+    echo "mondorescue $s usage : "
     tot=0
     for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|mindi-busybox' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
@@ -40 +40 @@
 echo " "
 echo "Qualimetry: "
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -rw asprintf | egrep -v '/\*' | egrep -v 'asprintf\(&' > /tmp/mondo.quality
+pbg -w asprintf | grep -vE 'monitas|mindi-busybox|quality|/\*|asprintf\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
-echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -rw getline | egrep -v '/\*' | egrep -v 'getline\(&' > /tmp/mondo.quality
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
+pbg -w getline | grep -vE 'monitas|mindi-busybox|quality|/\*|getline\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
-echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"
-
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"
+pbg mr_asprintf | grep -vE '"|FNAME|ISOFS|syscall_sprintf|mr_mem|quality' > /tmp/mondo.quality
+cat /tmp/mondo.quality
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` mr_asprintf without \""
 echo " "
 echo "Splint: "