2000-03-12 23:49:18 +00:00
|
|
|
/* vi: set sw=4 ts=4: */
|
|
|
|
/*
|
2000-03-26 14:03:20 +00:00
|
|
|
* lash -- the BusyBox Lame-Ass SHell
|
2000-03-12 23:49:18 +00:00
|
|
|
*
|
2004-03-15 08:29:22 +00:00
|
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
2000-03-12 23:49:18 +00:00
|
|
|
*
|
|
|
|
* Based in part on ladsh.c by Michael K. Johnson and Erik W. Troan, which is
|
|
|
|
* under the following liberal license: "We have placed this source code in the
|
|
|
|
* public domain. Use it in any project, free or commercial."
|
|
|
|
*
|
2006-01-22 22:55:11 +00:00
|
|
|
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
|
2000-03-12 23:49:18 +00:00
|
|
|
*/
|
|
|
|
|
2001-10-24 05:00:29 +00:00
|
|
|
/* This shell's parsing engine is officially at a dead-end. Future
|
|
|
|
* work shell work should be done using hush, msh, or ash. This is
|
|
|
|
* still a very useful, small shell -- it just don't need any more
|
|
|
|
* features beyond what it already has...
|
2001-01-05 20:58:22 +00:00
|
|
|
*/
|
2001-06-21 16:38:11 +00:00
|
|
|
|
2000-12-06 23:47:38 +00:00
|
|
|
//For debugging/development on the shell only...
|
2000-07-28 15:14:45 +00:00
|
|
|
//#define DEBUG_SHELL
|
2000-07-17 19:14:41 +00:00
|
|
|
|
2000-07-28 15:14:45 +00:00
|
|
|
#include <getopt.h>
|
2001-03-08 23:59:45 +00:00
|
|
|
#include <glob.h>
|
2007-05-26 19:00:18 +00:00
|
|
|
|
|
|
|
#include "busybox.h" /* for struct bb_applet */
|
|
|
|
|
2001-03-08 23:59:45 +00:00
|
|
|
#define expand_t glob_t
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* Always enable for the moment... */
|
2004-02-10 01:30:21 +00:00
|
|
|
#define CONFIG_LASH_PIPE_N_REDIRECTS
|
|
|
|
#define CONFIG_LASH_JOB_CONTROL
|
2007-03-31 11:07:30 +00:00
|
|
|
#define ENABLE_LASH_PIPE_N_REDIRECTS 1
|
|
|
|
#define ENABLE_LASH_JOB_CONTROL 1
|
2001-03-08 23:59:45 +00:00
|
|
|
|
2007-04-12 12:27:32 +00:00
|
|
|
|
2007-01-22 14:12:08 +00:00
|
|
|
enum { MAX_READ = 128 }; /* size of input buffer for 'read' builtin */
|
2000-03-12 23:49:18 +00:00
|
|
|
#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
|
|
|
|
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2000-12-18 20:25:50 +00:00
|
|
|
enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE,
|
2000-03-16 08:12:48 +00:00
|
|
|
REDIRECT_APPEND
|
|
|
|
};
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2006-03-10 19:22:06 +00:00
|
|
|
enum {
|
|
|
|
DEFAULT_CONTEXT = 0x1,
|
|
|
|
IF_TRUE_CONTEXT = 0x2,
|
|
|
|
IF_FALSE_CONTEXT = 0x4,
|
|
|
|
THEN_EXP_CONTEXT = 0x8,
|
|
|
|
ELSE_EXP_CONTEXT = 0x10
|
|
|
|
};
|
2000-07-25 18:06:52 +00:00
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
#define LASH_OPT_DONE (1)
|
|
|
|
#define LASH_OPT_SAW_QUOTE (2)
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2000-12-18 20:25:50 +00:00
|
|
|
struct redir_struct {
|
|
|
|
enum redir_type type; /* type of redirection */
|
2000-03-16 08:12:48 +00:00
|
|
|
int fd; /* file descriptor being redirected */
|
|
|
|
char *filename; /* file to redirect fd to */
|
2000-03-12 23:49:18 +00:00
|
|
|
};
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
struct child_prog {
|
2000-03-16 08:12:48 +00:00
|
|
|
pid_t pid; /* 0 if exited */
|
|
|
|
char **argv; /* program name and arguments */
|
2000-12-18 20:25:50 +00:00
|
|
|
int num_redirects; /* elements in redirection array */
|
|
|
|
int is_stopped; /* is the program currently running? */
|
|
|
|
struct job *family; /* pointer back to the child's parent job */
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2004-02-10 01:07:45 +00:00
|
|
|
struct redir_struct *redirects; /* I/O redirects */
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
struct jobset {
|
|
|
|
struct job *head; /* head of list of running jobs */
|
|
|
|
struct job *fg; /* current foreground job */
|
2000-03-12 23:49:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct job {
|
2000-12-18 20:25:50 +00:00
|
|
|
int jobid; /* job number */
|
|
|
|
int num_progs; /* total number of programs in job */
|
|
|
|
int running_progs; /* number of programs running */
|
2000-03-16 08:12:48 +00:00
|
|
|
char *text; /* name of job */
|
2000-12-18 20:25:50 +00:00
|
|
|
char *cmdbuf; /* buffer various argv's point into */
|
2000-03-16 08:12:48 +00:00
|
|
|
pid_t pgrp; /* process group ID for the job */
|
2000-12-18 20:25:50 +00:00
|
|
|
struct child_prog *progs; /* array of programs in job */
|
2000-03-16 08:12:48 +00:00
|
|
|
struct job *next; /* to track background commands */
|
2000-12-18 20:25:50 +00:00
|
|
|
int stopped_progs; /* number of programs alive, but stopped */
|
|
|
|
unsigned int job_context; /* bitmask defining current context */
|
|
|
|
struct jobset *job_list;
|
2000-03-12 23:49:18 +00:00
|
|
|
};
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
struct built_in_command {
|
2007-01-30 22:44:07 +00:00
|
|
|
const char *cmd; /* name */
|
|
|
|
const char *descr; /* description */
|
2000-12-18 20:25:50 +00:00
|
|
|
int (*function) (struct child_prog *); /* function ptr */
|
2000-03-12 23:49:18 +00:00
|
|
|
};
|
|
|
|
|
2000-07-10 18:47:24 +00:00
|
|
|
/* function prototypes for builtins */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_cd(struct child_prog *cmd);
|
|
|
|
static int builtin_exec(struct child_prog *cmd);
|
|
|
|
static int builtin_exit(struct child_prog *cmd);
|
|
|
|
static int builtin_fg_bg(struct child_prog *cmd);
|
|
|
|
static int builtin_help(struct child_prog *cmd);
|
|
|
|
static int builtin_jobs(struct child_prog *dummy);
|
|
|
|
static int builtin_pwd(struct child_prog *dummy);
|
|
|
|
static int builtin_export(struct child_prog *cmd);
|
|
|
|
static int builtin_source(struct child_prog *cmd);
|
|
|
|
static int builtin_unset(struct child_prog *cmd);
|
|
|
|
static int builtin_read(struct child_prog *cmd);
|
2000-07-10 18:47:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* function prototypes for shell stuff */
|
2000-12-18 20:25:50 +00:00
|
|
|
static void checkjobs(struct jobset *job_list);
|
2001-06-27 04:30:11 +00:00
|
|
|
static void remove_job(struct jobset *j_list, struct job *job);
|
2007-03-31 11:08:50 +00:00
|
|
|
static int get_command_bufsiz(FILE * source, char *command);
|
2000-12-18 20:25:50 +00:00
|
|
|
static int parse_command(char **command_ptr, struct job *job, int *inbg);
|
|
|
|
static int run_command(struct job *newjob, int inbg, int outpipe[2]);
|
2006-01-22 22:55:11 +00:00
|
|
|
static int pseudo_exec(struct child_prog *cmd) ATTRIBUTE_NORETURN;
|
2000-03-12 23:49:18 +00:00
|
|
|
static int busy_loop(FILE * input);
|
|
|
|
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-07-12 23:36:17 +00:00
|
|
|
/* Table of built-in functions (these are non-forking builtins, meaning they
|
|
|
|
* can change global variables in the parent shell process but they will not
|
|
|
|
* work with pipes and redirects; 'unset foo | whatever' will not work) */
|
2007-01-30 22:44:07 +00:00
|
|
|
static const struct built_in_command bltins[] = {
|
2007-04-12 17:10:45 +00:00
|
|
|
{"bg" , "Resume a job in the background", builtin_fg_bg},
|
|
|
|
{"cd" , "Change working directory", builtin_cd},
|
|
|
|
{"exec" , "Exec command, replacing this shell with the exec'd process", builtin_exec},
|
|
|
|
{"exit" , "Exit from shell()", builtin_exit},
|
|
|
|
{"fg" , "Bring job into the foreground", builtin_fg_bg},
|
|
|
|
{"jobs" , "Lists the active jobs", builtin_jobs},
|
2000-07-25 18:06:52 +00:00
|
|
|
{"export", "Set environment variable", builtin_export},
|
2007-04-12 17:10:45 +00:00
|
|
|
{"unset" , "Unset environment variable", builtin_unset},
|
|
|
|
{"read" , "Input environment variable", builtin_read},
|
|
|
|
{"." , "Source-in and run commands in a file", builtin_source},
|
|
|
|
/* These were "forked applets", but distinction was nuked */
|
|
|
|
/* Original comment retained: */
|
|
|
|
/* Table of forking built-in functions (things that fork cannot change global
|
|
|
|
* variables in the parent process, such as the current working directory) */
|
|
|
|
{"pwd" , "Print current directory", builtin_pwd},
|
|
|
|
{"help" , "List shell built-in commands", builtin_help},
|
2000-12-18 20:25:50 +00:00
|
|
|
/* to do: add ulimit */
|
2000-05-19 05:35:19 +00:00
|
|
|
};
|
|
|
|
|
2007-06-25 10:55:35 +00:00
|
|
|
|
|
|
|
#define VEC_LAST(v) v[ARRAY_SIZE(v)-1]
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2001-01-05 19:37:32 +00:00
|
|
|
|
2001-07-12 20:26:32 +00:00
|
|
|
static int shell_context; /* Type prompt trigger (PS1 or PS2) */
|
2001-01-05 19:37:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Globals that are static to this file */
|
2007-04-12 17:08:53 +00:00
|
|
|
static char *cwd;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static char *local_pending_command;
|
2000-12-18 20:25:50 +00:00
|
|
|
static struct jobset job_list = { NULL, NULL };
|
2000-07-27 00:15:20 +00:00
|
|
|
static int argc;
|
|
|
|
static char **argv;
|
2006-06-13 18:50:20 +00:00
|
|
|
static llist_t *close_me_list;
|
2001-06-27 04:30:11 +00:00
|
|
|
static int last_return_code;
|
|
|
|
static int last_bg_pid;
|
2001-06-21 16:38:11 +00:00
|
|
|
static unsigned int last_jobid;
|
2001-06-25 17:11:54 +00:00
|
|
|
static int shell_terminal;
|
2007-01-30 22:44:07 +00:00
|
|
|
static const char *PS1;
|
|
|
|
static const char *PS2 = "> ";
|
2001-03-13 22:57:56 +00:00
|
|
|
|
|
|
|
|
2000-11-30 22:43:16 +00:00
|
|
|
#ifdef DEBUG_SHELL
|
|
|
|
static inline void debug_printf(const char *format, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
va_start(args, format);
|
2000-12-18 20:25:50 +00:00
|
|
|
vfprintf(stderr, format, args);
|
2000-11-30 22:43:16 +00:00
|
|
|
va_end(args);
|
|
|
|
}
|
|
|
|
#else
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static inline void debug_printf(const char ATTRIBUTE_UNUSED *format, ...) { }
|
2000-11-30 22:43:16 +00:00
|
|
|
#endif
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
/*
|
|
|
|
Most builtins need access to the struct child_prog that has
|
|
|
|
their arguments, previously coded as cmd->progs[0]. That coding
|
|
|
|
can exhibit a bug, if the builtin is not the first command in
|
|
|
|
a pipeline: "echo foo | exec sort" will attempt to exec foo.
|
|
|
|
|
|
|
|
builtin previous use notes
|
|
|
|
------ ----------------- ---------
|
|
|
|
cd cmd->progs[0]
|
|
|
|
exec cmd->progs[0] squashed bug: didn't look for applets or forking builtins
|
|
|
|
exit cmd->progs[0]
|
|
|
|
fg_bg cmd->progs[0], job_list->head, job_list->fg
|
|
|
|
help 0
|
|
|
|
jobs job_list->head
|
|
|
|
pwd 0
|
2001-03-29 22:48:33 +00:00
|
|
|
export cmd->progs[0]
|
2000-12-18 20:25:50 +00:00
|
|
|
source cmd->progs[0]
|
|
|
|
unset cmd->progs[0]
|
|
|
|
read cmd->progs[0]
|
|
|
|
|
|
|
|
I added "struct job *family;" to struct child_prog,
|
|
|
|
and switched API to builtin_foo(struct child_prog *child);
|
|
|
|
So cmd->text becomes child->family->text
|
|
|
|
cmd->job_context becomes child->family->job_context
|
|
|
|
cmd->progs[0] becomes *child
|
|
|
|
job_list becomes child->family->job_list
|
|
|
|
*/
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2007-04-12 17:08:53 +00:00
|
|
|
|
|
|
|
static void update_cwd(void)
|
|
|
|
{
|
|
|
|
cwd = xrealloc_getcwd_or_warn(cwd);
|
|
|
|
if (!cwd)
|
|
|
|
cwd = xstrdup(bb_msg_unknown);
|
|
|
|
}
|
|
|
|
|
2000-03-12 23:49:18 +00:00
|
|
|
/* built-in 'cd <path>' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_cd(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
char *newdir;
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (child->argv[1] == NULL)
|
2000-03-16 08:12:48 +00:00
|
|
|
newdir = getenv("HOME");
|
|
|
|
else
|
2000-12-18 20:25:50 +00:00
|
|
|
newdir = child->argv[1];
|
2000-03-16 08:12:48 +00:00
|
|
|
if (chdir(newdir)) {
|
2006-06-20 21:35:26 +00:00
|
|
|
bb_perror_msg("cd: %s", newdir);
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_FAILURE;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2007-04-12 17:08:53 +00:00
|
|
|
update_cwd();
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_SUCCESS;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2000-09-21 02:48:07 +00:00
|
|
|
/* built-in 'exec' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_exec(struct child_prog *child)
|
2000-09-21 02:48:07 +00:00
|
|
|
{
|
2000-12-18 20:25:50 +00:00
|
|
|
if (child->argv[1] == NULL)
|
|
|
|
return EXIT_SUCCESS; /* Really? */
|
|
|
|
child->argv++;
|
2007-03-31 11:07:30 +00:00
|
|
|
while (close_me_list)
|
|
|
|
close((long)llist_pop(&close_me_list));
|
2000-12-18 20:25:50 +00:00
|
|
|
pseudo_exec(child);
|
|
|
|
/* never returns */
|
2000-09-21 02:48:07 +00:00
|
|
|
}
|
|
|
|
|
2000-03-12 23:49:18 +00:00
|
|
|
/* built-in 'exit' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_exit(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-12-18 20:25:50 +00:00
|
|
|
if (child->argv[1] == NULL)
|
2000-12-01 02:55:13 +00:00
|
|
|
exit(EXIT_SUCCESS);
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2007-04-11 17:04:29 +00:00
|
|
|
exit(atoi(child->argv[1]));
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* built-in 'fg' and 'bg' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_fg_bg(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2001-06-21 16:38:11 +00:00
|
|
|
int i, jobnum;
|
2007-04-14 11:16:29 +00:00
|
|
|
struct job *job;
|
2000-12-21 18:31:36 +00:00
|
|
|
|
2001-06-21 16:38:11 +00:00
|
|
|
/* If they gave us no args, assume they want the last backgrounded task */
|
|
|
|
if (!child->argv[1]) {
|
|
|
|
for (job = child->family->job_list->head; job; job = job->next) {
|
|
|
|
if (job->jobid == last_jobid) {
|
2007-04-14 11:16:29 +00:00
|
|
|
goto found;
|
2001-06-21 16:38:11 +00:00
|
|
|
}
|
|
|
|
}
|
2007-04-14 11:16:29 +00:00
|
|
|
bb_error_msg("%s: no current job", child->argv[0]);
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
if (sscanf(child->argv[1], "%%%d", &jobnum) != 1) {
|
|
|
|
bb_error_msg(bb_msg_invalid_arg, child->argv[1], child->argv[0]);
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
for (job = child->family->job_list->head; job; job = job->next) {
|
|
|
|
if (job->jobid == jobnum) {
|
|
|
|
goto found;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
}
|
2007-04-14 11:16:29 +00:00
|
|
|
bb_error_msg("%s: %d: no such job", child->argv[0], jobnum);
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
found:
|
2000-12-18 20:25:50 +00:00
|
|
|
if (*child->argv[0] == 'f') {
|
2001-06-25 17:11:54 +00:00
|
|
|
/* Put the job into the foreground. */
|
|
|
|
tcsetpgrp(shell_terminal, job->pgrp);
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
child->family->job_list->fg = job;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
/* Restart the processes in the job */
|
2000-12-18 20:25:50 +00:00
|
|
|
for (i = 0; i < job->num_progs; i++)
|
|
|
|
job->progs[i].is_stopped = 0;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
job->stopped_progs = 0;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
i = kill(- job->pgrp, SIGCONT);
|
|
|
|
if (i < 0) {
|
2007-04-14 11:16:29 +00:00
|
|
|
if (errno == ESRCH) {
|
2001-06-27 04:30:11 +00:00
|
|
|
remove_job(&job_list, job);
|
2001-06-27 17:29:11 +00:00
|
|
|
} else {
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_perror_msg("kill (SIGCONT)");
|
2001-06-27 04:30:11 +00:00
|
|
|
}
|
|
|
|
}
|
2001-06-25 17:11:54 +00:00
|
|
|
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_SUCCESS;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* built-in 'help' handler */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static int builtin_help(struct child_prog ATTRIBUTE_UNUSED *dummy)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2007-01-30 22:44:07 +00:00
|
|
|
const struct built_in_command *x;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
printf("\nBuilt-in commands:\n"
|
2007-04-12 12:27:32 +00:00
|
|
|
"-------------------\n");
|
2007-04-12 17:10:45 +00:00
|
|
|
for (x = bltins; x <= &VEC_LAST(bltins); x++) {
|
2007-01-30 22:44:07 +00:00
|
|
|
if (x->descr == NULL)
|
2000-07-25 18:06:52 +00:00
|
|
|
continue;
|
2000-12-18 20:25:50 +00:00
|
|
|
printf("%s\t%s\n", x->cmd, x->descr);
|
2000-05-19 05:35:19 +00:00
|
|
|
}
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
putchar('\n');
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_SUCCESS;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* built-in 'jobs' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_jobs(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
struct job *job;
|
2007-01-30 22:44:07 +00:00
|
|
|
const char *status_string;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
for (job = child->family->job_list->head; job; job = job->next) {
|
|
|
|
if (job->running_progs == job->stopped_progs)
|
|
|
|
status_string = "Stopped";
|
2000-03-16 08:12:48 +00:00
|
|
|
else
|
2000-12-18 20:25:50 +00:00
|
|
|
status_string = "Running";
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
printf(JOB_STATUS_FORMAT, job->jobid, status_string, job->text);
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_SUCCESS;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* built-in 'pwd' handler */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static int builtin_pwd(struct child_prog ATTRIBUTE_UNUSED *dummy)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2007-04-12 17:08:53 +00:00
|
|
|
update_cwd();
|
2001-05-16 14:21:09 +00:00
|
|
|
puts(cwd);
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_SUCCESS;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2000-03-17 01:12:41 +00:00
|
|
|
/* built-in 'export VAR=value' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_export(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
int res;
|
2001-03-13 22:57:56 +00:00
|
|
|
char *v = child->argv[1];
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2001-03-13 22:57:56 +00:00
|
|
|
if (v == NULL) {
|
2001-03-29 22:48:33 +00:00
|
|
|
char **e;
|
|
|
|
for (e = environ; *e; e++) {
|
2001-05-16 14:21:09 +00:00
|
|
|
puts(*e);
|
2001-03-29 22:48:33 +00:00
|
|
|
}
|
2001-04-04 17:50:04 +00:00
|
|
|
return 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2001-03-13 22:57:56 +00:00
|
|
|
res = putenv(v);
|
2000-03-16 08:12:48 +00:00
|
|
|
if (res)
|
2006-06-20 21:35:26 +00:00
|
|
|
bb_perror_msg("export");
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
|
|
|
|
if (strncmp(v, "PS1=", 4) == 0)
|
2001-03-13 22:57:56 +00:00
|
|
|
PS1 = getenv("PS1");
|
|
|
|
#endif
|
2001-04-09 22:48:12 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LOCALE_SUPPORT
|
2006-11-21 00:09:37 +00:00
|
|
|
// TODO: why getenv? "" would be just as good...
|
2007-03-31 11:07:30 +00:00
|
|
|
if (strncmp(v, "LC_ALL=", 7) == 0)
|
2001-03-27 16:35:16 +00:00
|
|
|
setlocale(LC_ALL, getenv("LC_ALL"));
|
2007-03-31 11:07:30 +00:00
|
|
|
if (strncmp(v, "LC_CTYPE=", 9) == 0)
|
2001-03-27 16:35:16 +00:00
|
|
|
setlocale(LC_CTYPE, getenv("LC_CTYPE"));
|
2001-04-09 22:48:12 +00:00
|
|
|
#endif
|
2001-03-27 16:35:16 +00:00
|
|
|
|
2006-11-27 16:59:15 +00:00
|
|
|
return res;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2000-07-03 23:56:26 +00:00
|
|
|
/* built-in 'read VAR' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_read(struct child_prog *child)
|
2000-07-03 23:56:26 +00:00
|
|
|
{
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
int res = 0, len;
|
2000-07-03 23:56:26 +00:00
|
|
|
char *s;
|
|
|
|
char string[MAX_READ];
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (child->argv[1]) {
|
2000-07-03 23:56:26 +00:00
|
|
|
/* argument (VAR) given: put "VAR=" into buffer */
|
2002-06-06 13:33:01 +00:00
|
|
|
safe_strncpy(string, child->argv[1], MAX_READ-1);
|
2000-07-03 23:56:26 +00:00
|
|
|
len = strlen(string);
|
|
|
|
string[len++] = '=';
|
|
|
|
string[len] = '\0';
|
|
|
|
fgets(&string[len], sizeof(string) - len, stdin); /* read string */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
res = strlen(string);
|
|
|
|
if (res > len)
|
|
|
|
string[--res] = '\0'; /* chomp trailing newline */
|
2000-07-03 23:56:26 +00:00
|
|
|
/*
|
|
|
|
** string should now contain "VAR=<value>"
|
|
|
|
** copy it (putenv() won't do that, so we must make sure
|
|
|
|
** the string resides in a static buffer!)
|
|
|
|
*/
|
|
|
|
res = -1;
|
2007-04-12 12:27:32 +00:00
|
|
|
s = strdup(string);
|
|
|
|
if (s)
|
2000-07-03 23:56:26 +00:00
|
|
|
res = putenv(s);
|
|
|
|
if (res)
|
2006-06-20 21:35:26 +00:00
|
|
|
bb_perror_msg("read");
|
2007-04-12 12:27:32 +00:00
|
|
|
} else
|
2000-07-03 23:56:26 +00:00
|
|
|
fgets(string, sizeof(string), stdin);
|
|
|
|
|
2006-11-27 16:59:15 +00:00
|
|
|
return res;
|
2000-07-03 23:56:26 +00:00
|
|
|
}
|
|
|
|
|
2000-03-12 23:49:18 +00:00
|
|
|
/* Built-in '.' handler (read-in and execute commands from file) */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_source(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
FILE *input;
|
|
|
|
int status;
|
|
|
|
|
2006-10-26 23:25:17 +00:00
|
|
|
input = fopen_or_warn(child->argv[1], "r");
|
2000-03-16 08:12:48 +00:00
|
|
|
if (!input) {
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_FAILURE;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
|
2006-06-19 03:20:03 +00:00
|
|
|
llist_add_to(&close_me_list, (void *)(long)fileno(input));
|
2000-03-16 08:12:48 +00:00
|
|
|
/* Now run the file */
|
|
|
|
status = busy_loop(input);
|
2000-09-13 03:43:36 +00:00
|
|
|
fclose(input);
|
2006-06-13 18:50:20 +00:00
|
|
|
llist_pop(&close_me_list);
|
2006-11-27 16:59:15 +00:00
|
|
|
return status;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* built-in 'unset VAR' handler */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int builtin_unset(struct child_prog *child)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-12-18 20:25:50 +00:00
|
|
|
if (child->argv[1] == NULL) {
|
2006-06-07 20:17:41 +00:00
|
|
|
printf(bb_msg_requires_arg, "unset");
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_FAILURE;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-12-18 20:25:50 +00:00
|
|
|
unsetenv(child->argv[1]);
|
2000-12-01 02:55:13 +00:00
|
|
|
return EXIT_SUCCESS;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2000-03-12 23:49:18 +00:00
|
|
|
/* free up all memory from a job */
|
2000-12-18 20:25:50 +00:00
|
|
|
static void free_job(struct job *cmd)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
int i;
|
2001-03-14 17:26:37 +00:00
|
|
|
struct jobset *keep;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
for (i = 0; i < cmd->num_progs; i++) {
|
2000-03-16 08:12:48 +00:00
|
|
|
free(cmd->progs[i].argv);
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2000-12-18 20:25:50 +00:00
|
|
|
if (cmd->progs[i].redirects)
|
|
|
|
free(cmd->progs[i].redirects);
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2002-11-28 11:27:31 +00:00
|
|
|
free(cmd->progs);
|
|
|
|
free(cmd->text);
|
|
|
|
free(cmd->cmdbuf);
|
2001-03-14 17:26:37 +00:00
|
|
|
keep = cmd->job_list;
|
2000-07-14 01:13:11 +00:00
|
|
|
memset(cmd, 0, sizeof(struct job));
|
2001-03-14 17:26:37 +00:00
|
|
|
cmd->job_list = keep;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2001-03-21 07:34:27 +00:00
|
|
|
/* remove a job from a jobset */
|
|
|
|
static void remove_job(struct jobset *j_list, struct job *job)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-12-18 20:25:50 +00:00
|
|
|
struct job *prevjob;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
free_job(job);
|
2001-03-21 07:34:27 +00:00
|
|
|
if (job == j_list->head) {
|
|
|
|
j_list->head = job->next;
|
2000-03-16 08:12:48 +00:00
|
|
|
} else {
|
2001-03-21 07:34:27 +00:00
|
|
|
prevjob = j_list->head;
|
2000-12-18 20:25:50 +00:00
|
|
|
while (prevjob->next != job)
|
|
|
|
prevjob = prevjob->next;
|
|
|
|
prevjob->next = job->next;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
|
2001-06-27 04:30:11 +00:00
|
|
|
if (j_list->head)
|
|
|
|
last_jobid = j_list->head->jobid;
|
|
|
|
else
|
|
|
|
last_jobid = 0;
|
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
free(job);
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* Checks to see if any background processes have exited -- if they
|
2000-03-12 23:49:18 +00:00
|
|
|
have, figure out why and see if a job has completed */
|
2001-03-21 07:34:27 +00:00
|
|
|
static void checkjobs(struct jobset *j_list)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
struct job *job;
|
|
|
|
pid_t childpid;
|
|
|
|
int status;
|
2000-12-18 20:25:50 +00:00
|
|
|
int prognum = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
|
|
|
while ((childpid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
|
2001-03-21 07:34:27 +00:00
|
|
|
for (job = j_list->head; job; job = job->next) {
|
2000-12-18 20:25:50 +00:00
|
|
|
prognum = 0;
|
|
|
|
while (prognum < job->num_progs &&
|
|
|
|
job->progs[prognum].pid != childpid) prognum++;
|
|
|
|
if (prognum < job->num_progs)
|
2000-03-16 08:12:48 +00:00
|
|
|
break;
|
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-07-17 19:14:41 +00:00
|
|
|
/* This happens on backticked commands */
|
2007-03-31 11:07:30 +00:00
|
|
|
if (job == NULL)
|
2000-07-17 19:14:41 +00:00
|
|
|
return;
|
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
if (WIFEXITED(status) || WIFSIGNALED(status)) {
|
|
|
|
/* child exited */
|
2000-12-18 20:25:50 +00:00
|
|
|
job->running_progs--;
|
|
|
|
job->progs[prognum].pid = 0;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!job->running_progs) {
|
|
|
|
printf(JOB_STATUS_FORMAT, job->jobid, "Done", job->text);
|
2007-03-31 11:07:30 +00:00
|
|
|
last_jobid = 0;
|
2001-03-21 07:34:27 +00:00
|
|
|
remove_job(j_list, job);
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* child stopped */
|
2000-12-18 20:25:50 +00:00
|
|
|
job->stopped_progs++;
|
|
|
|
job->progs[prognum].is_stopped = 1;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
if (childpid == -1 && errno != ECHILD)
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_perror_msg("waitpid");
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
2004-02-10 01:28:36 +00:00
|
|
|
#else
|
|
|
|
static void checkjobs(struct jobset *j_list)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
static void free_job(struct job *cmd)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
static void remove_job(struct jobset *j_list, struct job *job)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2000-12-21 18:31:36 +00:00
|
|
|
/* squirrel != NULL means we squirrel away copies of stdin, stdout,
|
|
|
|
* and stderr if they are redirected. */
|
|
|
|
static int setup_redirects(struct child_prog *prog, int squirrel[])
|
2000-07-27 00:15:20 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int openfd;
|
|
|
|
int mode = O_RDONLY;
|
2000-12-18 20:25:50 +00:00
|
|
|
struct redir_struct *redir = prog->redirects;
|
2000-07-27 00:15:20 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
for (i = 0; i < prog->num_redirects; i++, redir++) {
|
2000-07-27 00:15:20 +00:00
|
|
|
switch (redir->type) {
|
|
|
|
case REDIRECT_INPUT:
|
|
|
|
mode = O_RDONLY;
|
|
|
|
break;
|
|
|
|
case REDIRECT_OVERWRITE:
|
2000-11-14 21:59:22 +00:00
|
|
|
mode = O_WRONLY | O_CREAT | O_TRUNC;
|
2000-07-27 00:15:20 +00:00
|
|
|
break;
|
|
|
|
case REDIRECT_APPEND:
|
2000-11-14 21:59:22 +00:00
|
|
|
mode = O_WRONLY | O_CREAT | O_APPEND;
|
2000-07-27 00:15:20 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-04-11 23:20:53 +00:00
|
|
|
openfd = open3_or_warn(redir->filename, mode, 0666);
|
2000-07-27 00:15:20 +00:00
|
|
|
if (openfd < 0) {
|
|
|
|
/* this could get lost if stderr has been redirected, but
|
|
|
|
bash and ash both lose it as well (though zsh doesn't!) */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (openfd != redir->fd) {
|
2000-12-21 18:31:36 +00:00
|
|
|
if (squirrel && redir->fd < 3) {
|
|
|
|
squirrel[redir->fd] = dup(redir->fd);
|
2007-04-10 15:42:06 +00:00
|
|
|
fcntl(squirrel[redir->fd], F_SETFD, FD_CLOEXEC);
|
2000-12-21 18:31:36 +00:00
|
|
|
}
|
2000-07-27 00:15:20 +00:00
|
|
|
dup2(openfd, redir->fd);
|
|
|
|
close(openfd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-12-21 18:31:36 +00:00
|
|
|
static void restore_redirects(int squirrel[])
|
|
|
|
{
|
|
|
|
int i, fd;
|
2007-03-31 11:07:30 +00:00
|
|
|
for (i = 0; i < 3; i++) {
|
2000-12-21 18:31:36 +00:00
|
|
|
fd = squirrel[i];
|
|
|
|
if (fd != -1) {
|
|
|
|
/* No error checking. I sure wouldn't know what
|
|
|
|
* to do with an error if I found one! */
|
|
|
|
dup2(fd, i);
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-02-10 01:07:45 +00:00
|
|
|
#else
|
|
|
|
static inline int setup_redirects(struct child_prog *prog, int squirrel[])
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static inline void restore_redirects(int squirrel[])
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2000-07-27 00:15:20 +00:00
|
|
|
|
2001-03-13 22:57:56 +00:00
|
|
|
static inline void cmdedit_set_initial_prompt(void)
|
2001-01-30 23:40:39 +00:00
|
|
|
{
|
2007-01-22 09:03:07 +00:00
|
|
|
#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT
|
2001-03-13 22:57:56 +00:00
|
|
|
PS1 = NULL;
|
2001-01-30 23:40:39 +00:00
|
|
|
#else
|
2001-03-13 22:57:56 +00:00
|
|
|
PS1 = getenv("PS1");
|
2007-03-31 11:07:30 +00:00
|
|
|
if (PS1 == 0)
|
2001-03-13 22:57:56 +00:00
|
|
|
PS1 = "\\w \\$ ";
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2001-03-13 22:57:56 +00:00
|
|
|
}
|
2001-01-30 23:40:39 +00:00
|
|
|
|
2007-01-30 22:44:07 +00:00
|
|
|
static inline const char* setup_prompt_string(void)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2007-01-22 09:03:07 +00:00
|
|
|
#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT
|
2001-01-04 11:10:38 +00:00
|
|
|
/* Set up the prompt */
|
2001-03-13 22:57:56 +00:00
|
|
|
if (shell_context == 0) {
|
2007-01-30 22:44:07 +00:00
|
|
|
char *ns;
|
|
|
|
free((char*)PS1);
|
|
|
|
ns = xmalloc(strlen(cwd)+4);
|
|
|
|
sprintf(ns, "%s %c ", cwd, (geteuid() != 0) ? '$': '#');
|
|
|
|
PS1 = ns;
|
|
|
|
return ns;
|
2000-12-18 20:25:50 +00:00
|
|
|
} else {
|
2007-01-30 22:44:07 +00:00
|
|
|
return PS2;
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
2001-03-13 22:57:56 +00:00
|
|
|
#else
|
2007-03-31 11:07:30 +00:00
|
|
|
return (shell_context == 0)? PS1 : PS2;
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2001-01-04 11:10:38 +00:00
|
|
|
}
|
|
|
|
|
2007-01-22 09:03:07 +00:00
|
|
|
#if ENABLE_FEATURE_EDITING
|
2007-01-22 07:21:38 +00:00
|
|
|
static line_input_t *line_input_state;
|
|
|
|
#endif
|
|
|
|
|
2007-03-31 11:08:50 +00:00
|
|
|
static int get_command_bufsiz(FILE * source, char *command)
|
2001-01-04 11:10:38 +00:00
|
|
|
{
|
2007-01-30 22:44:07 +00:00
|
|
|
const char *prompt_str;
|
2001-01-05 20:58:22 +00:00
|
|
|
|
2001-01-04 11:10:38 +00:00
|
|
|
if (source == NULL) {
|
|
|
|
if (local_pending_command) {
|
|
|
|
/* a command specified (-c option): return it & mark it done */
|
2007-03-31 11:08:50 +00:00
|
|
|
strncpy(command, local_pending_command, BUFSIZ);
|
2001-01-04 11:10:38 +00:00
|
|
|
local_pending_command = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
if (source == stdin) {
|
2007-01-30 22:44:07 +00:00
|
|
|
prompt_str = setup_prompt_string();
|
2001-01-05 20:58:22 +00:00
|
|
|
|
2007-01-22 09:03:07 +00:00
|
|
|
#if ENABLE_FEATURE_EDITING
|
2000-07-28 15:14:45 +00:00
|
|
|
/*
|
|
|
|
** enable command line editing only while a command line
|
|
|
|
** is actually being read; otherwise, we'll end up bequeathing
|
|
|
|
** atexit() handlers and other unwanted stuff to our
|
|
|
|
** child processes (rob@sysgo.de)
|
|
|
|
*/
|
2007-01-22 07:21:38 +00:00
|
|
|
read_line_input(prompt_str, command, BUFSIZ, line_input_state);
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
2000-03-19 05:28:55 +00:00
|
|
|
#else
|
2001-01-05 20:58:22 +00:00
|
|
|
fputs(prompt_str, stdout);
|
2000-03-16 08:09:09 +00:00
|
|
|
#endif
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
if (!fgets(command, BUFSIZ - 2, source)) {
|
|
|
|
if (source == stdin)
|
2006-10-26 00:37:00 +00:00
|
|
|
puts("");
|
2000-03-16 08:12:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
static char * strsep_space(char *string, int * ix)
|
2001-06-27 04:30:11 +00:00
|
|
|
{
|
|
|
|
/* Short circuit the trivial case */
|
2007-03-31 11:07:30 +00:00
|
|
|
if (!string || ! string[*ix])
|
2001-06-27 04:30:11 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Find the end of the token. */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
while (string[*ix] && !isspace(string[*ix]) ) {
|
2001-06-27 04:30:11 +00:00
|
|
|
(*ix)++;
|
|
|
|
}
|
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* Find the end of any whitespace trailing behind
|
2001-06-27 04:30:11 +00:00
|
|
|
* the token and let that be part of the token */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
while (string[*ix] && (isspace)(string[*ix]) ) {
|
2001-06-27 04:30:11 +00:00
|
|
|
(*ix)++;
|
|
|
|
}
|
|
|
|
|
2006-06-13 18:50:20 +00:00
|
|
|
if (!*ix) {
|
2001-06-27 04:30:11 +00:00
|
|
|
/* Nothing useful was found */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
return xstrndup(string, *ix);
|
2001-06-27 04:30:11 +00:00
|
|
|
}
|
2001-03-13 22:57:56 +00:00
|
|
|
|
2001-03-08 17:17:13 +00:00
|
|
|
static int expand_arguments(char *command)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2007-04-08 16:07:02 +00:00
|
|
|
static const char out_of_space[] = "out of space during expansion";
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
int total_length = 0, length, i, retval, ix = 0;
|
2001-06-27 04:30:11 +00:00
|
|
|
expand_t expand_result;
|
|
|
|
char *tmpcmd, *cmd, *cmd_copy;
|
|
|
|
char *src, *dst, *var;
|
|
|
|
int flags = GLOB_NOCHECK
|
|
|
|
#ifdef GLOB_BRACE
|
|
|
|
| GLOB_BRACE
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2001-06-27 04:30:11 +00:00
|
|
|
#ifdef GLOB_TILDE
|
|
|
|
| GLOB_TILDE
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2001-06-27 04:30:11 +00:00
|
|
|
;
|
2001-03-08 17:17:13 +00:00
|
|
|
|
|
|
|
/* get rid of the terminating \n */
|
|
|
|
chomp(command);
|
2001-06-27 04:30:11 +00:00
|
|
|
|
2001-03-13 22:57:56 +00:00
|
|
|
/* Fix up escape sequences to be the Real Thing(tm) */
|
2007-03-31 11:07:30 +00:00
|
|
|
while (command && command[ix]) {
|
2001-03-21 07:34:27 +00:00
|
|
|
if (command[ix] == '\\') {
|
2001-04-09 22:48:12 +00:00
|
|
|
const char *tmp = command+ix+1;
|
2003-03-19 09:13:01 +00:00
|
|
|
command[ix] = bb_process_escape_sequence( &tmp );
|
2001-03-21 07:34:27 +00:00
|
|
|
memmove(command+ix + 1, tmp, strlen(tmp)+1);
|
2001-03-13 22:57:56 +00:00
|
|
|
}
|
2001-03-21 07:34:27 +00:00
|
|
|
ix++;
|
2001-03-13 22:57:56 +00:00
|
|
|
}
|
2001-06-27 04:30:11 +00:00
|
|
|
/* Use glob and then fixup environment variables and such */
|
|
|
|
|
|
|
|
/* It turns out that glob is very stupid. We have to feed it one word at a
|
|
|
|
* time since it can't cope with a full string. Here we convert command
|
|
|
|
* (char*) into cmd (char**, one word per string) */
|
|
|
|
|
|
|
|
/* We need a clean copy, so strsep can mess up the copy while
|
|
|
|
* we write stuff into the original (in a minute) */
|
2006-08-03 15:41:12 +00:00
|
|
|
cmd = cmd_copy = xstrdup(command);
|
2001-06-27 04:30:11 +00:00
|
|
|
*command = '\0';
|
2004-02-10 01:07:45 +00:00
|
|
|
for (ix = 0, tmpcmd = cmd;
|
2007-03-31 11:07:30 +00:00
|
|
|
(tmpcmd = strsep_space(cmd, &ix)) != NULL; cmd += ix, ix = 0) {
|
2001-06-27 04:30:11 +00:00
|
|
|
if (*tmpcmd == '\0')
|
|
|
|
break;
|
|
|
|
/* we need to trim() the result for glob! */
|
|
|
|
trim(tmpcmd);
|
|
|
|
retval = glob(tmpcmd, flags, NULL, &expand_result);
|
|
|
|
free(tmpcmd); /* Free mem allocated by strsep_space */
|
|
|
|
if (retval == GLOB_NOSPACE) {
|
|
|
|
/* Mem may have been allocated... */
|
2007-04-10 15:42:06 +00:00
|
|
|
globfree(&expand_result);
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg(out_of_space);
|
2001-06-27 04:30:11 +00:00
|
|
|
return FALSE;
|
|
|
|
} else if (retval != 0) {
|
|
|
|
/* Some other error. GLOB_NOMATCH shouldn't
|
2004-02-10 01:07:45 +00:00
|
|
|
* happen because of the GLOB_NOCHECK flag in
|
2001-06-27 04:30:11 +00:00
|
|
|
* the glob call. */
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg("syntax error");
|
2001-06-27 04:30:11 +00:00
|
|
|
return FALSE;
|
|
|
|
} else {
|
|
|
|
/* Convert from char** (one word per string) to a simple char*,
|
|
|
|
* but don't overflow command which is BUFSIZ in length */
|
2007-03-31 11:07:30 +00:00
|
|
|
for (i = 0; i < expand_result.gl_pathc; i++) {
|
|
|
|
length = strlen(expand_result.gl_pathv[i]);
|
2001-06-27 04:30:11 +00:00
|
|
|
if (total_length+length+1 >= BUFSIZ) {
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg(out_of_space);
|
2001-06-27 04:30:11 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
strcat(command+total_length, " ");
|
2007-03-31 11:07:30 +00:00
|
|
|
total_length += 1;
|
2001-06-27 04:30:11 +00:00
|
|
|
strcat(command+total_length, expand_result.gl_pathv[i]);
|
2007-03-31 11:07:30 +00:00
|
|
|
total_length += length;
|
2001-06-27 04:30:11 +00:00
|
|
|
}
|
2007-04-10 15:42:06 +00:00
|
|
|
globfree(&expand_result);
|
2001-06-27 04:30:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
free(cmd_copy);
|
|
|
|
trim(command);
|
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* Now do the shell variable substitutions which
|
2001-06-27 04:30:11 +00:00
|
|
|
* wordexp can't do for us, namely $? and $! */
|
|
|
|
src = command;
|
2007-03-31 11:07:30 +00:00
|
|
|
while ((dst = strchr(src,'$')) != NULL) {
|
2001-06-27 04:30:11 +00:00
|
|
|
var = NULL;
|
2006-12-26 10:42:51 +00:00
|
|
|
switch (*(dst+1)) {
|
2001-06-27 04:30:11 +00:00
|
|
|
case '?':
|
|
|
|
var = itoa(last_return_code);
|
|
|
|
break;
|
|
|
|
case '!':
|
2007-03-31 11:07:30 +00:00
|
|
|
if (last_bg_pid == -1)
|
2007-01-30 22:44:07 +00:00
|
|
|
*var = '\0';
|
2001-06-27 04:30:11 +00:00
|
|
|
else
|
|
|
|
var = itoa(last_bg_pid);
|
|
|
|
break;
|
|
|
|
/* Everything else like $$, $#, $[0-9], etc. should all be
|
|
|
|
* expanded by wordexp(), so we can in theory skip that stuff
|
|
|
|
* here, but just to be on the safe side (i.e., since uClibc
|
|
|
|
* wordexp doesn't do this stuff yet), lets leave it in for
|
|
|
|
* now. */
|
|
|
|
case '$':
|
|
|
|
var = itoa(getpid());
|
|
|
|
break;
|
|
|
|
case '#':
|
|
|
|
var = itoa(argc-1);
|
|
|
|
break;
|
|
|
|
case '0':case '1':case '2':case '3':case '4':
|
|
|
|
case '5':case '6':case '7':case '8':case '9':
|
|
|
|
{
|
2007-03-31 11:07:30 +00:00
|
|
|
int ixx = *(dst+1)-48+1;
|
2001-06-27 04:30:11 +00:00
|
|
|
if (ixx >= argc) {
|
2007-03-31 11:07:30 +00:00
|
|
|
var = '\0';
|
2001-06-27 04:30:11 +00:00
|
|
|
} else {
|
|
|
|
var = argv[ixx];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
if (var) {
|
2004-03-15 08:29:22 +00:00
|
|
|
/* a single character construction was found, and
|
2001-06-27 04:30:11 +00:00
|
|
|
* already handled in the case statement */
|
2007-03-31 11:07:30 +00:00
|
|
|
src = dst + 2;
|
2001-06-27 04:30:11 +00:00
|
|
|
} else {
|
|
|
|
/* Looks like an environment variable */
|
|
|
|
char delim_hold;
|
2007-03-31 11:07:30 +00:00
|
|
|
int num_skip_chars = 0;
|
2001-06-27 04:30:11 +00:00
|
|
|
int dstlen = strlen(dst);
|
|
|
|
/* Is this a ${foo} type variable? */
|
2007-03-31 11:07:30 +00:00
|
|
|
if (dstlen >= 2 && *(dst+1) == '{') {
|
|
|
|
src = strchr(dst+1, '}');
|
|
|
|
num_skip_chars = 1;
|
2001-06-27 04:30:11 +00:00
|
|
|
} else {
|
2007-03-31 11:07:30 +00:00
|
|
|
src = dst + 1;
|
|
|
|
while ((isalnum)(*src) || *src == '_') src++;
|
2001-06-27 04:30:11 +00:00
|
|
|
}
|
|
|
|
if (src == NULL) {
|
|
|
|
src = dst+dstlen;
|
|
|
|
}
|
2007-03-31 11:07:30 +00:00
|
|
|
delim_hold = *src;
|
|
|
|
*src = '\0'; /* temporary */
|
2001-06-27 04:30:11 +00:00
|
|
|
var = getenv(dst + 1 + num_skip_chars);
|
2007-03-31 11:07:30 +00:00
|
|
|
*src = delim_hold;
|
2001-06-27 04:30:11 +00:00
|
|
|
src += num_skip_chars;
|
|
|
|
}
|
|
|
|
if (var == NULL) {
|
|
|
|
/* Seems we got an un-expandable variable. So delete it. */
|
2007-01-30 22:44:07 +00:00
|
|
|
var = (char*)"";
|
2001-06-27 04:30:11 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
int subst_len = strlen(var);
|
|
|
|
int trail_len = strlen(src);
|
|
|
|
if (dst+subst_len+trail_len >= command+BUFSIZ) {
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg(out_of_space);
|
2001-06-27 04:30:11 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
/* Move stuff to the end of the string to accommodate
|
|
|
|
* filling the created gap with the new stuff */
|
|
|
|
memmove(dst+subst_len, src, trail_len+1);
|
|
|
|
/* Now copy in the new stuff */
|
|
|
|
memcpy(dst, var, subst_len);
|
|
|
|
src = dst+subst_len;
|
|
|
|
}
|
|
|
|
}
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2001-03-08 17:17:13 +00:00
|
|
|
return TRUE;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
/* Return cmd->num_progs as 0 if no command is present (e.g. an empty
|
|
|
|
line). If a valid command is found, command_ptr is set to point to
|
2004-02-10 01:07:45 +00:00
|
|
|
the beginning of the next command (if the original command had more
|
|
|
|
then one job associated with it) or NULL if no more commands are
|
2000-03-12 23:49:18 +00:00
|
|
|
present. */
|
2000-12-18 20:25:50 +00:00
|
|
|
static int parse_command(char **command_ptr, struct job *job, int *inbg)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
char *command;
|
2000-12-18 20:25:50 +00:00
|
|
|
char *return_command = NULL;
|
2004-02-10 01:07:45 +00:00
|
|
|
char *src, *buf;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
int argc_l;
|
|
|
|
int flag;
|
2000-12-18 20:25:50 +00:00
|
|
|
int argv_alloced;
|
2000-03-16 08:12:48 +00:00
|
|
|
char quote = '\0';
|
2000-12-18 20:25:50 +00:00
|
|
|
struct child_prog *prog;
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2004-02-10 01:07:45 +00:00
|
|
|
int i;
|
|
|
|
char *chptr;
|
|
|
|
#endif
|
2000-03-16 08:12:48 +00:00
|
|
|
|
|
|
|
/* skip leading white space */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
*command_ptr = skip_whitespace(*command_ptr);
|
2000-03-16 08:12:48 +00:00
|
|
|
|
|
|
|
/* this handles empty lines or leading '#' characters */
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!**command_ptr || (**command_ptr == '#')) {
|
2007-03-31 11:07:30 +00:00
|
|
|
job->num_progs = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
*inbg = 0;
|
|
|
|
job->num_progs = 1;
|
2000-07-14 01:13:11 +00:00
|
|
|
job->progs = xmalloc(sizeof(*job->progs));
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* We set the argv elements to point inside of this string. The
|
2000-12-18 20:25:50 +00:00
|
|
|
memory is freed by free_job(). Allocate twice the original
|
2000-07-03 23:56:26 +00:00
|
|
|
length in case we need to quote every single character.
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
Getting clean memory relieves us of the task of NULL
|
|
|
|
terminating things and makes the rest of this look a bit
|
2000-03-16 08:12:48 +00:00
|
|
|
cleaner (though it is, admittedly, a tad less efficient) */
|
2006-06-13 18:50:20 +00:00
|
|
|
job->cmdbuf = command = xzalloc(2*strlen(*command_ptr) + 1);
|
2000-03-16 08:12:48 +00:00
|
|
|
job->text = NULL;
|
|
|
|
|
|
|
|
prog = job->progs;
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->num_redirects = 0;
|
|
|
|
prog->is_stopped = 0;
|
|
|
|
prog->family = job;
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2004-02-10 01:07:45 +00:00
|
|
|
prog->redirects = NULL;
|
|
|
|
#endif
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
argv_alloced = 5;
|
|
|
|
prog->argv = xmalloc(sizeof(*prog->argv) * argv_alloced);
|
|
|
|
prog->argv[0] = job->cmdbuf;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
flag = argc_l = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
buf = command;
|
2000-12-18 20:25:50 +00:00
|
|
|
src = *command_ptr;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
while (*src && !(flag & LASH_OPT_DONE)) {
|
2000-03-16 08:12:48 +00:00
|
|
|
if (quote == *src) {
|
|
|
|
quote = '\0';
|
|
|
|
} else if (quote) {
|
|
|
|
if (*src == '\\') {
|
|
|
|
src++;
|
|
|
|
if (!*src) {
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg("character expected after \\");
|
2000-12-18 20:25:50 +00:00
|
|
|
free_job(job);
|
2000-03-16 08:12:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* in shell, "\'" should yield \' */
|
2000-12-11 19:14:40 +00:00
|
|
|
if (*src != quote) {
|
2000-03-16 08:12:48 +00:00
|
|
|
*buf++ = '\\';
|
2000-12-11 19:14:40 +00:00
|
|
|
*buf++ = '\\';
|
|
|
|
}
|
2000-03-16 08:12:48 +00:00
|
|
|
} else if (*src == '*' || *src == '?' || *src == '[' ||
|
|
|
|
*src == ']') *buf++ = '\\';
|
|
|
|
*buf++ = *src;
|
|
|
|
} else if (isspace(*src)) {
|
2007-04-12 17:10:45 +00:00
|
|
|
if (*prog->argv[argc_l] || (flag & LASH_OPT_SAW_QUOTE)) {
|
2000-07-27 00:15:20 +00:00
|
|
|
buf++, argc_l++;
|
2000-03-16 08:12:48 +00:00
|
|
|
/* +1 here leaves room for the NULL which ends argv */
|
2000-12-18 20:25:50 +00:00
|
|
|
if ((argc_l + 1) == argv_alloced) {
|
|
|
|
argv_alloced += 5;
|
2000-09-13 02:08:21 +00:00
|
|
|
prog->argv = xrealloc(prog->argv,
|
2007-03-31 11:07:30 +00:00
|
|
|
sizeof(*prog->argv) * argv_alloced);
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-07-27 00:15:20 +00:00
|
|
|
prog->argv[argc_l] = buf;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
flag ^= LASH_OPT_SAW_QUOTE;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
switch (*src) {
|
|
|
|
case '"':
|
|
|
|
case '\'':
|
|
|
|
quote = *src;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
flag |= LASH_OPT_SAW_QUOTE;
|
2000-03-16 08:12:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '#': /* comment */
|
2000-07-27 00:15:20 +00:00
|
|
|
if (*(src-1)== '$')
|
|
|
|
*buf++ = *src;
|
|
|
|
else
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
flag |= LASH_OPT_DONE;
|
2000-03-16 08:12:48 +00:00
|
|
|
break;
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_PIPE_N_REDIRECTS
|
2000-12-18 20:25:50 +00:00
|
|
|
case '>': /* redirects */
|
2000-03-16 08:12:48 +00:00
|
|
|
case '<':
|
2000-12-18 20:25:50 +00:00
|
|
|
i = prog->num_redirects++;
|
|
|
|
prog->redirects = xrealloc(prog->redirects,
|
2007-03-31 11:07:30 +00:00
|
|
|
sizeof(*prog->redirects) * (i + 1));
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].fd = -1;
|
2000-07-27 00:15:20 +00:00
|
|
|
if (buf != prog->argv[argc_l]) {
|
2004-03-15 08:29:22 +00:00
|
|
|
/* the stuff before this character may be the file number
|
2000-03-16 08:12:48 +00:00
|
|
|
being redirected */
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].fd =
|
2000-07-27 00:15:20 +00:00
|
|
|
strtol(prog->argv[argc_l], &chptr, 10);
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-07-27 00:15:20 +00:00
|
|
|
if (*chptr && *prog->argv[argc_l]) {
|
|
|
|
buf++, argc_l++;
|
|
|
|
prog->argv[argc_l] = buf;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (prog->redirects[i].fd == -1) {
|
2000-03-16 08:12:48 +00:00
|
|
|
if (*src == '>')
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].fd = 1;
|
2000-03-16 08:12:48 +00:00
|
|
|
else
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].fd = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (*src++ == '>') {
|
|
|
|
if (*src == '>')
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].type =
|
2000-03-16 08:12:48 +00:00
|
|
|
REDIRECT_APPEND, src++;
|
|
|
|
else
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].type = REDIRECT_OVERWRITE;
|
2000-03-16 08:12:48 +00:00
|
|
|
} else {
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].type = REDIRECT_INPUT;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This isn't POSIX sh compliant. Oh well. */
|
|
|
|
chptr = src;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
chptr = skip_whitespace(chptr);
|
2000-03-16 08:12:48 +00:00
|
|
|
|
|
|
|
if (!*chptr) {
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg("file name expected after %c", *(src-1));
|
2000-12-18 20:25:50 +00:00
|
|
|
free_job(job);
|
2007-03-31 11:07:30 +00:00
|
|
|
job->num_progs = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
prog->redirects[i].filename = buf;
|
2000-03-16 08:12:48 +00:00
|
|
|
while (*chptr && !isspace(*chptr))
|
|
|
|
*buf++ = *chptr++;
|
|
|
|
|
|
|
|
src = chptr - 1; /* we src++ later */
|
2000-07-27 00:15:20 +00:00
|
|
|
prog->argv[argc_l] = ++buf;
|
2000-03-16 08:12:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '|': /* pipe */
|
|
|
|
/* finish this command */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
if (*prog->argv[argc_l] || flag & LASH_OPT_SAW_QUOTE)
|
2000-07-27 00:15:20 +00:00
|
|
|
argc_l++;
|
|
|
|
if (!argc_l) {
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
goto empty_command_in_pipe;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-07-27 00:15:20 +00:00
|
|
|
prog->argv[argc_l] = NULL;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
|
|
|
/* and start the next */
|
2000-12-18 20:25:50 +00:00
|
|
|
job->num_progs++;
|
2000-09-13 02:08:21 +00:00
|
|
|
job->progs = xrealloc(job->progs,
|
2007-03-31 11:07:30 +00:00
|
|
|
sizeof(*job->progs) * job->num_progs);
|
2000-12-18 20:25:50 +00:00
|
|
|
prog = job->progs + (job->num_progs - 1);
|
|
|
|
prog->num_redirects = 0;
|
|
|
|
prog->redirects = NULL;
|
|
|
|
prog->is_stopped = 0;
|
|
|
|
prog->family = job;
|
2000-07-27 00:15:20 +00:00
|
|
|
argc_l = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
argv_alloced = 5;
|
|
|
|
prog->argv = xmalloc(sizeof(*prog->argv) * argv_alloced);
|
2000-03-16 08:12:48 +00:00
|
|
|
prog->argv[0] = ++buf;
|
|
|
|
|
|
|
|
src++;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
src = skip_whitespace(src);
|
2000-03-16 08:12:48 +00:00
|
|
|
|
|
|
|
if (!*src) {
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
empty_command_in_pipe:
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg("empty command in pipe");
|
2000-12-18 20:25:50 +00:00
|
|
|
free_job(job);
|
2007-03-31 11:07:30 +00:00
|
|
|
job->num_progs = 0;
|
2000-03-16 08:12:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
src--; /* we'll ++ it at the end of the loop */
|
|
|
|
|
|
|
|
break;
|
2004-02-10 01:07:45 +00:00
|
|
|
#endif
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2000-03-16 08:12:48 +00:00
|
|
|
case '&': /* background */
|
2000-12-18 20:25:50 +00:00
|
|
|
*inbg = 1;
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
/* fallthrough */
|
2004-02-10 01:28:36 +00:00
|
|
|
#endif
|
2000-03-16 08:12:48 +00:00
|
|
|
case ';': /* multiple commands */
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
flag |= LASH_OPT_DONE;
|
2000-12-18 20:25:50 +00:00
|
|
|
return_command = *command_ptr + (src - *command_ptr) + 1;
|
2000-03-16 08:12:48 +00:00
|
|
|
break;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-09-14 00:43:20 +00:00
|
|
|
case '\\':
|
|
|
|
src++;
|
|
|
|
if (!*src) {
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_error_msg("character expected after \\");
|
2000-12-18 20:25:50 +00:00
|
|
|
free_job(job);
|
2000-09-14 00:43:20 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (*src == '*' || *src == '[' || *src == ']'
|
|
|
|
|| *src == '?') *buf++ = '\\';
|
|
|
|
/* fallthrough */
|
2000-03-16 08:12:48 +00:00
|
|
|
default:
|
|
|
|
*buf++ = *src;
|
|
|
|
}
|
|
|
|
|
|
|
|
src++;
|
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
if (*prog->argv[argc_l] || flag & LASH_OPT_SAW_QUOTE) {
|
2000-07-27 00:15:20 +00:00
|
|
|
argc_l++;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-07-27 00:15:20 +00:00
|
|
|
if (!argc_l) {
|
2000-12-18 20:25:50 +00:00
|
|
|
free_job(job);
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2000-07-27 00:15:20 +00:00
|
|
|
prog->argv[argc_l] = NULL;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!return_command) {
|
2006-08-03 15:41:12 +00:00
|
|
|
job->text = xstrdup(*command_ptr);
|
2000-03-16 08:12:48 +00:00
|
|
|
} else {
|
|
|
|
/* This leaves any trailing spaces, which is a bit sloppy */
|
2006-08-03 15:41:12 +00:00
|
|
|
job->text = xstrndup(*command_ptr, return_command - *command_ptr);
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
*command_ptr = return_command;
|
2004-02-10 01:07:45 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
/* Run the child_prog, no matter what kind of command it uses.
|
|
|
|
*/
|
|
|
|
static int pseudo_exec(struct child_prog *child)
|
2000-03-16 08:12:48 +00:00
|
|
|
{
|
2007-01-30 22:44:07 +00:00
|
|
|
const struct built_in_command *x;
|
2006-06-13 19:01:30 +00:00
|
|
|
|
2000-12-21 18:31:36 +00:00
|
|
|
/* Check if the command matches any of the non-forking builtins.
|
|
|
|
* Depending on context, this might be redundant. But it's
|
|
|
|
* easier to waste a few CPU cycles than it is to figure out
|
|
|
|
* if this is one of those cases.
|
2000-12-18 20:25:50 +00:00
|
|
|
*/
|
2000-12-21 18:31:36 +00:00
|
|
|
/* Check if the command matches any of the forking builtins. */
|
2007-04-12 17:10:45 +00:00
|
|
|
for (x = bltins; x <= &VEC_LAST(bltins); x++) {
|
2000-12-18 20:25:50 +00:00
|
|
|
if (strcmp(child->argv[0], x->cmd) == 0) {
|
2007-03-31 11:07:30 +00:00
|
|
|
_exit(x->function(child));
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
|
|
|
}
|
2006-06-13 19:01:30 +00:00
|
|
|
|
2007-04-12 17:10:45 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
/* Check if the command matches any busybox internal
|
|
|
|
* commands ("applets") here. Following discussions from
|
2001-12-08 01:56:15 +00:00
|
|
|
* November 2000 on busybox@busybox.net, don't use
|
2003-03-19 09:13:01 +00:00
|
|
|
* bb_get_last_path_component(). This way explicit (with
|
2000-12-18 20:25:50 +00:00
|
|
|
* slashes) filenames will never be interpreted as an
|
|
|
|
* applet, just like with builtins. This way the user can
|
|
|
|
* override an applet with an explicit filename reference.
|
|
|
|
* The only downside to this change is that an explicit
|
|
|
|
* /bin/foo invocation will fork and exec /bin/foo, even if
|
|
|
|
* /bin/foo is a symlink to busybox.
|
|
|
|
*/
|
2007-04-10 23:03:30 +00:00
|
|
|
if (ENABLE_FEATURE_SH_STANDALONE) {
|
2007-04-14 10:09:57 +00:00
|
|
|
run_applet_and_exit(child->argv[0], child->argv);
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
execvp(child->argv[0], child->argv);
|
2002-09-26 13:59:40 +00:00
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* Do not use bb_perror_msg_and_die() here, since we must not
|
2002-09-26 13:59:40 +00:00
|
|
|
* call exit() but should call _exit() instead */
|
2006-06-20 21:35:26 +00:00
|
|
|
bb_perror_msg("%s", child->argv[0]);
|
2002-09-26 13:59:40 +00:00
|
|
|
_exit(EXIT_FAILURE);
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void insert_job(struct job *newjob, int inbg)
|
|
|
|
{
|
|
|
|
struct job *thejob;
|
2007-03-31 11:07:30 +00:00
|
|
|
struct jobset *j_list = newjob->job_list;
|
2000-12-18 20:25:50 +00:00
|
|
|
|
|
|
|
/* find the ID for thejob to use */
|
|
|
|
newjob->jobid = 1;
|
2001-03-21 07:34:27 +00:00
|
|
|
for (thejob = j_list->head; thejob; thejob = thejob->next)
|
2000-12-18 20:25:50 +00:00
|
|
|
if (thejob->jobid >= newjob->jobid)
|
|
|
|
newjob->jobid = thejob->jobid + 1;
|
|
|
|
|
|
|
|
/* add thejob to the list of running jobs */
|
2001-03-21 07:34:27 +00:00
|
|
|
if (!j_list->head) {
|
|
|
|
thejob = j_list->head = xmalloc(sizeof(*thejob));
|
2000-12-18 20:25:50 +00:00
|
|
|
} else {
|
2001-03-21 07:34:27 +00:00
|
|
|
for (thejob = j_list->head; thejob->next; thejob = thejob->next) /* nothing */;
|
2000-12-18 20:25:50 +00:00
|
|
|
thejob->next = xmalloc(sizeof(*thejob));
|
|
|
|
thejob = thejob->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
*thejob = *newjob; /* physically copy the struct job */
|
|
|
|
thejob->next = NULL;
|
|
|
|
thejob->running_progs = thejob->num_progs;
|
|
|
|
thejob->stopped_progs = 0;
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2000-12-18 20:25:50 +00:00
|
|
|
if (inbg) {
|
2004-02-10 01:07:45 +00:00
|
|
|
/* we don't wait for background thejobs to return -- append it
|
2000-12-18 20:25:50 +00:00
|
|
|
to the list of backgrounded thejobs and leave it alone */
|
|
|
|
printf("[%d] %d\n", thejob->jobid,
|
|
|
|
newjob->progs[newjob->num_progs - 1].pid);
|
2001-06-21 16:38:11 +00:00
|
|
|
last_jobid = newjob->jobid;
|
2007-03-31 11:07:30 +00:00
|
|
|
last_bg_pid = newjob->progs[newjob->num_progs - 1].pid;
|
2000-12-18 20:25:50 +00:00
|
|
|
} else {
|
|
|
|
newjob->job_list->fg = thejob;
|
|
|
|
|
|
|
|
/* move the new process group into the foreground */
|
2006-06-13 18:50:20 +00:00
|
|
|
/* Ignore errors since child could have already exited */
|
|
|
|
tcsetpgrp(shell_terminal, newjob->pgrp);
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
2004-02-10 01:28:36 +00:00
|
|
|
#endif
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int run_command(struct job *newjob, int inbg, int outpipe[2])
|
|
|
|
{
|
|
|
|
/* struct job *thejob; */
|
|
|
|
int i;
|
|
|
|
int nextin, nextout;
|
|
|
|
int pipefds[2]; /* pipefd[0] is for reading */
|
2007-01-30 22:44:07 +00:00
|
|
|
const struct built_in_command *x;
|
2000-12-18 20:25:50 +00:00
|
|
|
struct child_prog *child;
|
|
|
|
|
2007-04-12 17:10:45 +00:00
|
|
|
nextin = 0;
|
2000-12-18 20:25:50 +00:00
|
|
|
for (i = 0; i < newjob->num_progs; i++) {
|
2007-04-12 12:27:32 +00:00
|
|
|
child = &(newjob->progs[i]);
|
2000-12-18 20:25:50 +00:00
|
|
|
|
2007-04-12 17:10:45 +00:00
|
|
|
nextout = 1;
|
2000-12-18 20:25:50 +00:00
|
|
|
if ((i + 1) < newjob->num_progs) {
|
2007-05-26 16:44:20 +00:00
|
|
|
xpipe(pipefds);
|
2000-03-16 08:12:48 +00:00
|
|
|
nextout = pipefds[1];
|
2007-04-12 17:10:45 +00:00
|
|
|
} else if (outpipe[1] != -1) {
|
|
|
|
nextout = outpipe[1];
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
|
|
|
|
2000-12-21 18:31:36 +00:00
|
|
|
/* Check if the command matches any non-forking builtins,
|
|
|
|
* but only if this is a simple command.
|
|
|
|
* Non-forking builtins within pipes have to fork anyway,
|
|
|
|
* and are handled in pseudo_exec. "echo foo | read bar"
|
|
|
|
* is doomed to failure, and doesn't work on bash, either.
|
2000-12-18 20:25:50 +00:00
|
|
|
*/
|
2000-12-21 18:31:36 +00:00
|
|
|
if (newjob->num_progs == 1) {
|
2007-04-14 11:16:29 +00:00
|
|
|
int rcode;
|
|
|
|
int squirrel[] = {-1, -1, -1};
|
|
|
|
|
2006-07-01 17:19:02 +00:00
|
|
|
/* Check if the command sets an environment variable. */
|
|
|
|
if (strchr(child->argv[0], '=') != NULL) {
|
|
|
|
child->argv[1] = child->argv[0];
|
|
|
|
return builtin_export(child);
|
|
|
|
}
|
|
|
|
|
2007-04-12 17:10:45 +00:00
|
|
|
for (x = bltins; x <= &VEC_LAST(bltins); x++) {
|
2007-03-24 15:40:16 +00:00
|
|
|
if (strcmp(child->argv[0], x->cmd) == 0) {
|
2000-12-21 18:31:36 +00:00
|
|
|
setup_redirects(child, squirrel);
|
|
|
|
rcode = x->function(child);
|
|
|
|
restore_redirects(squirrel);
|
|
|
|
return rcode;
|
|
|
|
}
|
2000-05-19 05:35:19 +00:00
|
|
|
}
|
2007-04-14 11:16:29 +00:00
|
|
|
#if ENABLE_FEATURE_SH_STANDALONE
|
|
|
|
{
|
|
|
|
const struct bb_applet *a = find_applet_by_name(child->argv[i]);
|
|
|
|
if (a && a->nofork) {
|
|
|
|
setup_redirects(child, squirrel);
|
|
|
|
rcode = run_nofork_applet(a, child->argv + i);
|
|
|
|
restore_redirects(squirrel);
|
|
|
|
return rcode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2000-05-19 05:35:19 +00:00
|
|
|
}
|
|
|
|
|
2007-04-12 17:10:45 +00:00
|
|
|
#if BB_MMU
|
2007-04-12 12:27:32 +00:00
|
|
|
child->pid = fork();
|
2001-10-28 05:12:20 +00:00
|
|
|
#else
|
2007-04-12 12:27:32 +00:00
|
|
|
child->pid = vfork();
|
2001-10-28 05:12:20 +00:00
|
|
|
#endif
|
2007-04-12 12:27:32 +00:00
|
|
|
if (!child->pid) {
|
2001-06-25 17:11:54 +00:00
|
|
|
/* Set the handling for job control signals back to the default. */
|
|
|
|
signal(SIGINT, SIG_DFL);
|
|
|
|
signal(SIGQUIT, SIG_DFL);
|
|
|
|
signal(SIGTSTP, SIG_DFL);
|
|
|
|
signal(SIGTTIN, SIG_DFL);
|
2000-03-16 08:12:48 +00:00
|
|
|
signal(SIGTTOU, SIG_DFL);
|
2001-06-25 17:11:54 +00:00
|
|
|
signal(SIGCHLD, SIG_DFL);
|
2000-03-16 08:09:09 +00:00
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
/* Close all open filehandles. */
|
2007-03-31 11:07:30 +00:00
|
|
|
while (close_me_list)
|
|
|
|
close((long)llist_pop(&close_me_list));
|
2001-01-05 20:58:22 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
if (outpipe[1] != -1) {
|
2000-12-18 20:25:50 +00:00
|
|
|
close(outpipe[0]);
|
2000-07-18 08:16:39 +00:00
|
|
|
}
|
|
|
|
if (nextin != 0) {
|
|
|
|
dup2(nextin, 0);
|
|
|
|
close(nextin);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nextout != 1) {
|
2000-03-16 08:12:48 +00:00
|
|
|
dup2(nextout, 1);
|
2000-12-18 20:25:50 +00:00
|
|
|
dup2(nextout, 2); /* Really? */
|
2000-03-16 08:12:48 +00:00
|
|
|
close(nextout);
|
2000-07-28 15:14:45 +00:00
|
|
|
close(pipefds[0]);
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
/* explicit redirects override pipes */
|
2000-12-21 18:31:36 +00:00
|
|
|
setup_redirects(child,NULL);
|
2000-11-17 18:25:26 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
pseudo_exec(child);
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
2007-03-31 11:07:30 +00:00
|
|
|
if (outpipe[1] != -1) {
|
2000-12-18 20:25:50 +00:00
|
|
|
close(outpipe[1]);
|
2000-07-17 19:14:41 +00:00
|
|
|
}
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
/* put our child in the process group whose leader is the
|
|
|
|
first process in this pipe */
|
2000-12-18 20:25:50 +00:00
|
|
|
setpgid(child->pid, newjob->progs[0].pid);
|
2000-03-16 08:12:48 +00:00
|
|
|
if (nextin != 0)
|
|
|
|
close(nextin);
|
2000-07-18 08:16:39 +00:00
|
|
|
if (nextout != 1)
|
2000-03-16 08:12:48 +00:00
|
|
|
close(nextout);
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2004-02-10 01:07:45 +00:00
|
|
|
/* If there isn't another process, nextin is garbage
|
2000-03-16 08:12:48 +00:00
|
|
|
but it doesn't matter */
|
|
|
|
nextin = pipefds[0];
|
|
|
|
}
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
newjob->pgrp = newjob->progs[0].pid;
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
insert_job(newjob, inbg);
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2000-03-16 08:09:09 +00:00
|
|
|
static int busy_loop(FILE * input)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2000-03-16 08:12:48 +00:00
|
|
|
char *command;
|
2000-12-18 20:25:50 +00:00
|
|
|
char *next_command = NULL;
|
|
|
|
struct job newjob;
|
2000-03-16 08:12:48 +00:00
|
|
|
int i;
|
2006-01-30 22:48:39 +00:00
|
|
|
int inbg = 0;
|
2000-07-27 00:15:20 +00:00
|
|
|
int status;
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2004-03-12 22:08:42 +00:00
|
|
|
pid_t parent_pgrp;
|
|
|
|
/* save current owner of TTY so we can restore it on exit */
|
|
|
|
parent_pgrp = tcgetpgrp(shell_terminal);
|
2004-02-10 01:28:36 +00:00
|
|
|
#endif
|
2004-03-05 12:55:30 +00:00
|
|
|
newjob.job_list = &job_list;
|
|
|
|
newjob.job_context = DEFAULT_CONTEXT;
|
2000-06-28 16:56:25 +00:00
|
|
|
|
2006-06-13 18:50:20 +00:00
|
|
|
command = xzalloc(BUFSIZ);
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
while (1) {
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!job_list.fg) {
|
2000-03-16 08:09:09 +00:00
|
|
|
/* no job is in the foreground */
|
|
|
|
|
|
|
|
/* see if any background processes have exited */
|
2000-12-18 20:25:50 +00:00
|
|
|
checkjobs(&job_list);
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!next_command) {
|
2007-03-31 11:08:50 +00:00
|
|
|
if (get_command_bufsiz(input, command))
|
2000-03-16 08:12:48 +00:00
|
|
|
break;
|
2000-12-18 20:25:50 +00:00
|
|
|
next_command = command;
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
|
|
|
|
2007-03-31 11:08:50 +00:00
|
|
|
if (!expand_arguments(next_command)) {
|
2001-03-08 17:17:13 +00:00
|
|
|
free(command);
|
2006-06-13 18:50:20 +00:00
|
|
|
command = xzalloc(BUFSIZ);
|
2001-03-08 17:17:13 +00:00
|
|
|
next_command = NULL;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!parse_command(&next_command, &newjob, &inbg) &&
|
|
|
|
newjob.num_progs) {
|
2007-03-31 11:07:30 +00:00
|
|
|
int pipefds[2] = { -1, -1 };
|
|
|
|
debug_printf("job=%p fed to run_command by busy_loop()'\n",
|
2001-03-13 22:57:56 +00:00
|
|
|
&newjob);
|
2000-12-18 20:25:50 +00:00
|
|
|
run_command(&newjob, inbg, pipefds);
|
2000-07-25 18:06:52 +00:00
|
|
|
}
|
|
|
|
else {
|
2000-07-17 19:14:41 +00:00
|
|
|
free(command);
|
2006-12-22 18:37:07 +00:00
|
|
|
command = xzalloc(BUFSIZ);
|
2000-12-18 20:25:50 +00:00
|
|
|
next_command = NULL;
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* a job is running in the foreground; wait for it */
|
|
|
|
i = 0;
|
2000-12-18 20:25:50 +00:00
|
|
|
while (!job_list.fg->progs[i].pid ||
|
|
|
|
job_list.fg->progs[i].is_stopped == 1) i++;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
if (waitpid(job_list.fg->progs[i].pid, &status, WUNTRACED) < 0) {
|
2002-07-31 04:04:47 +00:00
|
|
|
if (errno != ECHILD) {
|
2007-03-31 11:07:30 +00:00
|
|
|
bb_perror_msg_and_die("waitpid(%d)", job_list.fg->progs[i].pid);
|
2002-07-31 04:04:47 +00:00
|
|
|
}
|
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
|
|
|
|
if (WIFEXITED(status) || WIFSIGNALED(status)) {
|
2000-03-16 08:12:48 +00:00
|
|
|
/* the child exited */
|
2000-12-18 20:25:50 +00:00
|
|
|
job_list.fg->running_progs--;
|
|
|
|
job_list.fg->progs[i].pid = 0;
|
2000-03-16 08:09:09 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
last_return_code = WEXITSTATUS(status);
|
2001-06-27 04:30:11 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!job_list.fg->running_progs) {
|
2000-03-16 08:12:48 +00:00
|
|
|
/* child exited */
|
2000-12-18 20:25:50 +00:00
|
|
|
remove_job(&job_list, job_list.fg);
|
|
|
|
job_list.fg = NULL;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2004-02-10 01:28:36 +00:00
|
|
|
}
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2004-02-10 01:28:36 +00:00
|
|
|
else {
|
2000-03-16 08:12:48 +00:00
|
|
|
/* the child was stopped */
|
2000-12-18 20:25:50 +00:00
|
|
|
job_list.fg->stopped_progs++;
|
|
|
|
job_list.fg->progs[i].is_stopped = 1;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (job_list.fg->stopped_progs == job_list.fg->running_progs) {
|
|
|
|
printf("\n" JOB_STATUS_FORMAT, job_list.fg->jobid,
|
|
|
|
"Stopped", job_list.fg->text);
|
|
|
|
job_list.fg = NULL;
|
2000-03-16 08:12:48 +00:00
|
|
|
}
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (!job_list.fg) {
|
2000-03-16 08:12:48 +00:00
|
|
|
/* move the shell to the foreground */
|
2000-06-28 16:56:25 +00:00
|
|
|
/* suppress messages when run from /linuxrc mag@sysgo.de */
|
2001-06-25 17:11:54 +00:00
|
|
|
if (tcsetpgrp(shell_terminal, getpgrp()) && errno != ENOTTY)
|
2004-02-10 01:07:45 +00:00
|
|
|
bb_perror_msg("tcsetpgrp");
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
2004-02-10 01:28:36 +00:00
|
|
|
#endif
|
2000-03-16 08:09:09 +00:00
|
|
|
}
|
|
|
|
}
|
2000-03-16 08:12:48 +00:00
|
|
|
free(command);
|
2000-03-12 23:49:18 +00:00
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2000-07-03 23:56:26 +00:00
|
|
|
/* return controlling TTY back to parent process group before exiting */
|
2002-07-31 04:04:47 +00:00
|
|
|
if (tcsetpgrp(shell_terminal, parent_pgrp) && errno != ENOTTY)
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_perror_msg("tcsetpgrp");
|
2004-02-10 01:28:36 +00:00
|
|
|
#endif
|
2000-07-03 23:56:26 +00:00
|
|
|
|
|
|
|
/* return exit status if called with "-c" */
|
|
|
|
if (input == NULL && WIFEXITED(status))
|
|
|
|
return WEXITSTATUS(status);
|
2004-02-10 01:07:45 +00:00
|
|
|
|
2000-03-16 08:12:48 +00:00
|
|
|
return 0;
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_FEATURE_CLEAN_UP
|
2005-09-22 14:35:29 +00:00
|
|
|
static void free_memory(void)
|
2000-07-25 18:06:52 +00:00
|
|
|
{
|
2007-04-12 17:08:53 +00:00
|
|
|
free(cwd);
|
2000-07-25 18:06:52 +00:00
|
|
|
|
2000-12-18 20:25:50 +00:00
|
|
|
if (job_list.fg && !job_list.fg->running_progs) {
|
|
|
|
remove_job(&job_list, job_list.fg);
|
2000-07-25 18:06:52 +00:00
|
|
|
}
|
|
|
|
}
|
2006-07-09 17:03:07 +00:00
|
|
|
#else
|
|
|
|
void free_memory(void);
|
2000-07-25 18:06:52 +00:00
|
|
|
#endif
|
|
|
|
|
2007-03-31 11:07:30 +00:00
|
|
|
#if ENABLE_LASH_JOB_CONTROL
|
2001-06-25 17:11:54 +00:00
|
|
|
/* Make sure we have a controlling tty. If we get started under a job
|
|
|
|
* aware app (like bash for example), make sure we are now in charge so
|
|
|
|
* we don't fight over who gets the foreground */
|
2002-12-11 04:26:28 +00:00
|
|
|
static void setup_job_control(void)
|
2001-06-25 17:11:54 +00:00
|
|
|
{
|
2001-10-03 11:23:42 +00:00
|
|
|
int status;
|
2004-02-10 01:28:36 +00:00
|
|
|
pid_t shell_pgrp;
|
2004-02-10 01:07:45 +00:00
|
|
|
|
2001-06-25 17:11:54 +00:00
|
|
|
/* Loop until we are in the foreground. */
|
2007-04-12 12:27:32 +00:00
|
|
|
while ((status = tcgetpgrp(shell_terminal)) >= 0) {
|
|
|
|
shell_pgrp = getpgrp();
|
|
|
|
if (status == shell_pgrp) {
|
2001-10-03 11:23:42 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-04-10 15:42:06 +00:00
|
|
|
kill(- shell_pgrp, SIGTTIN);
|
2001-10-03 11:23:42 +00:00
|
|
|
}
|
2001-06-25 17:11:54 +00:00
|
|
|
|
|
|
|
/* Ignore interactive and job-control signals. */
|
|
|
|
signal(SIGINT, SIG_IGN);
|
|
|
|
signal(SIGQUIT, SIG_IGN);
|
|
|
|
signal(SIGTSTP, SIG_IGN);
|
|
|
|
signal(SIGTTIN, SIG_IGN);
|
|
|
|
signal(SIGTTOU, SIG_IGN);
|
|
|
|
signal(SIGCHLD, SIG_IGN);
|
|
|
|
|
|
|
|
/* Put ourselves in our own process group. */
|
2001-06-27 04:30:11 +00:00
|
|
|
setsid();
|
2007-01-19 21:19:35 +00:00
|
|
|
shell_pgrp = getpid();
|
2006-07-09 17:03:07 +00:00
|
|
|
setpgid(shell_pgrp, shell_pgrp);
|
2001-06-25 17:11:54 +00:00
|
|
|
|
|
|
|
/* Grab control of the terminal. */
|
|
|
|
tcsetpgrp(shell_terminal, shell_pgrp);
|
|
|
|
}
|
2004-02-10 01:28:36 +00:00
|
|
|
#else
|
|
|
|
static inline void setup_job_control(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2000-07-18 08:16:39 +00:00
|
|
|
|
2007-02-03 17:28:39 +00:00
|
|
|
int lash_main(int argc_l, char **argv_l);
|
2001-08-01 17:21:35 +00:00
|
|
|
int lash_main(int argc_l, char **argv_l)
|
2000-03-12 23:49:18 +00:00
|
|
|
{
|
2006-10-03 21:00:06 +00:00
|
|
|
unsigned opt;
|
2000-03-16 08:12:48 +00:00
|
|
|
FILE *input = stdin;
|
2000-07-27 00:15:20 +00:00
|
|
|
argc = argc_l;
|
|
|
|
argv = argv_l;
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2007-01-22 09:03:07 +00:00
|
|
|
#if ENABLE_FEATURE_EDITING
|
2007-01-22 07:21:38 +00:00
|
|
|
line_input_state = new_line_input_t(FOR_SHELL);
|
|
|
|
#endif
|
|
|
|
|
2001-03-06 22:17:29 +00:00
|
|
|
/* These variables need re-initializing when recursing */
|
2001-06-21 16:38:11 +00:00
|
|
|
last_jobid = 0;
|
2006-06-13 18:50:20 +00:00
|
|
|
close_me_list = NULL;
|
2001-01-05 19:34:52 +00:00
|
|
|
job_list.head = NULL;
|
|
|
|
job_list.fg = NULL;
|
2007-03-31 11:07:30 +00:00
|
|
|
last_return_code = 1;
|
2000-07-28 15:14:45 +00:00
|
|
|
|
2000-11-30 22:43:16 +00:00
|
|
|
if (argv[0] && argv[0][0] == '-') {
|
2001-01-05 20:58:22 +00:00
|
|
|
FILE *prof_input;
|
|
|
|
prof_input = fopen("/etc/profile", "r");
|
2001-06-27 04:30:11 +00:00
|
|
|
if (prof_input) {
|
2006-06-19 03:20:03 +00:00
|
|
|
llist_add_to(&close_me_list, (void *)(long)fileno(prof_input));
|
2001-01-05 20:58:22 +00:00
|
|
|
/* Now run the file */
|
|
|
|
busy_loop(prof_input);
|
2006-10-26 23:25:17 +00:00
|
|
|
fclose_if_not_stdin(prof_input);
|
2006-06-13 18:50:20 +00:00
|
|
|
llist_pop(&close_me_list);
|
2001-01-05 20:58:22 +00:00
|
|
|
}
|
2000-11-30 22:43:16 +00:00
|
|
|
}
|
2000-07-28 15:14:45 +00:00
|
|
|
|
2006-10-03 21:00:06 +00:00
|
|
|
opt = getopt32(argc_l, argv_l, "+ic:", &local_pending_command);
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
#define LASH_OPT_i (1<<0)
|
2007-03-31 11:08:50 +00:00
|
|
|
#define LASH_OPT_c (1<<1)
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
if (opt & LASH_OPT_c) {
|
|
|
|
input = NULL;
|
|
|
|
optind++;
|
|
|
|
argv += optind;
|
2000-07-28 15:14:45 +00:00
|
|
|
}
|
2000-07-28 17:08:36 +00:00
|
|
|
/* A shell is interactive if the `-i' flag was given, or if all of
|
|
|
|
* the following conditions are met:
|
|
|
|
* no -c command
|
|
|
|
* no arguments remaining or the -s flag given
|
|
|
|
* standard input is a terminal
|
|
|
|
* standard output is a terminal
|
|
|
|
* Refer to Posix.2, the description of the `sh' utility. */
|
2007-03-31 11:07:30 +00:00
|
|
|
if (argv[optind] == NULL && input == stdin
|
|
|
|
&& isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)
|
|
|
|
) {
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
opt |= LASH_OPT_i;
|
2000-12-18 20:25:50 +00:00
|
|
|
}
|
2001-06-25 17:11:54 +00:00
|
|
|
setup_job_control();
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
if (opt & LASH_OPT_i) {
|
2000-07-28 15:14:45 +00:00
|
|
|
/* Looks like they want an interactive shell */
|
2006-07-09 17:03:07 +00:00
|
|
|
if (!ENABLE_FEATURE_SH_EXTRA_QUIET) {
|
2007-06-13 12:27:17 +00:00
|
|
|
printf("\n\n%s built-in shell (lash)\n"
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
"Enter 'help' for a list of built-in commands.\n\n",
|
2007-06-13 12:27:17 +00:00
|
|
|
bb_banner);
|
2006-07-09 17:03:07 +00:00
|
|
|
}
|
|
|
|
} else if (!local_pending_command && argv[optind]) {
|
2001-01-20 01:10:07 +00:00
|
|
|
//printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
|
2006-08-03 15:41:12 +00:00
|
|
|
input = xfopen(argv[optind], "r");
|
2006-06-13 18:50:20 +00:00
|
|
|
/* be lazy, never mark this closed */
|
2006-06-19 03:20:03 +00:00
|
|
|
llist_add_to(&close_me_list, (void *)(long)fileno(input));
|
2000-07-28 15:14:45 +00:00
|
|
|
}
|
|
|
|
|
2000-07-18 08:16:39 +00:00
|
|
|
/* initialize the cwd -- this is never freed...*/
|
2007-04-12 17:08:53 +00:00
|
|
|
update_cwd();
|
2000-03-16 08:12:48 +00:00
|
|
|
|
2006-07-09 17:03:07 +00:00
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) atexit(free_memory);
|
2000-07-25 18:06:52 +00:00
|
|
|
|
2007-01-22 09:03:07 +00:00
|
|
|
if (ENABLE_FEATURE_EDITING) cmdedit_set_initial_prompt();
|
2006-07-09 17:03:07 +00:00
|
|
|
else PS1 = NULL;
|
2004-02-10 01:07:45 +00:00
|
|
|
|
2007-04-12 17:08:53 +00:00
|
|
|
return busy_loop(input);
|
2000-03-12 23:49:18 +00:00
|
|
|
}
|