Changeset 2214 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-cli.c

Timestamp:

Jun 3, 2009, 7:10:28 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3094@localhost: bruno | 2009-06-03 17:25:25 +0200

Replaces strcpy in 5 source where no other impact by mr_asprintf. Improves quality report

File:

• branches/2.2.9/mondo/src/common/libmondo-cli.c (modified) (6 diffs)

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

@@ -98 +98 @@
         flag_set[i] = FALSE;
     }
-    //  strcpy (bkpinfo->scratchdir, "/home");
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         bkpinfo->media_size[j] = 650;
@@ -669 +668 @@
 
     malloc_string(tmp);
-    malloc_string(psz);
 
     assert(bkpinfo != NULL);
@@ -1124 +1122 @@
     {
 //      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-        strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
+        asprintf(&psz, "%s", list_of_NFS_mounts_only());
         if (bkpinfo->exclude_paths[0]) {
             strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
         }
         strncat(bkpinfo->exclude_paths, psz, 4*MAX_STR_LEN);
+        mr_free(psz);
+
         log_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
@@ -1139 +1139 @@
 
     if (flag_set['b']) {
-        strcpy(psz, flag_val['b']);
+        mr_asprintf(&psz, flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -1147 +1147 @@
             itbs = atol(psz);
         }
+        mr_free(psz);
         log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
@@ -1421 +1422 @@
 
     paranoid_free(tmp);
-    paranoid_free(psz);
     return (retval);
 }