source: branches/stable/mindi-busybox/shell/bbsh.c @ 1770

Last change on this file since 1770 was 1770, checked in by Bruno Cornec, 13 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)

  • Property svn:eol-style set to native
File size: 5.0 KB
Line 
1/* vi: set ts=4 :
2 *
3 * bbsh - busybox shell
4 *
5 * Copyright 2006 Rob Landley <rob@landley.net>
6 *
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 */
9
10// A section of code that gets repeatedly or conditionally executed is stored
11// as a string and parsed each time it's run.
12
13
14
15// Wheee, debugging.
16
17// Terminal control
18#define ENABLE_BBSH_TTY        0
19
20// &, fg, bg, jobs.  (ctrl-z with tty.)
21#define ENABLE_BBSH_JOBCTL     0
22
23// Flow control (if, while, for, functions { })
24#define ENABLE_BBSH_FLOWCTL    0
25
26#define ENABLE_BBSH_ENVVARS    0  // Environment variable support
27
28// Local and synthetic variables, fancy prompts, set, $?, etc.
29#define ENABLE_BBSH_LOCALVARS  0
30
31// Pipes and redirects: | > < >> << && || & () ;
32#define ENABLE_BBSH_PIPES      0
33
34/* Fun:
35
36  echo `echo hello#comment " woot` and more
37*/
38
39#include "libbb.h"
40
41// A single executable, its arguments, and other information we know about it.
42#define BBSH_FLAG_EXIT    1
43#define BBSH_FLAG_SUSPEND 2
44#define BBSH_FLAG_PIPE    4
45#define BBSH_FLAG_AND     8
46#define BBSH_FLAG_OR      16
47#define BBSH_FLAG_AMP     32
48#define BBSH_FLAG_SEMI    64
49#define BBSH_FLAG_PAREN   128
50
51// What we know about a single process.
52struct command {
53    struct command *next;
54    int flags;      // exit, suspend, && ||
55    int pid;        // pid (or exit code)
56    int argc;
57    char *argv[0];
58};
59
60// A collection of processes piped into/waiting on each other.
61struct pipeline {
62    struct pipeline *next;
63    int job_id;
64    struct command *cmd;
65    char *cmdline;
66    int cmdlinelen;
67};
68
69static void free_list(void *list, void (*freeit)(void *data))
70{
71    while (list) {
72        void **next = (void **)list;
73        void *list_next = *next;
74        freeit(list);
75        free(list);
76        list = list_next;
77    }
78}
79
80// Parse one word from the command line, appending one or more argv[] entries
81// to struct command.  Handles environment variable substitution and
82// substrings.  Returns pointer to next used byte, or NULL if it
83// hit an ending token.
84static char *parse_word(char *start, struct command **cmd)
85{
86    char *end;
87
88    // Detect end of line (and truncate line at comment)
89    if (ENABLE_BBSH_PIPES && strchr("><&|(;", *start)) return 0;
90
91    // Grab next word.  (Add dequote and envvar logic here)
92    end = start;
93    end = skip_non_whitespace(end);
94    (*cmd)->argv[(*cmd)->argc++] = xstrndup(start, end-start);
95
96    // Allocate more space if there's no room for NULL terminator.
97
98    if (!((*cmd)->argc & 7))
99            *cmd = xrealloc(*cmd,
100                    sizeof(struct command) + ((*cmd)->argc+8)*sizeof(char *));
101    (*cmd)->argv[(*cmd)->argc] = 0;
102    return end;
103}
104
105// Parse a line of text into a pipeline.
106// Returns a pointer to the next line.
107
108static char *parse_pipeline(char *cmdline, struct pipeline *line)
109{
110    struct command **cmd = &(line->cmd);
111    char *start = line->cmdline = cmdline;
112
113    if (!cmdline) return 0;
114
115    if (ENABLE_BBSH_JOBCTL) line->cmdline = cmdline;
116
117    // Parse command into argv[]
118    for (;;) {
119        char *end;
120
121        // Skip leading whitespace and detect end of line.
122        start = skip_whitespace(start);
123        if (!*start || *start=='#') {
124            if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
125            return 0;
126        }
127
128        // Allocate next command structure if necessary
129        if (!*cmd) *cmd = xzalloc(sizeof(struct command)+8*sizeof(char *));
130
131        // Parse next argument and add the results to argv[]
132        end = parse_word(start, cmd);
133
134        // If we hit the end of this command, how did it end?
135        if (!end) {
136            if (ENABLE_BBSH_PIPES && *start) {
137                if (*start==';') {
138                    start++;
139                    break;
140                }
141                // handle | & < > >> << || &&
142            }
143            break;
144        }
145        start = end;
146    }
147
148    if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
149
150    return start;
151}
152
153// Execute the commands in a pipeline
154static int run_pipeline(struct pipeline *line)
155{
156    struct command *cmd = line->cmd;
157    if (!cmd || !cmd->argc) return 0;
158
159    // Handle local commands.  This is totally fake and plastic.
160    if (cmd->argc==2 && !strcmp(cmd->argv[0],"cd"))
161        chdir(cmd->argv[1]);
162    else if (!strcmp(cmd->argv[0],"exit"))
163        exit(cmd->argc>1 ? atoi(cmd->argv[1]) : 0);
164    else {
165        int status;
166        pid_t pid=fork();
167        if (!pid) {
168            run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv);
169            execvp(cmd->argv[0],cmd->argv);
170            printf("No %s",cmd->argv[0]);
171            exit(1);
172        } else waitpid(pid, &status, 0);
173    }
174
175    return 0;
176}
177
178static void free_cmd(void *data)
179{
180    struct command *cmd=(struct command *)data;
181
182    while (cmd->argc) free(cmd->argv[--cmd->argc]);
183}
184
185
186static void handle(char *command)
187{
188    struct pipeline line;
189    char *start = command;
190
191    for (;;) {
192        memset(&line,0,sizeof(struct pipeline));
193        start = parse_pipeline(start, &line);
194        if (!line.cmd) break;
195
196        run_pipeline(&line);
197        free_list(line.cmd, free_cmd);
198    }
199}
200
201int bbsh_main(int argc, char **argv);
202int bbsh_main(int argc, char **argv)
203{
204    char *command=NULL;
205    FILE *f;
206
207    getopt32(argv, "c:", &command);
208
209    f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
210    if (command) handle(command);
211    else {
212        unsigned cmdlen=0;
213        for (;;) {
214            if (!f) putchar('$');
215            if (1 > getline(&command, &cmdlen,f ? : stdin)) break;
216
217            handle(command);
218        }
219        if (ENABLE_FEATURE_CLEAN_UP) free(command);
220    }
221
222    return 1;
223}
Note: See TracBrowser for help on using the repository browser.