Changeset 1689 for branches/2.2.5


Ignore:
Timestamp:
Oct 20, 2007, 8:13:28 PM (12 years ago)
Author:
bruno
Message:

Compilation fixes

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

    r1688 r1689  
    972972        fatal_error("Unknown backup_media_type");
    973973    }
    974     if (bkpinfo->backup_media_type == usb) {
    975            asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
    976    } else {
    977            asprintf(&tmp2,"");
    978    }
    979 -
     974    if (bkpinfo->backup_media_type == usb) {
     975        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
     976    } else {
     977        asprintf(&tmp2," ");
     978    }
    980979
    981980    sprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
     
    18671866    char *tmp = NULL;
    18681867    char *tmp1 = NULL;
     1868    char *result_sz = NULL;
    18691869    char *message_to_screen = NULL;
    18701870    char *old_pwd;
     
    19011901    run_program_and_log_output(tmp, FALSE);
    19021902    paranoid_free(tmp);
    1903     paranoid_free(tmp1);
    19041903
    19051904    if (bkpinfo->nonbootable_backup) {
     
    19081907        log_msg(1, "Making bootable backup");
    19091908
    1910         asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, ); /* Command to execute */
     1909        asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, tmp1); /* Command to execute */
    19111910        res = eval_call_to_make_USB(tmp, message_to_screen);
    19121911        if (res) {
     
    19211920    }
    19221921    paranoid_free(message_to_screen);
     1922    paranoid_free(tmp1);
    19231923
    19241924    if (is_this_device_mounted(bkpinfo->media_device)) {
  • branches/2.2.5/mondo/src/common/libmondo-fork-EXT.h

    r1647 r1689  
    55                                         char *what_i_am_doing);
    66extern int run_program_and_log_output(char *program, int);
     7extern int eval_call_to_make_USB(char *call,
     8                                 char *what_i_am_doing);
    79extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
    810                                 int cd_no, char *logstub,
  • branches/2.2.5/mondo/src/common/libmondo-fork.h

    r1647 r1689  
    88int run_program_and_log_to_screen(char *basic_call, char *what_i_am_doing);
    99int run_program_and_log_output(char *program, int);
     10int eval_call_to_make_USB(char *call, char *what_i_am_doing);
    1011int eval_call_to_make_ISO(char *basic_call, char *isofile,
    1112                          int cd_no, char *logstub, char *what_i_am_doing);
Note: See TracChangeset for help on using the changeset viewer.