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/editors/patch.c

    r821 r1770  
    1616 *  Issues
    1717 *   - Non-interactive
    18  *   - Patches must apply cleanly or the hunk will fail.
     18 *   - Patches must apply cleanly or patch (not just one hunk) will fail.
    1919 *   - Reject file isnt saved
    20  *   -
    2120 */
    2221
    2322#include <getopt.h>
    24 #include <string.h>
    25 #include <stdlib.h>
    26 #include <unistd.h>
    27 #include "busybox.h"
     23
     24#include "libbb.h"
    2825
    2926static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int lines_count)
     
    3330    while (src_stream && (i < lines_count)) {
    3431        char *line;
    35         line = bb_get_line_from_file(src_stream);
     32        line = xmalloc_fgets(src_stream);
    3633        if (line == NULL) {
    3734            break;
    3835        }
    3936        if (fputs(line, dest_stream) == EOF) {
    40             bb_perror_msg_and_die("Error writing to new file");
     37            bb_perror_msg_and_die("error writing to new file");
    4138        }
    4239        free(line);
     
    4441        i++;
    4542    }
    46     return(i);
     43    return i;
    4744}
    4845
     
    5956
    6057    /* Terminate string at end of source filename */
    61     temp = strchr(filename_start_ptr, '\t');
    62     if (temp) *temp = 0;
    63 
    64     /* skip over (patch_level) number of leading directories */
     58    temp = strchrnul(filename_start_ptr, '\t');
     59    *temp = '\0';
     60
     61    /* Skip over (patch_level) number of leading directories */
     62    if (patch_level == -1)
     63        patch_level = INT_MAX;
    6564    for (i = 0; i < patch_level; i++) {
    66         if(!(temp = strchr(filename_start_ptr, '/'))) break;
     65        temp = strchr(filename_start_ptr, '/');
     66        if (!temp)
     67            break;
    6768        filename_start_ptr = temp + 1;
    6869    }
    6970
    70     return(bb_xstrdup(filename_start_ptr));
     71    return xstrdup(filename_start_ptr);
    7172}
    7273
     
    7475{
    7576    struct stat statbuf;
    76     return(stat(filename, &statbuf));
    77 }
    78 
     77    return stat(filename, &statbuf);
     78}
     79
     80int patch_main(int argc, char **argv);
    7981int patch_main(int argc, char **argv)
    8082{
     
    8688    {
    8789        char *p, *i;
    88         ret = bb_getopt_ulflags(argc, argv, "p:i:", &p, &i);
     90        ret = getopt32(argv, "p:i:", &p, &i);
    8991        if (ret & 1)
    90             patch_level = bb_xgetlarg(p, 10, -1, USHRT_MAX);
     92            patch_level = xatol_range(p, -1, USHRT_MAX);
    9193        if (ret & 2) {
    92             patch_file = bb_xfopen(i, "r");
     94            patch_file = xfopen(i, "r");
    9395        } else {
    9496            patch_file = stdin;
     
    9799    }
    98100
    99     patch_line = bb_get_line_from_file(patch_file);
     101    patch_line = xmalloc_getline(patch_file);
    100102    while (patch_line) {
    101103        FILE *src_stream;
     
    116118        while (patch_line && strncmp(patch_line, "--- ", 4) != 0) {
    117119            free(patch_line);
    118             patch_line = bb_get_line_from_file(patch_file);
    119         }
     120            patch_line = xmalloc_getline(patch_file);
     121        }
     122        /* FIXME: patch_line NULL check?? */
    120123
    121124        /* Extract the filename used before the patch was generated */
     
    123126        free(patch_line);
    124127
    125         patch_line = bb_get_line_from_file(patch_file);
     128        patch_line = xmalloc_getline(patch_file);
     129        /* FIXME: NULL check?? */
    126130        if (strncmp(patch_line, "+++ ", 4) != 0) {
    127131            ret = 2;
    128             bb_error_msg("Invalid patch");
     132            bb_error_msg("invalid patch");
    129133            continue;
    130134        }
     
    141145                *line_ptr = '/';
    142146            }
    143             dst_stream = bb_xfopen(new_filename, "w+");
     147            dst_stream = xfopen(new_filename, "w+");
    144148            backup_filename = NULL;
    145149        } else {
     
    148152            strcat(backup_filename, ".orig");
    149153            if (rename(new_filename, backup_filename) == -1) {
    150                 bb_perror_msg_and_die("Couldnt create file %s",
     154                bb_perror_msg_and_die("cannot create file %s",
    151155                        backup_filename);
    152156            }
    153             dst_stream = bb_xfopen(new_filename, "w");
     157            dst_stream = xfopen(new_filename, "w");
    154158        }
    155159
     
    158162        } else {
    159163            if (strcmp(original_filename, new_filename) == 0) {
    160                 src_stream = bb_xfopen(backup_filename, "r");
     164                src_stream = xfopen(backup_filename, "r");
    161165            } else {
    162                 src_stream = bb_xfopen(original_filename, "r");
     166                src_stream = xfopen(original_filename, "r");
    163167            }
    164168        }
     
    167171
    168172        /* Handle each hunk */
    169         patch_line = bb_get_line_from_file(patch_file);
     173        patch_line = xmalloc_fgets(patch_file);
    170174        while (patch_line) {
    171175            unsigned int count;
     
    190194                count = src_beg_line - src_cur_line;
    191195                if (copy_lines(src_stream, dst_stream, count) != count) {
    192                     bb_error_msg_and_die("Bad src file");
     196                    bb_error_msg_and_die("bad src file");
    193197                }
    194198                src_cur_line += count;
     
    198202            hunk_offset_start = src_cur_line;
    199203
    200             while ((patch_line = bb_get_line_from_file(patch_file)) != NULL) {
     204            while ((patch_line = xmalloc_fgets(patch_file)) != NULL) {
    201205                if ((*patch_line == '-') || (*patch_line == ' ')) {
    202206                    char *src_line = NULL;
    203207                    if (src_stream) {
    204                         src_line = bb_get_line_from_file(src_stream);
     208                        src_line = xmalloc_fgets(src_stream);
    205209                        if (!src_line) {
    206210                            hunk_error++;
     
    210214                        }
    211215                        if (strcmp(src_line, patch_line + 1) != 0) {
    212                             bb_error_msg("Hunk #%d FAILED at %d.", hunk_count, hunk_offset_start);
     216                            bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
    213217                            hunk_error++;
    214218                            free(patch_line);
     219                            /* Probably need to find next hunk, etc... */
     220                            /* but for now we just bail out */
     221                            patch_line = NULL;
    215222                            break;
    216223                        }
     
    256263            if ((dest_cur_line == 0) || (dest_beg_line == 0)) {
    257264                /* The new patched file is empty, remove it */
    258                 if (unlink(new_filename) == -1) {
    259                     bb_perror_msg_and_die("Couldnt remove file %s", new_filename);
    260                 }
    261                 if (unlink(original_filename) == -1) {
    262                     bb_perror_msg_and_die("Couldnt remove original file %s", new_filename);
    263                 }
     265                xunlink(new_filename);
     266                if (strcmp(new_filename, original_filename) != 0)
     267                    xunlink(original_filename);
    264268            }
    265269        }
     
    270274     * 2 = More serious problems
    271275     */
    272     return(ret);
    273 }
     276    return ret;
     277}
Note: See TracChangeset for help on using the changeset viewer.