Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/archival/libunarchive/get_header_cpio.c

    r821 r1770  
     1/* vi: set sw=4 ts=4: */
    12/* Copyright 2002 Laurence Anderson
    23 *
     
    45 */
    56
    6 #include <stdio.h>
    7 #include <stdlib.h>
    8 #include <string.h>
    9 #include <unistd.h>
    10 #include <sys/sysmacros.h>     /* major() and minor() */
     7#include "libbb.h"
    118#include "unarchive.h"
    12 #include "libbb.h"
    139
    1410typedef struct hardlinks_s {
    15     file_header_t *entry;
     11    char *name;
    1612    int inode;
    1713    struct hardlinks_s *next;
     
    2117{
    2218    static hardlinks_t *saved_hardlinks = NULL;
    23     static unsigned short pending_hardlinks = 0;
     19    static unsigned pending_hardlinks = 0;
     20    static int inode;
     21
    2422    file_header_t *file_header = archive_handle->file_header;
    2523    char cpio_header[110];
    2624    int namesize;
    2725    char dummy[16];
    28     int major, minor, nlink, inode;
     26    int major, minor, nlink;
    2927
    3028    if (pending_hardlinks) { /* Deal with any pending hardlinks */
    31         hardlinks_t *tmp;
    32         hardlinks_t *oldtmp;
     29        hardlinks_t *tmp, *oldtmp;
    3330
    3431        tmp = saved_hardlinks;
    3532        oldtmp = NULL;
    3633
     34        file_header->link_target = file_header->name;
     35        file_header->size = 0;
     36
    3737        while (tmp) {
    38             bb_error_msg_and_die("need to fix this\n");
    39             if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
    40                 file_header = tmp->entry;
    41                 if (oldtmp) {
    42                     oldtmp->next = tmp->next; /* Remove item from linked list */
    43                 } else {
    44                     saved_hardlinks = tmp->next;
    45                 }
    46                 free(tmp);
     38            if (tmp->inode != inode) {
     39                tmp = tmp->next;
    4740                continue;
    4841            }
     42
     43            file_header->name = tmp->name;
     44
     45            if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
     46                archive_handle->action_data(archive_handle);
     47                archive_handle->action_header(archive_handle->file_header);
     48            }
     49
     50            pending_hardlinks--;
     51
    4952            oldtmp = tmp;
    5053            tmp = tmp->next;
     54            free(oldtmp->name);
     55            free(oldtmp);
     56            if (oldtmp == saved_hardlinks)
     57                saved_hardlinks = tmp;
    5158        }
    52         pending_hardlinks = 0; /* No more pending hardlinks, read next file entry */
     59
     60        file_header->name = file_header->link_target;
     61
     62        if (pending_hardlinks > 1) {
     63            bb_error_msg("error resolving hardlink: archive made by GNU cpio 2.0-2.2?");
     64        }
     65
     66        /* No more pending hardlinks, read next file entry */
     67        pending_hardlinks = 0;
    5368    }
    5469
     
    5772
    5873    if (archive_xread_all_eof(archive_handle, (unsigned char*)cpio_header, 110) == 0) {
    59         return(EXIT_FAILURE);
     74        return EXIT_FAILURE;
    6075    }
    6176    archive_handle->offset += 110;
    6277
    63     if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) {
    64         bb_error_msg_and_die("Unsupported cpio format, use newc or crc");
     78    if (strncmp(&cpio_header[0], "07070", 5) != 0
     79     || (cpio_header[5] != '1' && cpio_header[5] != '2')
     80    ) {
     81        bb_error_msg_and_die("unsupported cpio format, use newc or crc");
    6582    }
    6683
    6784    {
    68         unsigned long tmpsize;
    69         sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
     85        unsigned long tmpsize;
     86        sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
    7087            dummy, &inode, (unsigned int*)&file_header->mode,
    7188            (unsigned int*)&file_header->uid, (unsigned int*)&file_header->gid,
    7289            &nlink, &file_header->mtime, &tmpsize,
    7390            dummy, &major, &minor, &namesize, dummy);
    74         file_header->size = tmpsize;
     91        file_header->size = tmpsize;
    7592    }
    7693
    77     file_header->name = (char *) xzalloc(namesize + 1);
    78     archive_xread_all(archive_handle, file_header->name, namesize); /* Read in filename */
     94    free(file_header->name);
     95    file_header->name = xzalloc(namesize + 1);
     96    /* Read in filename */
     97    xread(archive_handle->src_fd, file_header->name, namesize);
    7998    archive_handle->offset += namesize;
    8099
     
    83102
    84103    if (strcmp(file_header->name, "TRAILER!!!") == 0) {
    85         printf("%d blocks\n", (int) (archive_handle->offset % 512 ? (archive_handle->offset / 512) + 1 : archive_handle->offset / 512)); /* Always round up */
     104        /* Always round up */
     105        printf("%d blocks\n", (int) (archive_handle->offset % 512 ?
     106                                     archive_handle->offset / 512 + 1 :
     107                                     archive_handle->offset / 512
     108                                    ));
    86109        if (saved_hardlinks) { /* Bummer - we still have unresolved hardlinks */
    87110            hardlinks_t *tmp = saved_hardlinks;
    88111            hardlinks_t *oldtmp = NULL;
    89112            while (tmp) {
    90                 bb_error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
     113                bb_error_msg("%s not created: cannot resolve hardlink", tmp->name);
    91114                oldtmp = tmp;
    92115                tmp = tmp->next;
    93                 free (oldtmp->entry->name);
    94                 free (oldtmp->entry);
    95                 free (oldtmp);
     116                free(oldtmp->name);
     117                free(oldtmp);
    96118            }
    97119            saved_hardlinks = NULL;
    98120            pending_hardlinks = 0;
    99121        }
    100         return(EXIT_FAILURE);
     122        return EXIT_FAILURE;
    101123    }
    102124
    103125    if (S_ISLNK(file_header->mode)) {
    104         file_header->link_name = (char *) xzalloc(file_header->size + 1);
    105         archive_xread_all(archive_handle, file_header->link_name, file_header->size);
     126        file_header->link_target = xzalloc(file_header->size + 1);
     127        xread(archive_handle->src_fd, file_header->link_target, file_header->size);
    106128        archive_handle->offset += file_header->size;
    107129        file_header->size = 0; /* Stop possible seeks in future */
    108130    } else {
    109         file_header->link_name = NULL;
     131        file_header->link_target = NULL;
    110132    }
    111133    if (nlink > 1 && !S_ISDIR(file_header->mode)) {
     
    114136            new->next = saved_hardlinks;
    115137            new->inode = inode;
    116             new->entry = file_header;
     138            /* name current allocated, freed later */
     139            new->name = file_header->name;
     140            file_header->name = NULL;
    117141            saved_hardlinks = new;
    118             return(EXIT_SUCCESS); // Skip this one
    119         } else { /* Found the file with data in */
    120             hardlinks_t *tmp = saved_hardlinks;
    121             pending_hardlinks = 1;
    122             while (tmp) {
    123                 if (tmp->inode == inode) {
    124                     tmp->entry->link_name = bb_xstrdup(file_header->name);
    125                     nlink--;
    126                 }
    127                 tmp = tmp->next;
    128             }
    129             if (nlink > 1) {
    130                 bb_error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
    131             }
     142            return EXIT_SUCCESS; /* Skip this one */
    132143        }
     144        /* Found the file with data in */
     145        pending_hardlinks = nlink;
    133146    }
    134147    file_header->device = makedev(major, minor);
     
    143156    archive_handle->offset += file_header->size;
    144157
    145     free(file_header->link_name);
     158    free(file_header->link_target);
    146159
    147     return (EXIT_SUCCESS);
     160    return EXIT_SUCCESS;
    148161}
Note: See TracChangeset for help on using the changeset viewer.