source: MondoRescue/branches/stable/mindi-busybox/coreutils/echo.c @ 1770

Last change on this file since 1770 was 1770, checked in by Bruno Cornec, 12 years ago
  • 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 size: 4.8 KB
Line 
1/* vi: set sw=4 ts=4: */
2/*
3 * echo implementation for busybox
4 *
5 * Copyright (c) 1991, 1993
6 *  The Regents of the University of California.  All rights reserved.
7 *
8 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
9 *
10 * Original copyright notice is retained at the end of this file.
11 */
12
13/* BB_AUDIT SUSv3 compliant -- unless configured as fancy echo. */
14/* http://www.opengroup.org/onlinepubs/007904975/utilities/echo.html */
15
16/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
17 *
18 * Because of behavioral differences, implemented configurable SUSv3
19 * or 'fancy' gnu-ish behaviors.  Also, reduced size and fixed bugs.
20 * 1) In handling '\c' escape, the previous version only suppressed the
21 *     trailing newline.  SUSv3 specifies _no_ output after '\c'.
22 * 2) SUSv3 specifies that octal escapes are of the form \0{#{#{#}}}.
23 *    The previous version did not allow 4-digit octals.
24 */
25
26#include "libbb.h"
27
28int bb_echo(char **argv)
29{
30    const char *arg;
31#if !ENABLE_FEATURE_FANCY_ECHO
32    enum {
33        eflag = '\\',
34        nflag = 1,  /* 1 -- print '\n' */
35    };
36    arg = *++argv;
37    if (!arg)
38        goto newline_ret;
39#else
40    const char *p;
41    char nflag = 1;
42    char eflag = 0;
43
44    while (1) {
45        arg = *++argv;
46        if (!arg)
47            goto newline_ret;
48        if (*arg != '-')
49            break;
50
51        /* If it appears that we are handling options, then make sure
52         * that all of the options specified are actually valid.
53         * Otherwise, the string should just be echoed.
54         */
55        p = arg + 1;
56        if (!*p)    /* A single '-', so echo it. */
57            goto just_echo;
58
59        do {
60            if (!strrchr("neE", *p))
61                goto just_echo;
62        } while (*++p);
63
64        /* All of the options in this arg are valid, so handle them. */
65        p = arg + 1;
66        do {
67            if (*p == 'n')
68                nflag = 0;
69            if (*p == 'e')
70                eflag = '\\';
71        } while (*++p);
72    }
73 just_echo:
74#endif
75    while (1) {
76        /* arg is already == *argv and isn't NULL */
77        int c;
78
79        if (!eflag) {
80            /* optimization for very common case */
81            fputs(arg, stdout);
82        } else while ((c = *arg++)) {
83            if (c == eflag) {   /* Check for escape seq. */
84                if (*arg == 'c') {
85                    /* '\c' means cancel newline and
86                     * ignore all subsequent chars. */
87                    goto ret;
88                }
89#if !ENABLE_FEATURE_FANCY_ECHO
90                /* SUSv3 specifies that octal escapes must begin with '0'. */
91                if ( (((unsigned char)*arg) - '1') >= 7)
92#endif
93                {
94                    /* Since SUSv3 mandates a first digit of 0, 4-digit octals
95                    * of the form \0### are accepted. */
96                    if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) {
97                        arg++;
98                    }
99                    /* bb_process_escape_sequence can handle nul correctly */
100                    c = bb_process_escape_sequence(&arg);
101                }
102            }
103            putchar(c);
104        }
105
106        arg = *++argv;
107        if (!arg)
108            break;
109        putchar(' ');
110    }
111
112 newline_ret:
113    if (nflag) {
114        putchar('\n');
115    }
116 ret:
117    return fflush(stdout);
118}
119
120/* This is a NOFORK applet. Be very careful! */
121
122int echo_main(int argc, char** argv);
123int echo_main(int argc, char** argv)
124{
125    return bb_echo(argv);
126}
127
128/*-
129 * Copyright (c) 1991, 1993
130 *  The Regents of the University of California.  All rights reserved.
131 *
132 * This code is derived from software contributed to Berkeley by
133 * Kenneth Almquist.
134 *
135 * Redistribution and use in source and binary forms, with or without
136 * modification, are permitted provided that the following conditions
137 * are met:
138 * 1. Redistributions of source code must retain the above copyright
139 *    notice, this list of conditions and the following disclaimer.
140 * 2. Redistributions in binary form must reproduce the above copyright
141 *    notice, this list of conditions and the following disclaimer in the
142 *    documentation and/or other materials provided with the distribution.
143 *
144 * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
145 *      ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
146 *
147 *  California, Berkeley and its contributors.
148 * 4. Neither the name of the University nor the names of its contributors
149 *    may be used to endorse or promote products derived from this software
150 *    without specific prior written permission.
151 *
152 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
153 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
154 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
155 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
156 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
157 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
158 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
159 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
160 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
161 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
162 * SUCH DAMAGE.
163 *
164 *  @(#)echo.c  8.1 (Berkeley) 5/31/93
165 */
Note: See TracBrowser for help on using the repository browser.