Ignore:
Timestamp:
Sep 29, 2013, 9:31:34 AM (7 years ago)
Author:
Bruno Cornec
Message:
  • Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:
1 edited

Legend:

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

    r3161 r3193  
    582582                    log_msg(1, "Restoring subset");
    583583                    retval += restore_everything(filelist);
     584                    free_filelist(filelist);
    584585                } else {
    585586                    mr_free(bkpinfo->restore_path);
     
    839840                        "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
    840841
    841     mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     842    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
    842843    res = run_program_and_log_output(tmp, TRUE);
    843     mr_free(tmp);
     844    mr_free(tmp1);
    844845    if (res) {
    845846        log_to_screen("label-partitions-as-necessary returned an error");
     
    20452046    int res;
    20462047    int attempts;
    2047     long current_tarball_number = 0;
     2048    long current_tarball_number = 0L;
    20482049    long max_val;
    20492050  /**malloc ***/
     
    26202621    mr_free(tmp1);
    26212622
     2623    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
     2624    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
     2625
     2626
     2627
    26222628    /* Init GUI */
    26232629    setup_newt_stuff();         /* call newtInit and setup screen log */
     
    26662672
    26672673    log_it("what time is it");
    2668 
    2669     mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
    2670     raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
    26712674
    26722675    /* Process command-line parameters */
     
    27992802        mount_boot_if_necessary();  /* for Gentoo users */
    28002803        log_msg(2, "Still here.");
    2801         /* Adding an initialisation in order to avoid to hndle NULL pointer later */
     2804        /* Adding an initialisation in order to avoid to handle NULL pointer later */
    28022805        mr_free(bkpinfo->restore_path);
    28032806        mr_asprintf(bkpinfo->restore_path, "%s", "/tmp");
Note: See TracChangeset for help on using the changeset viewer.