Changeset 1136


Ignore:
Timestamp:
Feb 11, 2007, 2:20:53 PM (12 years ago)
Author:
bruno
Message:

Typo + new libmondo-archive.c merges

Location:
branches/stable/mondo/src
Files:
2 edited

Legend:

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

    r1135 r1136  
    16921692
    16931693
    1694 
    1695 
    16961694/**
    16971695 * Create an ISO image in @c destfile, from files in @c bkpinfo->scratchdir.
     
    17721770    mr_free(tmp3);
    17731771    if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
    1774         popup_and_OK("Please insert new media and press Enter.");
     1772        popup_and_OK(_("Please insert new media and press Enter."));
    17751773    }
    17761774
    17771775    mr_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
    17781776            bkpinfo->scratchdir, destfile);
     1777    /* BERLIOS: Do not ignore getcwd result */
    17791778    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
    17801779    sprintf(tmp, "chmod 744 %s", bkpinfo->scratchdir);
     
    18361835                    ("Failed to write to disk. I shall blank it and then try again.");
    18371836                sleep(5);
    1838                 system("sync");
     1837                sync();
    18391838                pause_for_N_seconds(5, "Letting DVD drive settle");
    18401839
    1841 // dvd+rw-format --- OPTION 2
     1840                // dvd+rw-format --- OPTION 2
    18421841                if (!bkpinfo->please_dont_eject) {
    18431842                    log_to_screen("Ejecting media to clear drive status.");
     
    20292028
    20302029
    2031 
    2032 
    2033 
    2034 
    2035 
    2036 
    2037 
    20382030bool is_dev_an_NTFS_dev(char *bigfile_fname)
    20392031{
     
    20412033    char *command;
    20422034    malloc_string(tmp);
     2035
    20432036    malloc_string(command);
    20442037    sprintf(command,
  • branches/stable/mondo/src/lib/mr_file.c

    r1135 r1136  
    4747void mr_fclose_int(FILE **fd, int line, char *file) {
    4848
    49     if (**fd == NULL) {
     49    if (fd == NULL) {
    5050        mr_msg_int(1,line,file,"fd is NULL.\nShould NOT happen.");
    5151        mr_exit(-1,"Exiting");
Note: See TracChangeset for help on using the changeset viewer.