Changeset 1176 in MondoRescue

Timestamp:

Feb 16, 2007, 2:16:14 PM (17 years ago)

Author:

Bruno Cornec

Message:

Some merges from stable (synchro for mem. mngt)

Location:

trunk/mondo/src/common

Files:

• libmondo-devices.c (modified) (8 diffs)
• libmondo-files.c (modified) (3 diffs)
• libmondo-fork.c (modified) (14 diffs)
• libmondo-mountlist.c (modified) (24 diffs)
• libmondo-raid.c (modified) (15 diffs)
• libmondo-stream.c (modified) (23 diffs)

trunk/mondo/src/common/libmondo-devices.c

@@ -19 +19 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
 
 #include <sys/ioctl.h>
@@ -41 +42 @@
 
 extern bool g_ISO_restore_mode;
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_selfmounted_isodir;
@@ -1093 +1093 @@
 
     FILE *pin = NULL;
-    bool retval;
+    bool retval = FALSE;
     size_t n = 0;
     assert_string_is_neither_NULL_nor_zerolength(format);
@@ -1112 +1112 @@
     if (!pin) {
         log_OS_error("Unable to read good formats");
-        retval = FALSE;
     } else {
         mr_getline(&good_formats, &n , pin);
@@ -1118 +1117 @@
             log_OS_error("Cannot pclose good formats");
         }
-        strip_spaces(good_formats);
+        mr_strip_spaces(good_formats);
         // " ntfs 7 " -- um, cheating much? :)
         mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
@@ -1126 +1125 @@
         if (strstr(good_formats, format_sz)) {
             retval = TRUE;
-        } else {
-            retval = FALSE;
         }
         mr_free(good_formats);
@@ -1693 +1690 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            /* BERLIOS: Useless
-            strip_spaces(bkpinfo->nfs_mount);
-            */
+            mr_strip_spaces(bkpinfo->nfs_mount);
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
@@ -2270 +2265 @@
     for (mr_getline(&current_drive, &n, pdrives); !feof(pdrives);
          mr_getline(&current_drive, &n, pdrives)) {
-        strip_spaces(current_drive);
+        mr_strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {

trunk/mondo/src/common/libmondo-files.c

@@ -18 +18 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
+
 #include "mr_mem.h"
-
+#include "mr_msg.h"
 #include "mr_file.h"
 
@@ -176 +177 @@
 void exclude_nonexistent_files(char *inout)
 {
-    char *infname;
-    char *outfname;
-    char *tmp;
+    char *infname = NULL;
+    char *outfname = NULL;
+    char *tmp = NULL;
     char *incoming = NULL;
 
@@ -944 +945 @@
     /*@ Char buffers ** */
     char *command = NULL;
-    char *tmp;
+    char *tmp = NULL;
     char old_pwd[MAX_STR_LEN];
 

trunk/mondo/src/common/libmondo-fork.c

@@ -4 +4 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -10 +13 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "mr_mem.h"
 
 extern bool g_text_mode;
@@ -164 +166 @@
 
     /*@ pointers *************************************************** */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -188 +190 @@
         *p = ' ';
     }                           /* single '=' is intentional */
-
 
     res = system(callstr);
@@ -208 +209 @@
     fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
     if (fin) {
-        for (mr_getline(&incoming, &n, fin); !feof(fin);
-             mr_getline(&incoming, &n, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
             /* patch by Heiko Schlittermann */
             p = incoming;
@@ -219 +219 @@
             }
             /* end of patch */
-            strip_spaces(incoming);
+            mr_strip_spaces(incoming);
             if ((res == 0 && log_if_success)
                 || (res != 0 && log_if_failure)) {
@@ -238 +238 @@
         }
     }
-//  else
-//    { mr_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }
@@ -339 +337 @@
 // if dir=='r' then copy from archived to orig
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
@@ -354 +353 @@
         fin = f_orig;
         fout = f_archived;
-        mr_asprintf(&tmp, "%-64s", PIMP_START_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
+        mr_asprintf(&tmp1, "%-64s", PIMP_START_SZ);
+        if (fwrite(tmp1, 1, 64, fout) != 64) {
             fatal_error("Can't write the introductory block");
         }
-        mr_free(tmp);
+        mr_free(tmp1);
 
         while (1) {
@@ -365 +364 @@
                 break;
             }
-            mr_asprintf(&tmp, "%-64ld", bytes_read_in);
-            if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_asprintf(&tmp1, "%-64ld", bytes_read_in);
+            if (fwrite(tmp1, 1, 64, fout) != 64) {
                 fatal_error("Cannot write introductory block");
             }
-            mr_free(tmp);
+            mr_free(tmp1);
 
             mr_msg(7,
@@ -375 +374 @@
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            mr_asprintf(&tmp, "%-64ld", subsliceno);
-            if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_asprintf(&tmp1, "%-64ld", subsliceno);
+            if (fwrite(tmp1, 1, 64, fout) != 64) {
                 fatal_error("Cannot write post-thingy block");
             }
-            mr_free(tmp);
+            mr_free(tmp1);
 
             mr_msg(7, "Subslice #%d written OK", subsliceno);
@@ -391 +390 @@
         fin = f_archived;
         fout = f_orig;
-        if (!(tmp = malloc(64L))) {
-            fatal_error("Failed to malloc() tmp");
-        }
+        tmp = mr_malloc(64L);
         if (fread(tmp, 1, 64L, fin) != 64L) {
             fatal_error("Cannot read the introductory block");
@@ -433 +430 @@
 
     if (direction == 'w') {
-        mr_free(tmp);
-        mr_asprintf(&tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64L, fout) != 64L) {
+        mr_asprintf(&tmp1, "%-64s", PIMP_END_SZ);
+        if (fwrite(tmp1, 1, 64L, fout) != 64L) {
             fatal_error("Can't write the final block");
         }
-        mr_free(tmp);
+        mr_free(tmp1);
     } else {
         mr_msg(1, "tmpA is %s", tmp);
@@ -468 +464 @@
             }
         }
-        mr_free(tmp);
     }
 
     mr_free(buf);
+    mr_free(tmp);
     mr_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);

trunk/mondo/src/common/libmondo-mountlist.c

@@ -2 +2 @@
    $Id$
 */
+
 
 /**
@@ -21 +22 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
-
-/**
- * A global copy of @c bkpinfo, to aid in debugging. As the name implies, <em>don't use this</em>.
- * @ingroup globalGroup
- */
-struct s_bkpinfo *g_bkpinfo_DONTUSETHIS = NULL;
 
 /**
@@ -77 +72 @@
     /*@ initialize ***************************************************** */
     prev_part_no = 0;
-    // BERLIOS: tmp[0] = '\0';
 
 
@@ -83 +77 @@
 
     if (physical_drive_size < 0) {
-        mr_asprintf(&tmp, " %s does not exist.", drive);
+        mr_asprintf(&tmp, "%s %s does not exist.", flaw_str, drive);
+        mr_free(flaw_str);
         flaws_str = tmp;
     } else {
@@ -225 +220 @@
             return ++res;       // fatal error
         }
+
+        mr_asprintf(&device, "%ss%d", drive, curr_part_no);
         // BERLIOS : useless ? mr_asprintf(&mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
-            mr_asprintf(&device, "%ss%d", drive, curr_part_no);
             /* gap in the partition list? */
             if (curr_part_no - prev_part_no > 1) {
@@ -346 +342 @@
                 res++;
             }
-            mr_free(device);
         } else {
             /* Check subpartitions */
             for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-                mr_asprintf(&device, "%ss%d%c", drive, curr_part_no,
-                         cur_sp_no);
+                mr_asprintf(&device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
                 pos = find_device_in_mountlist(mountlist, device);
                 if (pos < 0) {
@@ -446 +440 @@
                 amount_allocated += mountlist->el[pos].size / 1024;
                 prev_sp_no = cur_sp_no;
-                mr_free(device);
-            }
-        }
+            }
+        }
+        mr_free(device);
 
         /* OK, continue with main loop */
@@ -482 +476 @@
         flaws_str = tmp1;
         mr_free(tmp);
+        /* BERLIOS: Flawed since rev 1 !! */
+        res++;
     }
     if (res) {
@@ -521 +517 @@
 
     prev_part_no = 0;
-    // BERLIOS : useless ? tmp[0] = '\0';
-
 
     physical_drive_size = get_phys_size_of_drive(drive);
@@ -582 +576 @@
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
                 mr_asprintf(&tmp, " Gap between %s%d and %d.", drive,
-                         prev_part_no, curr_part_no);
+                        prev_part_no, curr_part_no);
                 log_it(tmp);
                 if (flaws_str) {
@@ -716 +710 @@
         flaws_str = tmp1;
         mr_free(tmp);
+        /* BERLIOS: Flawed since rev 1 !! - Is it sure ?? */
+        res++;
     }
 
@@ -743 +739 @@
 
     /*@ buffer *********************************************************** */
-    struct list_of_disks *drivelist;
-    char *tmp;
-    char *tmp1;
-    char *flaws_str;
+    struct list_of_disks *drivelist = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *flaws_str = NULL;
 
     /*@ int ************************************************************** */
@@ -856 +852 @@
             && strcmp(curr_mountpoint, "raid")) {
             mr_asprintf(&tmp, " %s %s's.", number_to_text(copies),
-                     curr_mountpoint);
+                    curr_mountpoint);
             log_it(tmp);
             mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
@@ -887 +883 @@
 
     /*@ buffers ********************************************************* */
-    char *drive;
-    char *tmp;
+    char *drive = NULL;
 
     long long size;
@@ -899 +894 @@
         mr_asprintf(&drive, mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            mr_asprintf(&tmp,
-                     "Not putting %s in list of drives: it's a virtual drive",
-                     drive);
-            mr_msg(8, tmp);
-            mr_free(tmp);
+            mr_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
             continue;
         }
@@ -909 +900 @@
         size = mountlist->el[lino].size;
         if (size == 0) {
-            mr_asprintf(&tmp,
-                     "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
-                     drive);
-            mr_msg(8, tmp);
-            mr_free(tmp);
+            mr_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
             continue;
         }
 
-/*
-      for (i = strlen (drive); isdigit (drive[i - 1]); i--);
-      drive[i] = '\0';
-      if (get_phys_size_of_drive (drive) <= 0 && drive[i - 1] == 'p')
-    {
-      i--;
-      drive[i] = '\0';
-    }
-      for (j = 0; j < noof_drives && strcmp (drivelist[j], drive) != 0; j++);
-*/
-
-        mr_asprintf(&tmp,
-                 "Putting %s with size %lli in list of drives",
-                 drive, size);
-        mr_msg(8, tmp);
-        mr_free(tmp);
+        mr_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
         (void) truncate_to_drive_name(drive);
@@ -960 +932 @@
  */
 void make_list_of_unallocated_raid_partitions(struct mountlist_itself
-                                              *output_list, struct mountlist_itself
-                                              *mountlist, struct raidlist_itself
+                                              *output_list,
+                                              struct mountlist_itself
+                                              *mountlist,
+                                              struct raidlist_itself
                                               *raidlist)
 {
@@ -971 +945 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp;
+    char *tmp = NULL;
 
     assert(output_list != NULL);
@@ -1043 +1017 @@
 int load_mountlist(struct mountlist_itself *mountlist, char *fname)
 {
-    FILE *fin;
+    FILE *fin = NULL;
     /* malloc ** */
     char *incoming = NULL;
-    char *siz;
-    char *tmp;
-    char *p;
-
-    int items;
-    int j;
+    char *siz = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
+
+    int items = 0;
+    int j = 0;
     size_t n = 0;
 
     assert(mountlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    malloc_string(siz);
+
     if (!(fin = fopen(fname, "r"))) {
         log_it("Unable to open mountlist - '%s'", fname);
         log_to_screen(_("Cannot open mountlist"));
-        mr_free(siz);
         return (1);
     }
-    items = 0;
+    malloc_string(siz);
     mr_getline(&incoming, &n, fin);
     log_it("Loading mountlist...");
@@ -1130 +1103 @@
             mr_free(tmp);
 
-            mr_asprintf(&tmp,
-                     "%s %s %s %lld %s",
+            log_it("%s %s %s %lld %s",
                      mountlist->el[items].device,
                      mountlist->el[items].mountpoint,
@@ -1137 +1109 @@
                      mountlist->el[items].size,
                      mountlist->el[items].label);
-
-            log_it(tmp);
-            mr_free(tmp);
             items++;
         }
@@ -1149 +1118 @@
 
     log_it("Mountlist loaded successfully.");
-    mr_asprintf(&tmp, "%d entries in mountlist", items);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("%d entries in mountlist", items);
 
     mr_free(siz);
     return (0);
 }
-
 
 
@@ -1256 +1222 @@
 {
     /*@ mallocs *** */
-    char *device;
-    char *mountpoint;
-    char *format;
+    char *device = NULL;
+    char *mountpoint = NULL;
+    char *format = NULL;
 
     long long size;
@@ -1283 +1249 @@
 
     mountlist->el[b].size = size;
+    mr_free(device);
+    mr_free(mountpoint);
+    mr_free(format);
 }
 

trunk/mondo/src/common/libmondo-raid.c

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_str.h"
+#include "mr_mem.h"
+#include "mr_msg.h"
+
 #include "mondostructures.h"
 #include "newt-specific-EXT.h"
@@ -16 +19 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-raid.h"
-#include "mr_mem.h"
-#include "mr_str.h"
-#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -47 +47 @@
 #else
     /*@ buffer ********************************************************** */
-    char *command;
-    int res;
+    char *command = NULL;
+    int res = 0;
 
     if (raidno == -1) {
@@ -228 +228 @@
 #endif
 
+
 /**
  * Save the additional RAID variables to a stream.
@@ -316 +317 @@
 #ifdef __FreeBSD__
     int i, j;
+    char *org = NULL;
 
     fprintf(fout, "\nvolume %s\n", raidrec->volname);
     for (i = 0; i < raidrec->plexes; ++i) {
-        char *org;
         switch (raidrec->plex[i].raidlevel) {
         case -1:
-            mr_asprintf(&org, "%s", "concat");
+            mr_asprintf(&org, "concat");
             break;
         case 0:
-            mr_asprintf(&org, "%s", "striped");
+            mr_asprintf(&org, "striped");
             break;
         case 5:
-            mr_asprintf(&org, "%s", "raid5");
+            mr_asprintf(&org, "raid5");
             break;
         }
@@ -422 +423 @@
     for (mr_getline(&incoming, &n, fin); !feof(fin);
          mr_getline(&incoming, &n, fin)) {
-        strip_spaces(incoming);
+        mr_strip_spaces(incoming);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {
@@ -450 +451 @@
                                char *fname)
 {
-    FILE *fin;
-    char *tmp1;
-    int items;
+    FILE *fin = NULL;
+    int items = 0;
 
     raidlist->spares.entries = 0;
@@ -499 +499 @@
             }
         } else if (!strcmp(argv[0], "volume")) {
-            char *volname;
+            char *volname = NULL;
             if (argc < 2)
                 continue;
@@ -508 +508 @@
         } else if (!strcmp(argv[0], "plex")) {
             int raidlevel, stripesize;
-            char *org = 0;
-            char **tmp = 0;
+            char *org = NULL;
+            char **tmp = NULL;
             if (argc < 3)
                 continue;
@@ -546 +546 @@
         } else if ((!strcmp(argv[0], "sd"))
                    || (!strcmp(argv[0], "subdisk"))) {
-            char *drive = 0;
+            char *drive = NULL;
             if (argc < 3)
                 continue;
@@ -565 +565 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    mr_asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
-    log_it(tmp1);
-    mr_free(tmp1);
+    log_it("%d RAID devices in raidtab", raidlist->entries);
     return (0);
 }
@@ -647 +645 @@
 
     /*@ add mallocs * */
-    char *tmp = NULL;
     char *labelB = NULL;
     char *valueB = NULL;
@@ -701 +698 @@
         }
         if (!disklist) {
-            mr_asprintf(&tmp,
-                     "Ignoring '%s %s' pair of disk %s", labelB, valueB,
-                     label);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Ignoring '%s %s' pair of disk %s", labelB, valueB,
+                    label);
         } else {
             add_disk_to_raid_device(disklist, value, atoi(valueB));
@@ -932 +926 @@
   const char delims[] = " ";
 
-  FILE   *fin;
-  int    row, i, index_min;
+  FILE *fin = NULL;
+  int row = 0;
+  int i = 0;
+  int index_min = 0;
   int lastpos = 0;
   size_t len = 0;
-  char   *token;
+  char *token = NULL;
   char *string = NULL;
-  char *pos;
-  char type;
-  char *strtmp;
+  char *pos = NULL;
+  char type = NULL;
+  char *strtmp = NULL;
 
   // open file
@@ -982 +978 @@
     mr_asprintf(&strtmp,"%s%s", device_prefix, token);
     raidlist->el[raidlist->entries].raid_device = strtmp;
+    mr_free(strtmp);
     mr_free(token);
     // skip ':' and status

trunk/mondo/src/common/libmondo-stream.c

@@ -14 +14 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -23 +25 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-fifo-EXT.h"
-#include "mr_mem.h"
 
 #define EXTRA_TAPE_CHECKSUMS
 
+/*@unused@*/
+//static char cvsid[] = "$Id$";
 extern bool g_sigpipe;
 extern int g_tape_buffer_size_MB;
@@ -132 +135 @@
     }
     mr_free(blk);
-    mr_free((void *)g_tapecatalog);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -151 +154 @@
 
     /*@ long long's ************************************************* */
-    int i;
-    char *blk;
+    int i = 0;
+    char *blk = NULL;
 
     blk = (char *) mr_malloc(256 * 1024);
@@ -186 +189 @@
     }
     mr_free(blk);
-    mr_free((void *)g_tapecatalog);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -251 +254 @@
 
     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);
+            "%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);
     tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
@@ -264 +267 @@
 
     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);
+            "%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);
     mr_free(cdr_exe);
 
@@ -339 +342 @@
     }
 }
+
 
 int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo,
@@ -450 +454 @@
 {
     int i;
-    char *tmp;
+    char *tmp = NULL;
 
     log_it("Insisting on tape #%d", tapeno);
@@ -488 +492 @@
 
 
-
-
 /**
  * Add a file to a collection of recently archived filesets/slices.
@@ -507 +509 @@
     int last, curr, i;
     t_archtype type = other;
-    char *command;
-    char *tmpdir;
-    char *old_fname;
+    char *command = NULL;
+    char *tmpdir = NULL;
+    char *old_fname = NULL;
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
-    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -522 +523 @@
             ("Unknown type. Internal error in maintain_collection_of_recent_archives()");
     }
+
+    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     mkdir(tmpdir, 0x700);
     mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
@@ -603 +606 @@
 {
     /*@ buffer ***************************************************** */
-    char *datablock;
-    char *tmp;
+    char *datablock = NULL;
+    char *tmp = NULL;
     char old_cwd[MAX_STR_LEN];
-    char *outfname;
+    char *outfname = NULL;
     /*@ int ******************************************************* */
     int i;
@@ -649 +652 @@
     log_to_screen(_("Reading stream"));
     log_it("stream device = '%s'", bkpinfo->media_device);
-/* skip data disks */
+    /* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
     log_to_screen(_("Skipping data disks on stream"));
@@ -712 +715 @@
 {
     /*@ buffers ***************************************************** */
-    char *command;
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
@@ -832 +835 @@
 {
     /*@ buffers ***************************************************** */
-    char *tmp;
-    char *datablock;
+    char *tmp = NULL;
+    char *datablock = NULL;
     char *temp_fname = (char *)bkpinfo; /* Should NOT be NULL */
     char *temp_cksum = (char *)bkpinfo; /* Should NOT be NULL */
-    char *actual_cksum;
+    char *actual_cksum = NULL;
 
     /*@ int ********************************************************* */
@@ -1289 +1292 @@
 {
     int res = 0;
-    char *command;
+    char *command = NULL;
 
     paranoid_pclose(g_tape_stream);
@@ -1348 +1351 @@
 {
     int i, last, res = 0;
-    char *fname;
+    char *fname = NULL;
 
     mr_msg(2, "I am now writing back catalog to tape");
@@ -1387 +1390 @@
 {
     /*@ pointers *************************************************** */
-    FILE *fin;
-    char *tmp;
+    FILE *fin = NULL;
+    char *tmp = NULL;
 
     /*@ long ******************************************************* */
@@ -1449 +1452 @@
 {
     /*@ buffers **************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char datablock[TAPE_BLOCK_SIZE];
-    char *checksum;
-    char *infile_basename;
+    char *checksum = NULL;
+    char *infile_basename = NULL;
 
     /*@ int ******************************************************** */
@@ -1570 +1573 @@
     /*@ buffers **************************************************** */
     char tempblock[TAPE_BLOCK_SIZE];
-    char *tmp;
     char *p;
 
@@ -1603 +1605 @@
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
-             marker_to_string(control_char), p,
-             (long) length_of_incoming_file >> 10);
-    mr_msg(6, tmp);
-    mr_free(tmp);
+    mr_msg(6, "%s (fname=%s, size=%ld K)",
+            marker_to_string(control_char), p,
+            (long) length_of_incoming_file >> 10);
     return (0);
 }
@@ -1620 +1620 @@
 {
     /*@ buffer ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;