Changeset 1552


Ignore:
Timestamp:
Jul 24, 2007, 3:22:07 PM (12 years ago)
Author:
bruno
Message:

Fix bugs reported in #179

Location:
branches/2.2.5/mondo/src/common
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1437 r1552  
    33803380    /*@ pointers ************************************************** */
    33813381    char *pB;
    3382     FILE *fin, *fout;
     3382    FILE *fin = NULL, *fout = NULL;
    33833383
    33843384    /*@ bool ****************************************************** */
     
    34853485
    34863486    (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
    3487     fclose(fout);
     3487    paranoid_fclose(fout);
    34883488    length = totallength / optimal_set_size / 1024;
    34893489    log_msg(1, "Opening in %s; slicing it and writing to CD/tape",
  • branches/2.2.5/mondo/src/common/libmondo-filelist.c

    r1540 r1552  
    565565    char *file_to_analyze;
    566566    char *strtmp = NULL;
     567    char *tmp = NULL;
    567568    int i;
    568569
     
    587588        }
    588589        log_msg(8, "Analyzing %s", file_to_analyze);
    589         asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
     590        tmp = mr_stresc(file_to_analyze, "`$\\\"", '\\');
     591        asprintf(&strtmp, syscall_sprintf, tmp);
     592        paranoid_free(tmp);
    590593        asprintf(&syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE);
    591594        paranoid_free(strtmp);
     
    835838    assert(bkpinfo != NULL);
    836839
     840    strcpy(val_sz,"");
    837841    sprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
    838842    read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
  • branches/2.2.5/mondo/src/common/mr_string.c

    r843 r1552  
    6767                // Found it, skip the rest.
    6868                cnt++;
    69                 inptr++;
    7069                break;
    7170            }
    72             inptr++;
    7371            escptr++;
    7472        }
     73        inptr++;
    7574    }
    7675    inptr = instr;
     
    8483        while (*escptr != '\0') {
    8584            if (*inptr == *escptr) {
    86                 // Found it, skip the rest.
     85                // Found it, prepend with the escape char
    8786                *retptr = escchr;
    8887                retptr++;
     
    9897
    9998    return retstr;
    100 
    10199}
Note: See TracChangeset for help on using the changeset viewer.