Compare commits

...
3 Commits
Author SHA1 Message Date
Denys Vlasenko 92e531458a Apply post-1.18.2 fixes, bump version to 1.18.3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-08 18:34:03 +01:00
Denys Vlasenko 12d97b6680 apply post-1.18.1 patches, bump version to 1.18.2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-01-16 20:00:24 +01:00
Denys Vlasenko 2a1571bfa0 apply post-1.18.0 patches, bump version to 1.18.1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2010-12-21 05:31:47 +01:00
25 changed files with 194 additions and 173 deletions

No files matched your search

+3 -2
View File
@@ -128,8 +128,9 @@ config INSTALL_NO_USR
default n
depends on FEATURE_INSTALLER
help
Disable use of /usr. busybox --install will install applets
only to /bin and /sbin, never to /usr/bin or /usr/sbin.
Disable use of /usr. busybox --install and "make install"
will install applets only to /bin and /sbin,
never to /usr/bin or /usr/sbin.
config LOCALE_SUPPORT
bool "Enable locale support (system needs locale for this to work)"
+1 -1
View File
@@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 18
SUBLEVEL = 0
SUBLEVEL = 3
EXTRAVERSION =
NAME = Unnamed
+4 -2
View File
@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA
break;
}
#if ENABLE_FEATURE_CLEAN_UP
/* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
* we are called repeatedly
*/
BZ2_bzCompressEnd(strm);
free(iobuf);
#endif
return total;
}
-4
View File
@@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
/* -L makes sense only with -o or -p */
#if !ENABLE_FEATURE_CPIO_O
/* no parameters */
opt_complementary = "=0";
opt = getopt32(argv, OPTION_STR, &cpio_filename);
argv += optind;
if (opt & CPIO_OPT_FILE) { /* -F */
xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
}
#else
/* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
argv += optind;
if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */
+1 -3
View File
@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int action)
/*---------------------------------------------------*/
#if ENABLE_FEATURE_CLEAN_UP
static
void BZ2_bzCompressEnd(bz_stream *strm)
{
@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
free(s->arr2);
free(s->ftab);
free(s->crc32table);
free(strm->state);
free(s);
}
#endif
/*---------------------------------------------------*/
+4 -2
View File
@@ -1037,8 +1037,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
tar_handle->src_fd = tar_fd;
tar_handle->seek = seek_by_read;
} else {
if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) {
get_header_ptr = get_header_tar;
if (ENABLE_FEATURE_TAR_AUTODETECT
&& flags == O_RDONLY
&& get_header_ptr == get_header_tar
) {
tar_handle->src_fd = open_zipped(tar_filename);
if (tar_handle->src_fd < 0)
bb_perror_msg_and_die("can't open '%s'", tar_filename);
+8 -8
View File
@@ -81,11 +81,11 @@
* column order in "wc -cmlwL" output:
*/
enum {
WC_LINES = 0,
WC_WORDS = 1,
WC_UNICHARS = 2,
WC_CHARS = 3,
WC_LENGTH = 4,
WC_LINES = 0, /* -l */
WC_WORDS = 1, /* -w */
WC_UNICHARS = 2, /* -m */
WC_BYTES = 3, /* -c */
WC_LENGTH = 4, /* -L */
NUM_WCS = 5,
};
@@ -104,10 +104,10 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
init_unicode();
print_type = getopt32(argv, "lwcmL");
print_type = getopt32(argv, "lwmcL");
if (print_type == 0) {
print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_BYTES);
}
argv += optind;
@@ -157,7 +157,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
}
/* Cater for -c and -m */
++counts[WC_CHARS];
++counts[WC_BYTES];
if (unicode_status != UNICODE_ON /* every byte is a new char */
|| (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */
) {
+5
View File
@@ -56,6 +56,11 @@ s - suid type:
# define APPLET_NOFORK(name,main,l,s,name2) { #name, #main, l, s, 1, 1 },
#endif
#if ENABLE_INSTALL_NO_USR
# define _BB_DIR_USR_BIN _BB_DIR_BIN
# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
#endif
INSERT
IF_TEST(APPLET_NOFORK([, test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
+3 -1
View File
@@ -154,6 +154,7 @@ static unsigned long fast_strtoul_10(char **endptr)
return n;
}
# if ENABLE_FEATURE_FAST_TOP
static long fast_strtol_10(char **endptr)
{
if (**endptr != '-')
@@ -162,6 +163,7 @@ static long fast_strtol_10(char **endptr)
(*endptr)++;
return - (long)fast_strtoul_10(endptr);
}
# endif
static char *skip_fields(char *str, int count)
{
@@ -448,7 +450,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
//FIXME: is it safe to assume this field exists?
sp->last_seen_on_cpu = fast_strtoul_10(&cp);
# endif
#endif /* end of !ENABLE_FEATURE_TOP_SMP_PROCESS */
#endif /* FEATURE_FAST_TOP */
#if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
sp->niceness = tasknice;
+25 -25
View File
@@ -3,7 +3,7 @@
*/
/* Prefix for optional rounds specification. */
static const char str_rounds[] = "rounds=%u$";
static const char str_rounds[] ALIGN1 = "rounds=%u$";
/* Maximum salt string length. */
#define SALT_LEN_MAX 16
@@ -19,8 +19,8 @@ NOINLINE
sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
{
void (*sha_begin)(void *ctx) FAST_FUNC;
void (*sha_hash)(const void *buffer, size_t len, void *ctx) FAST_FUNC;
void (*sha_end)(void *resbuf, void *ctx) FAST_FUNC;
void (*sha_hash)(void *ctx, const void *buffer, size_t len) FAST_FUNC;
void (*sha_end)(void *ctx, void *resbuf) FAST_FUNC;
int _32or64;
char *result, *resptr;
@@ -103,40 +103,40 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
/* Add KEY, SALT. */
sha_begin(&ctx);
sha_hash(key_data, key_len, &ctx);
sha_hash(salt_data, salt_len, &ctx);
sha_hash(&ctx, key_data, key_len);
sha_hash(&ctx, salt_data, salt_len);
/* Compute alternate SHA sum with input KEY, SALT, and KEY.
The final result will be added to the first context. */
sha_begin(&alt_ctx);
sha_hash(key_data, key_len, &alt_ctx);
sha_hash(salt_data, salt_len, &alt_ctx);
sha_hash(key_data, key_len, &alt_ctx);
sha_end(alt_result, &alt_ctx);
sha_hash(&alt_ctx, key_data, key_len);
sha_hash(&alt_ctx, salt_data, salt_len);
sha_hash(&alt_ctx, key_data, key_len);
sha_end(&alt_ctx, alt_result);
/* Add result of this to the other context. */
/* Add for any character in the key one byte of the alternate sum. */
for (cnt = key_len; cnt > _32or64; cnt -= _32or64)
sha_hash(alt_result, _32or64, &ctx);
sha_hash(alt_result, cnt, &ctx);
sha_hash(&ctx, alt_result, _32or64);
sha_hash(&ctx, alt_result, cnt);
/* Take the binary representation of the length of the key and for every
1 add the alternate sum, for every 0 the key. */
for (cnt = key_len; cnt != 0; cnt >>= 1)
if ((cnt & 1) != 0)
sha_hash(alt_result, _32or64, &ctx);
sha_hash(&ctx, alt_result, _32or64);
else
sha_hash(key_data, key_len, &ctx);
sha_hash(&ctx, key_data, key_len);
/* Create intermediate result. */
sha_end(alt_result, &ctx);
sha_end(&ctx, alt_result);
/* Start computation of P byte sequence. */
/* For every character in the password add the entire password. */
sha_begin(&alt_ctx);
for (cnt = 0; cnt < key_len; ++cnt)
sha_hash(key_data, key_len, &alt_ctx);
sha_end(temp_result, &alt_ctx);
sha_hash(&alt_ctx, key_data, key_len);
sha_end(&alt_ctx, temp_result);
/* NB: past this point, raw key_data is not used anymore */
@@ -153,8 +153,8 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
/* For every character in the password add the entire password. */
sha_begin(&alt_ctx);
for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
sha_hash(salt_data, salt_len, &alt_ctx);
sha_end(temp_result, &alt_ctx);
sha_hash(&alt_ctx, salt_data, salt_len);
sha_end(&alt_ctx, temp_result);
/* NB: past this point, raw salt_data is not used anymore */
@@ -174,22 +174,22 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
/* Add key or last result. */
if ((cnt & 1) != 0)
sha_hash(p_bytes, key_len, &ctx);
sha_hash(&ctx, p_bytes, key_len);
else
sha_hash(alt_result, _32or64, &ctx);
sha_hash(&ctx, alt_result, _32or64);
/* Add salt for numbers not divisible by 3. */
if (cnt % 3 != 0)
sha_hash(s_bytes, salt_len, &ctx);
sha_hash(&ctx, s_bytes, salt_len);
/* Add key for numbers not divisible by 7. */
if (cnt % 7 != 0)
sha_hash(p_bytes, key_len, &ctx);
sha_hash(&ctx, p_bytes, key_len);
/* Add key or last result. */
if ((cnt & 1) != 0)
sha_hash(alt_result, _32or64, &ctx);
sha_hash(&ctx, alt_result, _32or64);
else
sha_hash(p_bytes, key_len, &ctx);
sha_hash(&ctx, p_bytes, key_len);
sha_end(alt_result, &ctx);
sha_end(&ctx, alt_result);
}
/* Append encrypted password to result buffer */
+1
View File
@@ -52,6 +52,7 @@ pid_t FAST_FUNC spawn(char **argv)
* Interested party can wait on pid and learn exit code.
* If 111 - then it (most probably) failed to exec */
if (failed) {
safe_waitpid(pid, NULL, 0); /* prevent zombie */
errno = failed;
return -1;
}
-4
View File
@@ -186,7 +186,6 @@ config GETTY
config LOGIN
bool "login"
default y
select FEATURE_SUID
select FEATURE_SYSLOG
help
login is used when signing onto a system.
@@ -229,7 +228,6 @@ config FEATURE_SECURETTY
config PASSWD
bool "passwd"
default y
select FEATURE_SUID
select FEATURE_SYSLOG
help
passwd changes passwords for user and group accounts. A normal user
@@ -265,7 +263,6 @@ config CHPASSWD
config SU
bool "su"
default y
select FEATURE_SUID
select FEATURE_SYSLOG
help
su is used to become another user during a login session.
@@ -295,7 +292,6 @@ config SULOGIN
config VLOCK
bool "vlock"
default y
select FEATURE_SUID
help
Build the "vlock" applet which allows you to lock (virtual) terminals.
-1
View File
@@ -170,7 +170,6 @@ config FEATURE_CROND_DIR
config CRONTAB
bool "crontab"
default y
select FEATURE_SUID
help
Crontab manipulates the crontab for a particular user. Only
the superuser may specify a different user and/or crontab directory.
+9 -8
View File
@@ -175,23 +175,24 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
llist_add_to_end(&aborts, arg);
#if ENABLE_FEATURE_CHAT_CLR_ABORT
} else if (DIR_CLR_ABORT == key) {
llist_t *l;
// remove the string from abort conditions
// N.B. gotta refresh maximum length too...
#if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
# if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
max_abort_len = 0;
#endif
for (llist_t *l = aborts; l; l = l->link) {
#if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
# endif
for (l = aborts; l; l = l->link) {
# if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
size_t len = strlen(l->data);
#endif
if (!strcmp(arg, l->data)) {
# endif
if (strcmp(arg, l->data) == 0) {
llist_unlink(&aborts, l);
continue;
}
#if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
# if ENABLE_FEATURE_CHAT_VAR_ABORT_LEN
if (len > max_abort_len)
max_abort_len = len;
#endif
# endif
}
#endif
} else if (DIR_TIMEOUT == key) {
+7 -2
View File
@@ -205,6 +205,7 @@ static void parse_module(module_info *info, const char *pathname)
/* Read (possibly compressed) module */
len = 64 * 1024 * 1024; /* 64 Mb at most */
module_image = xmalloc_open_zipped_read_close(pathname, &len);
/* module_image == NULL is ok here, find_keyword handles it */
//TODO: optimize redundant module body reads
/* "alias1 symbol:sym1 alias2 symbol:sym2" */
@@ -844,13 +845,17 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
void *map;
len = MAXINT(ssize_t);
map = xmalloc_xopen_read_close(*argv, &len);
map = xmalloc_open_zipped_read_close(*argv, &len);
if (!map)
bb_perror_msg_and_die("can't read '%s'", *argv);
if (init_module(map, len,
IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
) != 0)
) != 0
) {
bb_error_msg_and_die("can't insert '%s': %s",
*argv, moderror(errno));
}
return 0;
}
+5 -6
View File
@@ -71,12 +71,11 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv)
optlen = 0;
while (*++argv) {
options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
/* Older versions were enclosing space-containing *argv in "",
* but both modprobe and insmod from module-init-tools 3.11.1
* don't do this anymore. (As to extra trailing space,
* insmod adds it but modprobe does not. We do in both cases)
*/
optlen += sprintf(options + optlen, "%s ", *argv);
/* Spaces handled by "" pairs, but no way of escaping quotes */
//TODO: module-init-tools version 3.11.1 quotes only value:
//it generates var="val with spaces", not "var=val with spaces"
//(and it won't quote var *name* even if it has spaces)
optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
}
return options;
}
+1
View File
@@ -1522,6 +1522,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
struct stat sb;
fstat(fd, &sb);
file_size = sb.st_size;
last_mod = sb.st_mtime;
} else {
IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
fd = open(url, O_RDONLY);
+1 -1
View File
@@ -394,7 +394,7 @@ static void sendping4(int junk UNUSED_PARAM)
#if ENABLE_PING6
static void sendping6(int junk UNUSED_PARAM)
{
struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4);
struct icmp6_hdr *pkt = G.snd_packet;
//memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
pkt->icmp6_type = ICMP6_ECHO_REQUEST;
+12 -27
View File
@@ -105,39 +105,22 @@ struct BUG_G_too_big {
#define error_pkt_str (error_pkt + 4)
#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
/* SIGALRM logic nicked from the wget applet */
static void progress_meter(int flag)
static void tftp_progress_update(void)
{
/* We can be called from signal handler */
int save_errno = errno;
if (flag == -1) { /* first call to progress_meter */
bb_progress_init(&G.pmt);
}
bb_progress_update(&G.pmt, G.file, 0, G.pos, G.size);
if (flag == 0) {
/* last call to progress_meter */
alarm(0);
bb_putchar_stderr('\n');
} else {
if (flag == -1) { /* first call to progress_meter */
signal_SA_RESTART_empty_mask(SIGALRM, progress_meter);
}
alarm(1);
}
errno = save_errno;
}
static void tftp_progress_init(void)
{
progress_meter(-1);
bb_progress_init(&G.pmt);
tftp_progress_update();
}
static void tftp_progress_done(void)
{
if (G.pmt.inited)
progress_meter(0);
if (G.pmt.inited) {
tftp_progress_update();
bb_putchar_stderr('\n');
G.pmt.inited = 0;
}
}
#else
# define tftp_progress_init() ((void)0)
@@ -460,9 +443,10 @@ static int tftp_protocol(
xsendto(socket_fd, xbuf, send_len, &peer_lsa->u.sa, peer_lsa->len);
#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
if (ENABLE_TFTP && remote_file) { /* tftp */
if (ENABLE_TFTP && remote_file) /* tftp */
G.pos = (block_nr - 1) * (uoff_t)blksize;
}
if (G.pmt.inited)
tftp_progress_update();
#endif
/* Was it final ACK? then exit */
if (finished && (opcode == TFTP_ACK))
@@ -479,6 +463,7 @@ static int tftp_protocol(
case 0:
retries--;
if (retries == 0) {
tftp_progress_done();
bb_error_msg("timeout");
goto ret; /* no err packet sent */
}
+1 -1
View File
@@ -375,7 +375,7 @@ static NOINLINE void attach_option(
new->data = xmalloc(length + OPT_DATA);
new->data[OPT_CODE] = optflag->code;
new->data[OPT_LEN] = length;
memcpy(new->data + OPT_DATA, buffer, length);
memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length);
curr = opt_list;
while (*curr && (*curr)->data[OPT_CODE] < optflag->code)
+5 -2
View File
@@ -312,8 +312,11 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
last_mtime = s.st_mtime;
last_dev = s.st_dev;
last_ino = s.st_ino;
//if (now <= mtime)
// sleep(1);
/* if the svdir changed this very second, wait until the
* next second, because we won't be able to detect more
* changes within this second */
while (time(NULL) == last_mtime)
usleep(100000);
need_rescan = do_rescan();
while (fchdir(curdir) == -1) {
warn2_cannot("change directory, pausing", "");
+3 -3
View File
@@ -18,14 +18,14 @@ generate()
local src="$1" dst="$2" header="$3" insert="$4"
#chk "${dst}"
(
echo "${header}"
printf "%s\n" "${header}"
if grep -qs '^INSERT$' "${src}"; then
sed -n '1,/^INSERT$/p' "${src}"
echo "${insert}"
printf "%s\n" "${insert}"
sed -n '/^INSERT$/,$p' "${src}"
else
if [ -n "${insert}" ]; then
echo "ERROR: INSERT line missing in: ${src}" 1>&2
printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
fi
cat "${src}"
fi
+94 -67
View File
@@ -913,7 +913,7 @@ static const struct built_in_command bltins2[] = {
*/
#if HUSH_DEBUG
/* prevent disasters with G.debug_indent < 0 */
# define indent() fprintf(stderr, "%*s", (G.debug_indent * 2) & 0xff, "")
# define indent() fdprintf(2, "%*s", (G.debug_indent * 2) & 0xff, "")
# define debug_enter() (G.debug_indent++)
# define debug_leave() (G.debug_indent--)
#else
@@ -923,56 +923,56 @@ static const struct built_in_command bltins2[] = {
#endif
#ifndef debug_printf
# define debug_printf(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_parse
# define debug_printf_parse(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_parse(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_exec
#define debug_printf_exec(...) (indent(), fprintf(stderr, __VA_ARGS__))
#define debug_printf_exec(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_env
# define debug_printf_env(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_env(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_jobs
# define debug_printf_jobs(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_jobs(...) (indent(), fdprintf(2, __VA_ARGS__))
# define DEBUG_JOBS 1
#else
# define DEBUG_JOBS 0
#endif
#ifndef debug_printf_expand
# define debug_printf_expand(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_expand(...) (indent(), fdprintf(2, __VA_ARGS__))
# define DEBUG_EXPAND 1
#else
# define DEBUG_EXPAND 0
#endif
#ifndef debug_printf_varexp
# define debug_printf_varexp(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_varexp(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_glob
# define debug_printf_glob(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_glob(...) (indent(), fdprintf(2, __VA_ARGS__))
# define DEBUG_GLOB 1
#else
# define DEBUG_GLOB 0
#endif
#ifndef debug_printf_list
# define debug_printf_list(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_list(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_subst
# define debug_printf_subst(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_subst(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_clean
# define debug_printf_clean(...) (indent(), fprintf(stderr, __VA_ARGS__))
# define debug_printf_clean(...) (indent(), fdprintf(2, __VA_ARGS__))
# define DEBUG_CLEAN 1
#else
# define DEBUG_CLEAN 0
@@ -982,9 +982,9 @@ static const struct built_in_command bltins2[] = {
static void debug_print_strings(const char *prefix, char **vv)
{
indent();
fprintf(stderr, "%s:\n", prefix);
fdprintf(2, "%s:\n", prefix);
while (*vv)
fprintf(stderr, " '%s'\n", *vv++);
fdprintf(2, " '%s'\n", *vv++);
}
#else
# define debug_print_strings(prefix, vv) ((void)0)
@@ -1416,6 +1416,22 @@ static void hush_exit(int exitcode)
builtin_eval(argv);
}
#if ENABLE_FEATURE_CLEAN_UP
{
struct variable *cur_var;
if (G.cwd != bb_msg_unknown)
free((char*)G.cwd);
cur_var = G.top_var;
while (cur_var) {
struct variable *tmp = cur_var;
if (!cur_var->max_len)
free(cur_var->varstr);
cur_var = cur_var->next;
free(tmp);
}
}
#endif
#if ENABLE_HUSH_JOB
fflush_all();
sigexit(- (exitcode & 0xff));
@@ -2158,22 +2174,22 @@ static void debug_print_list(const char *prefix, o_string *o, int n)
int i = 0;
indent();
fprintf(stderr, "%s: list:%p n:%d string_start:%d length:%d maxlen:%d glob:%d quoted:%d escape:%d\n",
fdprintf(2, "%s: list:%p n:%d string_start:%d length:%d maxlen:%d glob:%d quoted:%d escape:%d\n",
prefix, list, n, string_start, o->length, o->maxlen,
!!(o->o_expflags & EXP_FLAG_GLOB),
o->has_quoted_part,
!!(o->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
while (i < n) {
indent();
fprintf(stderr, " list[%d]=%d '%s' %p\n", i, (int)list[i],
o->data + (int)list[i] + string_start,
o->data + (int)list[i] + string_start);
fdprintf(2, " list[%d]=%d '%s' %p\n", i, (int)(uintptr_t)list[i],
o->data + (int)(uintptr_t)list[i] + string_start,
o->data + (int)(uintptr_t)list[i] + string_start);
i++;
}
if (n) {
const char *p = o->data + (int)list[n - 1] + string_start;
const char *p = o->data + (int)(uintptr_t)list[n - 1] + string_start;
indent();
fprintf(stderr, " total_sz:%ld\n", (long)((p + strlen(p) + 1) - o->data));
fdprintf(2, " total_sz:%ld\n", (long)((p + strlen(p) + 1) - o->data));
}
}
#else
@@ -2672,18 +2688,18 @@ static void debug_print_tree(struct pipe *pi, int lvl)
pin = 0;
while (pi) {
fprintf(stderr, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
fdprintf(2, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
pin, RES[pi->res_word], pi->followup, PIPE[pi->followup]);
prn = 0;
while (prn < pi->num_cmds) {
struct command *command = &pi->cmds[prn];
char **argv = command->argv;
fprintf(stderr, "%*s cmd %d assignment_cnt:%d",
fdprintf(2, "%*s cmd %d assignment_cnt:%d",
lvl*2, "", prn,
command->assignment_cnt);
if (command->group) {
fprintf(stderr, " group %s: (argv=%p)%s%s\n",
fdprintf(2, " group %s: (argv=%p)%s%s\n",
CMDTYPE[command->cmd_type],
argv
# if !BB_MMU
@@ -2697,10 +2713,10 @@ static void debug_print_tree(struct pipe *pi, int lvl)
continue;
}
if (argv) while (*argv) {
fprintf(stderr, " '%s'", *argv);
fdprintf(2, " '%s'", *argv);
argv++;
}
fprintf(stderr, "\n");
fdprintf(2, "\n");
prn++;
}
pi = pi->next;
@@ -4106,7 +4122,27 @@ static struct pipe *parse_stream(char **pstring,
if (IS_NULL_CMD(ctx.command)
&& dest.length == 0 && !dest.has_quoted_part
) {
continue;
/* This newline can be ignored. But...
* Without check #1, interactive shell
* ignores even bare <newline>,
* and shows the continuation prompt:
* ps1_prompt$ <enter>
* ps2> _ <=== wrong, should be ps1
* Without check #2, "cmd & <newline>"
* is similarly mistreated.
* (BTW, this makes "cmd & cmd"
* and "cmd && cmd" non-orthogonal.
* Really, ask yourself, why
* "cmd && <newline>" doesn't start
* cmd but waits for more input?
* No reason...)
*/
struct pipe *pi = ctx.list_head;
if (pi->num_cmds != 0 /* check #1 */
&& pi->followup != PIPE_BG /* check #2 */
) {
continue;
}
}
/* Treat newline as a command separator. */
done_pipe(&ctx, PIPE_SEQ);
@@ -6995,27 +7031,30 @@ static int run_list(struct pipe *pi)
#if ENABLE_HUSH_LOOPS
/* Check syntax for "for" */
for (struct pipe *cpipe = pi; cpipe; cpipe = cpipe->next) {
if (cpipe->res_word != RES_FOR && cpipe->res_word != RES_IN)
continue;
/* current word is FOR or IN (BOLD in comments below) */
if (cpipe->next == NULL) {
syntax_error("malformed for");
debug_leave();
debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
return 1;
}
/* "FOR v; do ..." and "for v IN a b; do..." are ok */
if (cpipe->next->res_word == RES_DO)
continue;
/* next word is not "do". It must be "in" then ("FOR v in ...") */
if (cpipe->res_word == RES_IN /* "for v IN a b; not_do..."? */
|| cpipe->next->res_word != RES_IN /* FOR v not_do_and_not_in..."? */
) {
syntax_error("malformed for");
debug_leave();
debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
return 1;
{
struct pipe *cpipe;
for (cpipe = pi; cpipe; cpipe = cpipe->next) {
if (cpipe->res_word != RES_FOR && cpipe->res_word != RES_IN)
continue;
/* current word is FOR or IN (BOLD in comments below) */
if (cpipe->next == NULL) {
syntax_error("malformed for");
debug_leave();
debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
return 1;
}
/* "FOR v; do ..." and "for v IN a b; do..." are ok */
if (cpipe->next->res_word == RES_DO)
continue;
/* next word is not "do". It must be "in" then ("FOR v in ...") */
if (cpipe->res_word == RES_IN /* "for v IN a b; not_do..."? */
|| cpipe->next->res_word != RES_IN /* FOR v not_do_and_not_in..."? */
) {
syntax_error("malformed for");
debug_leave();
debug_printf_exec("run_list lvl %d return 1\n", G.run_list_level);
return 1;
}
}
}
#endif
@@ -7442,7 +7481,7 @@ int hush_main(int argc, char **argv)
unsigned builtin_argc;
char **e;
struct variable *cur_var;
struct variable shell_ver;
struct variable *shell_ver;
INIT_G();
if (EXIT_SUCCESS) /* if EXIT_SUCCESS == 0, it is already done */
@@ -7451,17 +7490,17 @@ int hush_main(int argc, char **argv)
G.argv0_for_re_execing = argv[0];
#endif
/* Deal with HUSH_VERSION */
memset(&shell_ver, 0, sizeof(shell_ver));
shell_ver.flg_export = 1;
shell_ver.flg_read_only = 1;
shell_ver = xzalloc(sizeof(*shell_ver));
shell_ver->flg_export = 1;
shell_ver->flg_read_only = 1;
/* Code which handles ${var<op>...} needs writable values for all variables,
* therefore we xstrdup: */
shell_ver.varstr = xstrdup(hush_version_str),
G.top_var = &shell_ver;
shell_ver->varstr = xstrdup(hush_version_str);
/* Create shell local variables from the values
* currently living in the environment */
debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
unsetenv("HUSH_VERSION"); /* in case it exists in initial env */
G.top_var = shell_ver;
cur_var = G.top_var;
e = environ;
if (e) while (*e) {
@@ -7476,8 +7515,8 @@ int hush_main(int argc, char **argv)
e++;
}
/* (Re)insert HUSH_VERSION into env (AFTER we scanned the env!) */
debug_printf_env("putenv '%s'\n", shell_ver.varstr);
putenv(shell_ver.varstr);
debug_printf_env("putenv '%s'\n", shell_ver->varstr);
putenv(shell_ver->varstr);
/* Export PWD */
set_pwd_var(/*exp:*/ 1);
@@ -7837,18 +7876,6 @@ int hush_main(int argc, char **argv)
parse_and_run_file(stdin);
final_return:
#if ENABLE_FEATURE_CLEAN_UP
if (G.cwd != bb_msg_unknown)
free((char*)G.cwd);
cur_var = G.top_var->next;
while (cur_var) {
struct variable *tmp = cur_var;
if (!cur_var->max_len)
free(cur_var->varstr);
cur_var = cur_var->next;
free(tmp);
}
#endif
hush_exit(G.last_exitcode);
}
-2
View File
@@ -354,7 +354,6 @@ config FEATURE_HWCLOCK_ADJTIME_FHS
config IPCRM
bool "ipcrm"
default y
select FEATURE_SUID
help
The ipcrm utility allows the removal of System V interprocess
communication (IPC) objects and the associated data structures
@@ -364,7 +363,6 @@ config IPCS
bool "ipcs"
default y
depends on PLATFORM_LINUX
select FEATURE_SUID
help
The ipcs utility is used to provide information on the currently
allocated System V interprocess (IPC) objects in the system.
+1 -1
View File
@@ -15,7 +15,7 @@ static void mkswap_selinux_setcontext(int fd, const char *path)
if (!is_selinux_enabled())
return;
xfstat(fd, &stbuf, argv[0]);
xfstat(fd, &stbuf, path);
if (S_ISREG(stbuf.st_mode)) {
security_context_t newcon;
security_context_t oldcon = NULL;