Ignore:
Timestamp:
Jul 22, 2009, 2:03:44 PM (15 years ago)
Author:
Bruno Cornec
Message:
  • Fix a printing error in mindi for the tar command
  • Fix all mr_asprintf which had no second param as a string
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2285 r2290  
    226226        log_msg(5, "command='%s'", command);
    227227        res = system(command);
    228         mr_asprintf(&tmp, last_line_of_file(MONDO_LOGFILE));
     228        mr_asprintf(&tmp, "%s", last_line_of_file(MONDO_LOGFILE));
    229229        log_msg(1, "res=%d; tmp='%s'", res, tmp);
    230230        if (bkpinfo->use_star && (res == 254 || res == 65024)
    … …  
    541541
    542542    assert(bkpinfo != NULL);
    543     mr_asprintf(&tmp,
    544             "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
     543    mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
    545544            bkpinfo->exclude_paths);
    546545    mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
    … …  
    624623
    625624#ifdef __FreeBSD__
    626         mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     625        mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    627626               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
    628627        if (!bootdev[0]) {
    629628            mr_free(bootdev);
    630             mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     629            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    631630                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
    632631        }
    … …  
    634633        /* Linux */
    635634#ifdef __IA64__
    636         mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     635        mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    637636               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
    638637#else
    639         mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     638        mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    640639               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
    641640#endif
    … …  
    643642            mr_free(bootdev);
    644643#ifdef __IA64__
    645             mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     644            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    646645                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
    647646#else
    648             mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     647            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    649648                   ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
    650649#endif
    … …  
    652651        if (!bootdev[0]) {
    653652            mr_free(bootdev);
    654             mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     653            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    655654                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
    656655            if (strstr(bootdev, "/dev/cciss/")) {
    657656                mr_free(bootdev);
    658                 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
     657                mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
    659658                       ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
    660659            }
    … …  
    667666            ch = 'U';
    668667        if (bkpinfo->boot_loader != '\0') {
    669             mr_asprintf(&tmp, "User specified boot loader. It is '%c'.",
    670                     bkpinfo->boot_loader);
     668            mr_asprintf(&tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
    671669            log_msg(2, tmp);
    672670            mr_free(tmp);
    … …  
    675673        }
    676674        if (bkpinfo->boot_device[0] != '\0') {
    677             mr_asprintf(&tmp, "User specified boot device. It is '%s'.",
    678                     bkpinfo->boot_device);
     675            mr_asprintf(&tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
    679676            log_msg(2, tmp);
    680677            mr_free(tmp);
    … …  
    761758        mr_asprintf(&bootldr_str, "unknown");
    762759    }
    763     mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s",
    764             bootldr_str, bkpinfo->boot_device);
     760    mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
    765761    log_to_screen(tmp);
    766762    mr_free(tmp);
    … …  
    862858    estimated_total_noof_slices =
    863859        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
    864 /* add nfs stuff here? */
     860    /* add nfs stuff here? */
    865861    mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
    866862    if (system(command)) {
    … …  
    15091505                mr_free(media_usage_comment);
    15101506                if (res) {
    1511                     mr_asprintf(&tmp,
    1512                         "Failed to add archive %ld's files to CD dir\n",
     1507                    mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
    15131508                        storing_set_no);
    15141509                    log_to_screen(tmp);
    … …  
    17961791                }
    17971792                pause_for_N_seconds(5, "Letting DVD drive settle");
    1798                 mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s",
    1799                         bkpinfo->media_device);
     1793                mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
    18001794                log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
    18011795                res =
    … …  
    19851979    bool ret = TRUE;
    19861980
    1987     mr_asprintf(&command,
    1988             "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
    1989             bigfile_fname);
     1981    mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", bigfile_fname);
    19901982    log_msg(1, "command = '%s'", command);
    19911983    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
    … …  
    21062098                        "Calling ntfsclone in background because %s is an NTFS partition",
    21072099                        bigfile_fname);
    2108                 mr_asprintf(&sz_devfile, "%s/%d.%d.000",
    2109                         bkpinfo->tmpdir,
     2100                mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir,
    21102101                        (int) (random() % 32768),
    21112102                        (int) (random() % 32768));
    … …  
    22342225        log_msg(1, "EXAT'g set %ld", curr_set_no);
    22352226        if (g_getfattr) {
    2236             mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
    2237                 bkpinfo->tmpdir, curr_set_no);
     2227            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
    22382228            get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
    22392229        }
    22402230        if (g_getfacl) {
    2241             mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
    2242                 bkpinfo->tmpdir, curr_set_no);
     2231            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
    22432232            get_acl_list(curr_filelist_fname, curr_acl_list_fname);
    22442233        }
    … …  
    22502239        retval += res;
    22512240        if (res) {
    2252             mr_asprintf(&tmp,
    2253                     "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
    2254                     curr_set_no);
     2241            mr_asprintf(&tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
    22552242            log_to_screen(tmp);
    22562243            mr_free(tmp);
    … …  
    23042291
    23052292        if (res) {
    2306             mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
    2307                     curr_set_no);
     2293            mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no);
    23082294            log_to_screen(tmp);
    23092295            mr_free(tmp);
    … …  
    25142500            continue;
    25152501        }
    2516         mr_asprintf(&curr_file, cf);
     2502        mr_asprintf(&curr_file, "%s", cf);
    25172503        if (!does_file_exist(curr_file)) {
    25182504            log_msg(1,
    … …  
    25432529            continue;
    25442530        }
    2545         mr_asprintf(&curr_file, cf);
     2531        mr_asprintf(&curr_file, "%s", cf);
    25462532
    25472533        mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file, bkpinfo->scratchdir);
    … …  
    26182604            continue;
    26192605        }
    2620         mr_asprintf(&curr_file, cf);
     2606        mr_asprintf(&curr_file, "%s", cf);
    26212607        if (!does_file_exist(curr_file)) {
    26222608            log_msg(1,
    … …  
    26762662    char *cdrecord = NULL;
    26772663
    2678     mr_asprintf(&bkp, cdrw_dev);
     2664    mr_asprintf(&bkp, "%s", cdrw_dev);
    26792665    if (find_cdrw_device(cdrw_dev)) {
    26802666        strcpy(cdrw_dev, bkp);
    … …  
    28352821        eject_device(cdrom_dev);
    28362822        mds = media_descriptor_string(g_backup_media_type);
    2837         mr_asprintf(&tmp,
    2838                 "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
     2823        mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
    28392824                mds, g_current_media_number, mds);
    28402825        mr_free(mds);
    … …  
    30042989        mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
    30052990        log_it("command = %s", command);
    3006         mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     2991        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
    30072992        mr_free(command);
    30082993        log_it("res of it = %s", tmp);
    … …  
    30373022    strcpy(biggiestruct.checksum, checksum_line);
    30383023
    3039     mr_asprintf(&tmp, slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
     3024    mr_asprintf(&tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
    30403025    fout = fopen(tmp, "w");
    30413026    if (fout == NULL) {
    … …  
    30783063    }
    30793064    for (slice_num = 1; !finished; slice_num++) {
    3080         mr_asprintf(&curr_slice_fname_uncompressed, "%s",
    3081                slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir,
    3082                            ""));
    3083         mr_asprintf(&curr_slice_fname_compressed, "%s",
    3084                slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir,
    3085                            suffix));
    3086 
    3087         mr_asprintf(&tmp, percent_media_full_comment());
     3065        mr_asprintf(&curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
     3066        mr_asprintf(&curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
     3067
     3068        mr_asprintf(&tmp, "%s", percent_media_full_comment());
    30883069        update_progress_form(tmp);
    30893070        paranoid_free(tmp);
    … …  
    31173098            }
    31183099            if (should_I_compress_slices && bkpinfo->compression_level > 0) {
    3119                 mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe,
    3120                         bkpinfo->compression_level,
    3121                         curr_slice_fname_uncompressed);
     3100                mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe, bkpinfo->compression_level, curr_slice_fname_uncompressed);
    31223101                log_msg(2, command);
    31233102                if ((res = system(command))) {
    … …  
    31263105                //          did_I_compress_slice = TRUE;
    31273106            } else {
    3128                 mr_asprintf(&command, "mv %s %s 2>> %s",
    3129                         curr_slice_fname_uncompressed,
    3130                         curr_slice_fname_compressed, MONDO_LOGFILE);
     3107                mr_asprintf(&command, "mv %s %s 2>> %s", curr_slice_fname_uncompressed, curr_slice_fname_compressed, MONDO_LOGFILE);
    31313108                res = 0;        // don't do it :)
    31323109                //          did_I_compress_slice = FALSE;
    … …  
    31463123                mr_asprintf(&tmp, "Problem with slice # %ld", slice_num);
    31473124            } else {
    3148                 mr_asprintf(&tmp,
    3149                         "%s - Bigfile #%ld, slice #%ld compressed OK          ",
    3150                         biggie_filename, biggie_file_number + 1,
     3125                mr_asprintf(&tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1,
    31513126                        slice_num);
    31523127            }
    … …  
    31633138            paranoid_free(tmp);
    31643139
    3165             mr_asprintf(&file_to_archive, curr_slice_fname_compressed);
     3140            mr_asprintf(&file_to_archive, "%s", curr_slice_fname_compressed);
    31663141            g_current_progress++;
    31673142        } else {                /* if i==0 then ... */
    31683143
    31693144            finished = TRUE;
    3170             mr_asprintf(&file_to_archive, curr_slice_fname_uncompressed);
     3145            mr_asprintf(&file_to_archive, "%s", curr_slice_fname_uncompressed);
    31713146            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    31723147                break;
    … …  
    31893164        retval += res;
    31903165        if (res) {
    3191             mr_asprintf(&tmp,
    3192                     "Failed to add slice %ld of bigfile %ld to scratchdir",
    3193                     slice_num, biggie_file_number + 1);
     3166            mr_asprintf(&tmp, "Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
    31943167            log_to_screen(tmp);
    31953168            paranoid_free(tmp);
    … …  
    35323505            if (res) {
    35333506                mds = media_descriptor_string(bkpinfo->backup_media_type);
    3534                 mr_asprintf(&tmp,
    3535                         "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
     3507                mr_asprintf(&tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
    35363508                mr_free(mds);
    35373509                log_to_screen(tmp);
    … …  
    35403512            }
    35413513        }
    3542         mr_asprintf(&tmp,
    3543                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
    3544                 MONDO_LOGFILE, MONDO_CACHE);
     3514        mr_asprintf(&tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
    35453515        (void)system(tmp);
    35463516        mr_free(tmp);
    35473517
    3548         mr_asprintf(&tmp,
    3549                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
    3550                 MONDO_LOGFILE, MONDO_CACHE);
     3518        mr_asprintf(&tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
    35513519        (void)system(tmp);
    35523520        mr_free(tmp);
Note: See TracChangeset for help on using the changeset viewer.