Changeset 1904 in MondoRescue for branches/stable/mondo


Ignore:
Timestamp:
Apr 10, 2008, 1:20:42 AM (16 years ago)
Author:
Bruno Cornec
Message:

merge -r 1889:1902 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.6

Location:
branches/stable/mondo
Files:
1 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r1903 r1904  
    29072907
    29082908    (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
    2909     mr_fclose(fout);
     2909    if (fout) {
     2910        mr_fclose(fout);
     2911    }
    29102912    length = totallength / optimal_set_size / 1024;
    29112913    mr_msg(1, "Opening in %s; slicing it and writing to CD/tape",

  • branches/stable/mondo/src/common/libmondo-mountlist.c

    r1663 r1904  
    847847               mountlist->el[items].mountpoint,
    848848               mountlist->el[items].format,
    849                siz, mountlist->el[items].label, mountlist->el[items].uuid);
     849               siz, mountlist->el[items].label);
    850850#elif __FreeBSD__
    851851        sscanf(incoming,
    … …  
    855855               mountlist->el[items].format, siz);
    856856        strcpy(mountlist->el[items].label, "");
    857         strcpy(mountlist->el[items].uuid, "");
    858857#endif
    859858
    … …  
    910909                     mountlist->el[items].format,
    911910                     mountlist->el[items].size,
    912                     mountlist->el[items].label,
    913                     mountlist->el[items].uuid);
     911                    mountlist->el[items].label);
    914912            items++;
    915913        }
    … …  
    953951                mountlist->el[i].device, mountlist->el[i].mountpoint,
    954952                mountlist->el[i].format, mountlist->el[i].size,
    955                 mountlist->el[i].label, mountlist->el[i].uuid);
     953                mountlist->el[i].label);
    956954    }
    957955    paranoid_fclose(fout);

  • branches/stable/mondo/src/common/libmondo-stream.c

    r1903 r1904  
    850850
    851851    /*@ long    ***************************************************** */
    852     long bytes_to_write = 0;
     852    long bytes_to_write = 0L;
    853853
    854854    /*@ long long *************************************************** */

  • branches/stable/mondo/src/common/mondostructures.h

    r1817 r1904  
    3535
    3636  /**
    37    * For ext2 and ext3, this is the filesystem label (if there is one). If not, this should be "".
     37   * For ext2 and ext3, this is the filesystem label or uuid (if there is one). If not, this should be "".
    3838   */
    3939    char label[256];
    4040
    41     /**
    42      * This is the filesystem UUID (if there is one). If not, this should be "".
    43      */
    44     char uuid[64];
    4541};
    4642

  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1903 r1904  
    28832883    make_hole_for_dir(MONDO_CACHE);
    28842884
    2885 /* Backup original mountlist.txt */
     2885    /* Backup original mountlist.txt */
    28862886    mr_asprintf(&tmp, "%s.orig", g_mountlist_fname);
    28872887    if (!does_file_exist(g_mountlist_fname)) {
    … …  
    28972897    mr_free(tmp);
    28982898
    2899 /* Init directories */
     2899    /* Init directories */
    29002900    make_hole_for_dir("/var/log");
    29012901    make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
Note: See TracChangeset for help on using the changeset viewer.