Changeset 2520 in MondoRescue

Timestamp:

Jan 4, 2010, 7:42:27 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3230@localhost (orig r2264): bruno | 2009-07-12 02:04:37 +0200

r3205@localhost: bruno | 2009-07-06 19:46:07 +0200

• Replace sprintf by mr_asprintf in libmondo-stream.c

File:

• branches/2.2.9/mondo/src/common/libmondo-stream.c (modified) (38 diffs)

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

@@ -233 +233 @@
 bool mt_says_tape_exists(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res;
 
-    malloc_string(command);
-    sprintf(command, "mt -f %s status", dev);
+    mr_asprintf(&command, "mt -f %s status", dev);
     res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
+
     if (res) {
         return (FALSE);
@@ -259 +259 @@
 {
     char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
     char cdr_exe[MAX_STR_LEN];
     int res;
@@ -270 +270 @@
         strcpy(cdr_exe, "dvdrecord");
     }
-    sprintf(command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
             cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (atoi(tmp) != 1) {
         log_it
@@ -279 +281 @@
         return 1;
     }
-    sprintf(command,
+    mr_asprintf(&command,
             "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
             cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
         return 1;
     }
-    sprintf(command,
+    mr_asprintf(&command,
             "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1",
             cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     strcpy(dev, VANILLA_SCSI_TAPE);
     dev[strlen(dev) - 1] = '\0';
@@ -462 +468 @@
 {
     int i;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     log_it("Insisting on tape #%d", tapeno);
     if (g_current_media_number != tapeno) {
-        //      log_it("g_current_media_number = %d", g_current_media_number);
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 "When the tape drive goes quiet, please insert volume %d in this series.",
                 tapeno);
         popup_and_OK(tmp);
+        mr_free(tmp);
         open_evalcall_form("Waiting while the tape drive settles");
     } else {
@@ -525 +531 @@
     int last, curr, i;
     t_archtype type = other;
-    char command[MAX_STR_LEN];
-    char tmpdir[MAX_STR_LEN];
-    char old_fname[MAX_STR_LEN];
+    char *command = NULL;
+    char *tmpdir = NULL;
+    char *old_fname = NULL;
     char *p;
     char suffix[16];
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
-    sprintf(tmpdir, "%s/tmpfs/backcatalog", td);
     if ((p = strrchr(latest_fname, '.'))) {
         strcpy(suffix, ++p);
@@ -547 +552 @@
             ("Unknown type. Internal error in maintain_collection_of_recent_archives()");
     }
+    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     mkdir(tmpdir, 0x700);
-    sprintf(command, "cp -f %s %s", latest_fname, tmpdir);
+    mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
     if (run_program_and_log_output(command, 6)) {
         log_it("Warning - failed to copy %s to backcatalog at %s",
                latest_fname, tmpdir);
     }
+    mr_free(command);
+
     last = g_tapecatalog->entries - 1;
     if (last <= 0) {
         log_it("Too early to start deleting from collection.");
+        mr_free(tmpdir);
         return (0);
     }
@@ -569 +578 @@
     if (curr < 0) {
         log_it("Not far enough into tape to start deleting old archives from collection.");
+        mr_free(tmpdir);
         return (0);
     }
-//  log_it( "There are %lld KB (more than %d KB) in my backcatalog", final_alleged_writeK - final_actually_certain_writeK, bufsize_K);
 
     for (i = curr - 1; i >= 0 && curr - i < 10; i--) {
-        sprintf(old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
+        mr_asprintf(&old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
         unlink(old_fname);
-    }
+        mr_free(old_fname);
+    }
+    mr_free(tmpdir);
     return (0);
 }
@@ -604 +615 @@
 int set_tape_block_size_with_mt(long internal_tape_block_size)
 {
-    char *tmp;
+    char *tmp = NULL;
     int res;
 
@@ -612 +623 @@
         return (0);
     }
-    malloc_string(tmp);
-    sprintf(tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
+    mr_asprintf(&tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -748 +758 @@
     char fname[MAX_STR_LEN];
     char *datablock;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char old_cwd[MAX_STR_LEN];
-    char outfname[MAX_STR_LEN];
+    char *outfname = NULL;
     /*@ int ******************************************************* */
     int i;
@@ -793 +803 @@
 
     insist_on_this_tape_number(1);
-    sprintf(outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
+    mr_asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
 
@@ -804 +814 @@
         log_OS_error(g_tape_fifo);
         log_to_screen("Cannot openin stream device");
+        mr_free(outfname);
         return (1);
     }
@@ -814 +825 @@
         log_OS_error(outfname);
         log_to_screen("Cannot openout datadisk all.tar.gz file");
+        mr_free(outfname);
         return (-1);
     }
     if (!(datablock = (char *) malloc(256 * 1024))) {
         log_to_screen("Unable to malloc 256*1024");
+        mr_free(outfname);
         finish(1);
     }
@@ -837 +850 @@
     paranoid_fclose(fout);
     paranoid_free(datablock);
+
 /* find initial blocks */
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
@@ -852 +866 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    sprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
+    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
             outfname);
     paranoid_system(tmp);
+    mr_free(tmp);
+
     paranoid_system("cp -f tmp/mondo-restore.cfg . 2> /dev/null");
     chdir(old_cwd);
     unlink(outfname);
+    mr_free(outfname);
     return (retval);
 }
@@ -872 +889 @@
 {
     /*@ buffers ***************************************************** */
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
 
-/*  add 'dummy' if testing */
-    sprintf(command,
-            "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-            cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
-/*  initialise the catalog */
+    /*  add 'dummy' if testing */
+    mr_asprintf(&command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
+    /*  initialise the catalog */
     g_current_media_number = 1;
     if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
@@ -886 +901 @@
     }
     g_tapecatalog->entries = 0;
-/* log stuff */
+    /* log stuff */
     log_it("Opening OUT cdstream with the command");
     log_it(command);
-/*  log_it("Let's see what happens, shall we?"); */
+    /*  log_it("Let's see what happens, shall we?"); */
     g_tape_stream = popen(command, "w");
+    mr_free(command);
+
     if (g_tape_stream) {
         return (0);
@@ -898 +915 @@
     }
 }
+
 
 /**
@@ -1003 +1021 @@
 {
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *datablock;
     char *temp_fname;
     char *temp_cksum;
-    char *actual_cksum;
+    char *actual_cksum = NULL;
 //  char *pA, *pB;
 
@@ -1038 +1056 @@
 
     /*@ init  ******************************************************* */
-    malloc_string(tmp);
     malloc_string(temp_fname);
     malloc_string(temp_cksum);
-    malloc_string(actual_cksum);
     datablock = malloc(TAPE_BLOCK_SIZE);
     crc16 = 0;
@@ -1051 +1067 @@
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
     if (orig_size != temp_size && orig_size != -1) {
-        sprintf(tmp,
-                "output file's size should be %ld K but is apparently %ld K",
-                (long) size >> 10, (long) temp_size >> 10);
+        mr_asprintf(&tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
         log_to_screen(tmp);
+        mr_free(tmp);
     }
     if (ctrl_chr != BLK_START_FILE) {
@@ -1060 +1075 @@
         return (1);
     }
-    /* Not used
-    sprintf(tmp, "Reading file from tape; writing to '%s'; %ld KB",
-            outfname, (long) size >> 10);
-            */
 
     if (foutstream) {
@@ -1119 +1130 @@
     log_msg(6, ".......................... Should be %lld", orig_size);
     g_tape_posK += total_read_from_tape_for_this_file / 1024;
-    sprintf(actual_cksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
     if (foutstream) {           /*log_it("Finished writing to foutstream"); */
     } else {
@@ -1127 +1138 @@
     if (ctrl_chr != BLK_STOP_FILE) {
         wrong_marker(BLK_STOP_FILE, ctrl_chr);
-//      fatal_error("Bad marker"); // return(1);
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        sprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
+        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
                 temp_cksum);
         log_to_screen(tmp);
-        sprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname,
                 (long) orig_size >> 10);
         log_to_screen(tmp);
+        mr_free(tmp);
+
         retval++;
-    } else {
-        sprintf(tmp, "%s is GOOD on tape", temp_fname);
-        /*      log_it(tmp); */
-    }
+    }
+    mr_free(actual_cksum);
+
     paranoid_free(datablock);
-    paranoid_free(tmp);
     paranoid_free(temp_fname);
     paranoid_free(temp_cksum);
-    paranoid_free(actual_cksum);
     return (retval);
 }
@@ -1473 +1484 @@
 {
     int res = 0;
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
+
     paranoid_pclose(g_tape_stream);
     system("sync");
@@ -1485 +1497 @@
     }
     if (bkpinfo->backup_media_type == cdstream) {
-        sprintf(command,
+        mr_asprintf(&command,
                 "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
                 bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
@@ -1493 +1505 @@
         log_it("Let's see what happens, shall we?");
         g_tape_stream = popen(command, "w");
+        mr_free(command);
+
         if (!g_tape_stream) {
             log_to_screen("Failed to openout to cdstream (fifo)");
@@ -1533 +1547 @@
 {
     int i, last, res = 0;
-    char *fname;
+    char *fname = NULL;
 
     log_msg(2, "I am now writing back catalog to tape");
-    malloc_string(fname);
     last = g_tapecatalog->entries - 1;
     for (i = 0; i <= last; i++) {
-        sprintf(fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir,
-                g_tapecatalog->el[i].fname);
+        mr_asprintf(&fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir, g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
             log_msg(6, "Can't write %s - it doesn't exist.", fname);
@@ -1558 +1570 @@
             }
         }
-    }
-    paranoid_free(fname);
+        mr_free(fname);
+    }
     log_msg(2, "Finished writing back catalog to tape");
     return (res);
@@ -1575 +1587 @@
     /*@ pointers *************************************************** */
     FILE *fin;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /*@ long ******************************************************* */
@@ -1593 +1605 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        sprintf(tmp, "Cannot find %s", fname);
+        mr_asprintf(&tmp, "Cannot find %s", fname);
         log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -1637 +1650 @@
 {
     /*@ buffers **************************************************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char datablock[TAPE_BLOCK_SIZE];
-    char checksum[MAX_STR_LEN];
+    char *checksum = NULL;
     char *infile_basename;
 
@@ -1690 +1703 @@
         p++;
     }
-    sprintf(tmp, "Writing file '%s' to tape (%ld KB)", p,
+    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
             (long) filesize >> 10);
     log_it(tmp);
+    mr_free(tmp);
     write_header_block_to_stream(filesize, infile_basename,
                                  BLK_START_FILE);
@@ -1732 +1746 @@
     }
     paranoid_fclose(fin);
-    sprintf(checksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(&checksum, "%04x%04x", crc16, crctt);
     /* BERLIOS: what does it do ??? */
-    write_header_block_to_stream((off_t)g_current_media_number, checksum,
-                                 BLK_STOP_FILE);
+    write_header_block_to_stream((off_t)g_current_media_number, checksum, BLK_STOP_FILE);
+    mr_free(checksum);
+
 //  log_it("File '%s' written to tape.", infile);
     return (retval);
@@ -1761 +1776 @@
     /*@ buffers **************************************************** */
     char tempblock[TAPE_BLOCK_SIZE];
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *p;
 
@@ -1789 +1804 @@
     sprintf(tempblock + 6000 + control_char, STR_HEADER);
     tempblock[7000] = control_char;
-/*  for(i=0;i<8;i++) {tempblock[7001+i]=olen&0xff; olen>>=8;} */
     memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
-/*  if (length_of_incoming_file) {memcpy(tempblock+7001,(char*)&length_of_incoming_file,sizeof(long long));} */
     strcpy(tempblock + 1000, filename);
-/*  strcpy(tempblock+5555,cksum); */
     g_tape_posK +=
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    sprintf(tmp, "%s (fname=%s, size=%ld K)",
+    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
             marker_to_string(control_char), p,
             (long) length_of_incoming_file >> 10);
     log_msg(6, tmp);
-/*  log_tape_pos(); */
+    mr_free(tmp);
     return (0);
 }
@@ -1822 +1834 @@
 {
     /*@ buffer ***************************************************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
 
     /*@ end vars *************************************************** */
-    sprintf(tmp, "Wrong marker! (Should be %s, ",
-            marker_to_string(should_be));
-    sprintf(tmp + strlen(tmp), "is actually %s)", marker_to_string(it_is));
+    mr_asprintf(&tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
     log_to_screen(tmp);
+    mr_free(tmp);
 }