Ignore:
Timestamp:
Nov 6, 2007, 1:37:38 AM (12 years ago)
Author:
Bruno Cornec
Message:

Continue on configuration file items (compression)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1663 r1769  
    12941294 * @param bkpinfo The backup information structure. Fields used:
    12951295 * - @c bkpinfo->restore_path
    1296  * - @c bkpinfo->zip_exe
     1296 * - @c bkpinfo->compression_tool
    12971297 * @param orig_bf_fname The original filename of the biggiefile.
    12981298 * @param biggiefile_number The number of the biggiefile (starting from 0).
     
    14331433    }
    14341434
    1435     if (!bkpinfo->zip_exe[0]) {
     1435    if (!bkpinfo->compression_tool) {
    14361436        mr_asprintf(&command, "cat > \"%s\"", file_to_openout);
    14371437    } else {
    1438         mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
     1438        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->compression_tool,
    14391439                file_to_openout, MONDO_LOGFILE);
    14401440    }
     
    17581758 * - @c bkpinfo->backup_media_type
    17591759 * - @c bkpinfo->media_device
    1760  * - @c bkpinfo->zip_exe
     1760 * - @c bkpinfo->compression_tool
    17611761 * @param tarball_fname The filename of the afioball to restore.
    17621762 * @param current_tarball_number The number (starting from 0) of the fileset
     
    18201820            mr_asprintf(&executable, " -bz");
    18211821        } else {
    1822             mr_asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
     1822            mr_asprintf(&executable, "-P %s -Z", bkpinfo->compression_tool);
    18231823        }
    18241824    }
     
    29402940    }
    29412941
    2942     if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
    2943         if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
    2944             system("mount " MNT_CDROM);
    2945         }
    2946         bkpinfo->compression_level = 1;
    2947         g_current_media_number = 2;
    2948         strcpy(bkpinfo->restore_path, "/tmp/TESTING");
    2949         bkpinfo->backup_media_type = dvd;
    2950         open_progress_form(_("Reassembling /dev/hda1"),
    2951                            _("Shark is a bit of a silly person."),
    2952                            _("Please wait. This may take some time."),
    2953                            "", 1999);
    2954         system("rm -Rf /tmp/*pih*");
    2955 
    2956         malloc_string(tmp);
    2957         restore_a_biggiefile_from_CD(42, NULL, tmp);
    2958         mr_free(tmp);
    2959     }
    2960 
    29612942    if (argc == 5 && strcmp(argv[1], "--common") == 0) {
    29622943        mr_conf->log_level = 6;
Note: See TracChangeset for help on using the changeset viewer.