Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
757e46252c | ||
|
|
f5d4bddfbe | ||
|
|
89f022469f | ||
|
|
471ca65091 | ||
|
|
1e32f91e3b | ||
|
|
4cd4eb4332 | ||
|
|
6a98f95373 | ||
|
|
078d55028e | ||
|
|
bbc31e5f3c | ||
|
|
fbb12ddc6a | ||
|
|
b6bca7703b | ||
|
|
77508d70bf | ||
|
|
e6f6d82940 | ||
|
|
20cc390b9b |
No files matched your search
@@ -1,6 +1,6 @@
|
||||
VERSION = 1
|
||||
PATCHLEVEL = 14
|
||||
SUBLEVEL = 0
|
||||
SUBLEVEL = 4
|
||||
EXTRAVERSION =
|
||||
NAME = Unnamed
|
||||
|
||||
|
||||
+31
-37
@@ -388,19 +388,6 @@ static void put_32bit(ulg n)
|
||||
put_16bit(n >> 16);
|
||||
}
|
||||
|
||||
/* ===========================================================================
|
||||
* Clear input and output buffers
|
||||
*/
|
||||
static void clear_bufs(void)
|
||||
{
|
||||
G1.outcnt = 0;
|
||||
#ifdef DEBUG
|
||||
G1.insize = 0;
|
||||
#endif
|
||||
G1.isize = 0;
|
||||
}
|
||||
|
||||
|
||||
/* ===========================================================================
|
||||
* Run a set of bytes through the crc shift register. If s is a NULL
|
||||
* pointer, then initialize the crc shift register contents instead.
|
||||
@@ -2019,7 +2006,37 @@ USE_DESKTOP(long long) int pack_gzip(unpack_info_t *info UNUSED_PARAM)
|
||||
{
|
||||
struct stat s;
|
||||
|
||||
clear_bufs();
|
||||
/* Clear input and output buffers */
|
||||
G1.outcnt = 0;
|
||||
#ifdef DEBUG
|
||||
G1.insize = 0;
|
||||
#endif
|
||||
G1.isize = 0;
|
||||
|
||||
/* Reinit G2.xxx */
|
||||
memset(&G2, 0, sizeof(G2));
|
||||
G2.l_desc.dyn_tree = G2.dyn_ltree;
|
||||
G2.l_desc.static_tree = G2.static_ltree;
|
||||
G2.l_desc.extra_bits = extra_lbits;
|
||||
G2.l_desc.extra_base = LITERALS + 1;
|
||||
G2.l_desc.elems = L_CODES;
|
||||
G2.l_desc.max_length = MAX_BITS;
|
||||
//G2.l_desc.max_code = 0;
|
||||
G2.d_desc.dyn_tree = G2.dyn_dtree;
|
||||
G2.d_desc.static_tree = G2.static_dtree;
|
||||
G2.d_desc.extra_bits = extra_dbits;
|
||||
//G2.d_desc.extra_base = 0;
|
||||
G2.d_desc.elems = D_CODES;
|
||||
G2.d_desc.max_length = MAX_BITS;
|
||||
//G2.d_desc.max_code = 0;
|
||||
G2.bl_desc.dyn_tree = G2.bl_tree;
|
||||
//G2.bl_desc.static_tree = NULL;
|
||||
G2.bl_desc.extra_bits = extra_blbits,
|
||||
//G2.bl_desc.extra_base = 0;
|
||||
G2.bl_desc.elems = BL_CODES;
|
||||
G2.bl_desc.max_length = MAX_BL_BITS;
|
||||
//G2.bl_desc.max_code = 0;
|
||||
|
||||
s.st_ctime = 0;
|
||||
fstat(STDIN_FILENO, &s);
|
||||
zip(s.st_ctime);
|
||||
@@ -2064,29 +2081,6 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
|
||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2))
|
||||
+ sizeof(struct globals));
|
||||
barrier();
|
||||
G2.l_desc.dyn_tree = G2.dyn_ltree;
|
||||
G2.l_desc.static_tree = G2.static_ltree;
|
||||
G2.l_desc.extra_bits = extra_lbits;
|
||||
G2.l_desc.extra_base = LITERALS + 1;
|
||||
G2.l_desc.elems = L_CODES;
|
||||
G2.l_desc.max_length = MAX_BITS;
|
||||
//G2.l_desc.max_code = 0;
|
||||
|
||||
G2.d_desc.dyn_tree = G2.dyn_dtree;
|
||||
G2.d_desc.static_tree = G2.static_dtree;
|
||||
G2.d_desc.extra_bits = extra_dbits;
|
||||
//G2.d_desc.extra_base = 0;
|
||||
G2.d_desc.elems = D_CODES;
|
||||
G2.d_desc.max_length = MAX_BITS;
|
||||
//G2.d_desc.max_code = 0;
|
||||
|
||||
G2.bl_desc.dyn_tree = G2.bl_tree;
|
||||
//G2.bl_desc.static_tree = NULL;
|
||||
G2.bl_desc.extra_bits = extra_blbits,
|
||||
//G2.bl_desc.extra_base = 0;
|
||||
G2.bl_desc.elems = BL_CODES;
|
||||
G2.bl_desc.max_length = MAX_BL_BITS;
|
||||
//G2.bl_desc.max_code = 0;
|
||||
|
||||
/* Allocate all global buffers (for DYN_ALLOC option) */
|
||||
ALLOC(uch, G1.l_buf, INBUFSIZ);
|
||||
|
||||
+3
-4
@@ -44,7 +44,6 @@ int df_main(int argc, char **argv)
|
||||
FILE *mount_table;
|
||||
struct mntent *mount_entry;
|
||||
struct statfs s;
|
||||
static const char ignored_mounts[] ALIGN1 = "rootfs\0";
|
||||
|
||||
enum {
|
||||
OPT_KILO = (1 << 0),
|
||||
@@ -120,7 +119,7 @@ int df_main(int argc, char **argv)
|
||||
mount_point = *argv++;
|
||||
if (!mount_point)
|
||||
break;
|
||||
mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
|
||||
mount_entry = find_mount_point(mount_point);
|
||||
if (!mount_entry) {
|
||||
bb_error_msg("%s: can't find mount point", mount_point);
|
||||
set_error:
|
||||
@@ -154,8 +153,8 @@ int df_main(int argc, char **argv)
|
||||
) / (blocks_used + s.f_bavail);
|
||||
}
|
||||
|
||||
/* GNU coreutils 6.10 skip certain mounts, try to be compatible. */
|
||||
if (index_in_strings(device, ignored_mounts) != -1)
|
||||
/* GNU coreutils 6.10 skips certain mounts, try to be compatible. */
|
||||
if (strcmp(device, "rootfs") == 0)
|
||||
continue;
|
||||
|
||||
#ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
|
||||
|
||||
+43
-20
@@ -144,8 +144,7 @@ static const char ls_options[] ALIGN1 =
|
||||
USE_FEATURE_LS_FOLLOWLINKS("L") /* 1, 24 */
|
||||
USE_FEATURE_LS_RECURSIVE("R") /* 1, 25 */
|
||||
USE_FEATURE_HUMAN_READABLE("h") /* 1, 26 */
|
||||
USE_SELINUX("K") /* 1, 27 */
|
||||
USE_SELINUX("Z") /* 1, 28 */
|
||||
USE_SELINUX("KZ") /* 2, 28 */
|
||||
USE_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */
|
||||
;
|
||||
enum {
|
||||
@@ -162,6 +161,16 @@ enum {
|
||||
OPT_Q = (1 << 10),
|
||||
//OPT_A = (1 << 11),
|
||||
//OPT_k = (1 << 12),
|
||||
OPTBIT_color = 13
|
||||
+ 4 * ENABLE_FEATURE_LS_TIMESTAMPS
|
||||
+ 4 * ENABLE_FEATURE_LS_SORTFILES
|
||||
+ 2 * ENABLE_FEATURE_LS_FILETYPES
|
||||
+ 1 * ENABLE_FEATURE_LS_FOLLOWLINKS
|
||||
+ 1 * ENABLE_FEATURE_LS_RECURSIVE
|
||||
+ 1 * ENABLE_FEATURE_HUMAN_READABLE
|
||||
+ 2 * ENABLE_SELINUX
|
||||
+ 2 * ENABLE_FEATURE_AUTOWIDTH,
|
||||
OPT_color = 1 << OPTBIT_color,
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -889,16 +898,6 @@ static int list_single(const struct dnode *dn)
|
||||
}
|
||||
|
||||
|
||||
/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
|
||||
#if ENABLE_FEATURE_LS_COLOR
|
||||
/* long option entry used only for --color, which has no short option
|
||||
* equivalent */
|
||||
static const char ls_color_opt[] ALIGN1 =
|
||||
"color\0" Optional_argument "\xff" /* no short equivalent */
|
||||
;
|
||||
#endif
|
||||
|
||||
|
||||
int ls_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
struct dnode **dnd;
|
||||
@@ -911,8 +910,25 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
|
||||
int dnfiles;
|
||||
int dndirs;
|
||||
int i;
|
||||
#if ENABLE_FEATURE_LS_COLOR
|
||||
/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
|
||||
/* coreutils 6.10:
|
||||
* # ls --color=BOGUS
|
||||
* ls: invalid argument 'BOGUS' for '--color'
|
||||
* Valid arguments are:
|
||||
* 'always', 'yes', 'force'
|
||||
* 'never', 'no', 'none'
|
||||
* 'auto', 'tty', 'if-tty'
|
||||
* (and substrings: "--color=alwa" work too)
|
||||
*/
|
||||
static const char ls_longopts[] ALIGN1 =
|
||||
"color\0" Optional_argument "\xff"; /* no short equivalent */
|
||||
static const char color_str[] ALIGN1 =
|
||||
"always\0""yes\0""force\0"
|
||||
"auto\0""tty\0""if-tty\0";
|
||||
/* need to initialize since --color has _an optional_ argument */
|
||||
USE_FEATURE_LS_COLOR(const char *color_opt = "always";)
|
||||
const char *color_opt = color_str; /* "always" */
|
||||
#endif
|
||||
|
||||
INIT_G();
|
||||
|
||||
@@ -927,7 +943,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
|
||||
#endif
|
||||
|
||||
/* process options */
|
||||
USE_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;)
|
||||
USE_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
|
||||
#if ENABLE_FEATURE_AUTOWIDTH
|
||||
opt_complementary = "T+:w+"; /* -T N, -w N */
|
||||
opt = getopt32(argv, ls_options, &tabstops, &terminal_width
|
||||
@@ -966,13 +982,20 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (!p || (p[0] && strcmp(p, "none") != 0))
|
||||
show_color = 1;
|
||||
}
|
||||
if (opt & (1 << i)) { /* next flag after short options */
|
||||
if (strcmp("always", color_opt) == 0)
|
||||
show_color = 1;
|
||||
else if (strcmp("never", color_opt) == 0)
|
||||
if (opt & OPT_color) {
|
||||
if (color_opt[0] == 'n')
|
||||
show_color = 0;
|
||||
else if (strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
|
||||
show_color = 1;
|
||||
else switch (index_in_substrings(color_str, color_opt)) {
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
if (isatty(STDOUT_FILENO)) {
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
show_color = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
+28
-5
@@ -6,9 +6,31 @@
|
||||
*
|
||||
* Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
|
||||
*/
|
||||
|
||||
#include "libbb.h"
|
||||
|
||||
/*
|
||||
* # readlink --version
|
||||
* readlink (GNU coreutils) 6.10
|
||||
* # readlink --help
|
||||
* -f, --canonicalize
|
||||
* canonicalize by following every symlink in
|
||||
* every component of the given name recursively;
|
||||
* all but the last component must exist
|
||||
* -e, --canonicalize-existing
|
||||
* canonicalize by following every symlink in
|
||||
* every component of the given name recursively,
|
||||
* all components must exist
|
||||
* -m, --canonicalize-missing
|
||||
* canonicalize by following every symlink in
|
||||
* every component of the given name recursively,
|
||||
* without requirements on components existence
|
||||
* -n, --no-newline do not output the trailing newline
|
||||
* -q, --quiet, -s, --silent suppress most error messages
|
||||
* -v, --verbose report error messages
|
||||
*
|
||||
* bbox supports: -f -n -v (fully), -q -s (accepts but ignores)
|
||||
*/
|
||||
|
||||
int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int readlink_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
@@ -20,7 +42,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
|
||||
unsigned opt;
|
||||
/* We need exactly one non-option argument. */
|
||||
opt_complementary = "=1";
|
||||
opt = getopt32(argv, "f");
|
||||
opt = getopt32(argv, "fnvsq");
|
||||
fname = argv[optind];
|
||||
)
|
||||
SKIP_FEATURE_READLINK_FOLLOW(
|
||||
@@ -30,9 +52,10 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
|
||||
)
|
||||
|
||||
/* compat: coreutils readlink reports errors silently via exit code */
|
||||
logmode = LOGMODE_NONE;
|
||||
if (!(opt & 4)) /* not -v */
|
||||
logmode = LOGMODE_NONE;
|
||||
|
||||
if (opt) {
|
||||
if (opt & 1) { /* -f */
|
||||
buf = realpath(fname, pathbuf);
|
||||
} else {
|
||||
buf = xmalloc_readlink_or_warn(fname);
|
||||
@@ -40,7 +63,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
|
||||
|
||||
if (!buf)
|
||||
return EXIT_FAILURE;
|
||||
puts(buf);
|
||||
printf((opt & 2) ? "%s" : "%s\n", buf);
|
||||
|
||||
if (ENABLE_FEATURE_CLEAN_UP && !opt)
|
||||
free(buf);
|
||||
|
||||
+10
-3
@@ -571,7 +571,14 @@ static number_t nexpr(enum token n)
|
||||
|
||||
nest_msg(">nexpr(%s)\n", TOKSTR[n]);
|
||||
if (n == UNOT) {
|
||||
res = !nexpr(check_operator(*++args));
|
||||
n = check_operator(*++args);
|
||||
if (n == EOI) {
|
||||
/* special case: [ ! ], [ a -a ! ] are valid */
|
||||
/* IOW, "! ARG" may miss ARG */
|
||||
unnest_msg("<nexpr:1 (!EOI)\n");
|
||||
return 1;
|
||||
}
|
||||
res = !nexpr(n);
|
||||
unnest_msg("<nexpr:%lld\n", res);
|
||||
return res;
|
||||
}
|
||||
@@ -742,7 +749,7 @@ int test_main(int argc, char **argv)
|
||||
check_operator(argv[1]);
|
||||
if (last_operator->op_type == BINOP) {
|
||||
/* "test [!] arg1 <binary_op> arg2" */
|
||||
args = &argv[0];
|
||||
args = argv;
|
||||
res = (binop() == 0);
|
||||
goto ret;
|
||||
}
|
||||
@@ -755,7 +762,7 @@ int test_main(int argc, char **argv)
|
||||
argv--;
|
||||
}
|
||||
#endif
|
||||
args = &argv[0];
|
||||
args = argv;
|
||||
res = !oexpr(check_operator(*args));
|
||||
|
||||
if (*args != NULL && *++args != NULL) {
|
||||
|
||||
+5
-4
@@ -1571,13 +1571,14 @@ static int awk_split(const char *s, node *spl, char **slist)
|
||||
n++; /* we saw yet another delimiter */
|
||||
} else {
|
||||
pmatch[0].rm_eo = l;
|
||||
if (s[l]) pmatch[0].rm_eo++;
|
||||
if (s[l])
|
||||
pmatch[0].rm_eo++;
|
||||
}
|
||||
memcpy(s1, s, l);
|
||||
/* make sure we remove *all* of the separator chars */
|
||||
while (l < pmatch[0].rm_eo) {
|
||||
s1[l++] = '\0';
|
||||
}
|
||||
do {
|
||||
s1[l] = '\0';
|
||||
} while (++l < pmatch[0].rm_eo);
|
||||
nextword(&s1);
|
||||
s += pmatch[0].rm_eo;
|
||||
} while (*s);
|
||||
|
||||
+67
-9
@@ -13,7 +13,7 @@
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify it
|
||||
# under the same terms as Perl itself.
|
||||
use Getopt::Long;
|
||||
use Getopt::Long qw(:config no_auto_abbrev no_ignore_case);
|
||||
use File::Find;
|
||||
use strict;
|
||||
|
||||
@@ -23,6 +23,9 @@ my $basedir="";
|
||||
my $kernel="";
|
||||
my $kernelsyms="";
|
||||
my $symprefix="";
|
||||
my $all=0;
|
||||
my $quick=0;
|
||||
my $errsyms=0;
|
||||
my $stdout=0;
|
||||
my $verbose=0;
|
||||
my $help=0;
|
||||
@@ -44,6 +47,8 @@ $0 -b basedir { -k <vmlinux> | -F <System.map> } [options]...
|
||||
-n --stdout : Write to stdout instead of <basedir>/modules.dep
|
||||
-v --verbose : Print out lots of debugging stuff
|
||||
-P --symbol-prefix : Symbol prefix
|
||||
-a --all : Probe all modules (default/only thing supported)
|
||||
-e --errsyms : Report any symbols not supplied by modules/kernel
|
||||
TXT
|
||||
|
||||
# get command-line options
|
||||
@@ -55,14 +60,23 @@ GetOptions(
|
||||
"stdout|n" => \$stdout,
|
||||
"verbose|v" => \$verbose,
|
||||
"symbol-prefix|P=s" => \$symprefix,
|
||||
"all|a" => \$all,
|
||||
# unsupported options
|
||||
"quick|A" => \$quick,
|
||||
# ignored options (for historical usage)
|
||||
"quiet|q",
|
||||
"root|r",
|
||||
"unresolved-error|u"
|
||||
);
|
||||
|
||||
die $usage if $help;
|
||||
die $usage unless $basedir && ( $kernel || $kernelsyms );
|
||||
die "can't use both -k and -F\n\n$usage" if $kernel && $kernelsyms;
|
||||
die "sorry, -A/--quick is not supported" if $quick;
|
||||
die "--errsyms requires --kernelsyms" if $errsyms && !$kernelsyms;
|
||||
|
||||
# Strip any trailing or multiple slashes from basedir
|
||||
$basedir =~ s-(/)\1+-/-g;
|
||||
$basedir =~ s-/+$--g;
|
||||
|
||||
# The base directory should contain /lib/modules somewhere
|
||||
if($basedir !~ m-/lib/modules-) {
|
||||
@@ -137,8 +151,48 @@ foreach my $module (keys %$dep) {
|
||||
}
|
||||
}
|
||||
|
||||
# build a complete dependency list for each module and make sure it
|
||||
# is kept in order proper order
|
||||
my $mod2 = {};
|
||||
sub maybe_unshift
|
||||
{
|
||||
my ($array, $ele) = @_;
|
||||
# chop off the leading path /lib/modules/<kver>/ as modprobe
|
||||
# will handle relative paths just fine
|
||||
$ele =~ s:^/lib/modules/[^/]*/::;
|
||||
foreach (@{$array}) {
|
||||
if ($_ eq $ele) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
unshift (@{$array}, $ele);
|
||||
}
|
||||
sub add_mod_deps
|
||||
{
|
||||
my ($depth, $mod, $mod2, $module, $this_module) = @_;
|
||||
|
||||
$depth .= " ";
|
||||
warn "${depth}loading deps of module: $this_module\n" if $verbose;
|
||||
|
||||
foreach my $md (keys %{$mod->{$this_module}}) {
|
||||
add_mod_deps ($depth, $mod, $mod2, $module, $md);
|
||||
warn "${depth} outputting $md\n" if $verbose;
|
||||
maybe_unshift (\@{$$mod2->{$module}}, $md);
|
||||
}
|
||||
|
||||
if (!%{$mod->{$this_module}}) {
|
||||
warn "${depth} no deps\n" if $verbose;
|
||||
}
|
||||
}
|
||||
foreach my $module (keys %$mod) {
|
||||
warn "filling out module: $module\n" if $verbose;
|
||||
@{$mod2->{$module}} = ();
|
||||
add_mod_deps ("", $mod, \$mod2, $module, $module);
|
||||
}
|
||||
|
||||
# figure out where the output should go
|
||||
if ($stdout == 0) {
|
||||
warn "writing $basedir/modules.dep\n" if $verbose;
|
||||
open(STDOUT, ">$basedir/modules.dep")
|
||||
or die "cannot open $basedir/modules.dep: $!";
|
||||
}
|
||||
@@ -151,8 +205,11 @@ foreach my $module ( keys %$mod ) {
|
||||
print join(" \\\n\t",@sorted);
|
||||
print "\n\n";
|
||||
} else {
|
||||
print "$module: ";
|
||||
my @sorted = sort bydep keys %{$mod->{$module}};
|
||||
my $shortmod = $module;
|
||||
$shortmod =~ s:^/lib/modules/[^/]*/::;
|
||||
print "$shortmod:";
|
||||
my @sorted = @{$mod2->{$module}};
|
||||
printf " " if @sorted;
|
||||
print join(" ",@sorted);
|
||||
print "\n";
|
||||
}
|
||||
@@ -163,15 +220,16 @@ sub build_ref_tables
|
||||
{
|
||||
my ($name, $sym_ar, $exp, $dep) = @_;
|
||||
|
||||
my $ksymtab = grep m/ __ksymtab/, @$sym_ar;
|
||||
my $ksymtab = grep m/ ${symprefix}__ksymtab/, @$sym_ar;
|
||||
|
||||
# gather the exported symbols
|
||||
if($ksymtab){
|
||||
# explicitly exported
|
||||
foreach ( @$sym_ar ) {
|
||||
/ __ksymtab_(.*)$/ and do {
|
||||
warn "sym = $1\n" if $verbose;
|
||||
$exp->{$1} = $name;
|
||||
/ ${symprefix}__ksymtab_(.*)$/ and do {
|
||||
my $sym = ${symprefix} . $1;
|
||||
warn "sym = $sym\n" if $verbose;
|
||||
$exp->{$sym} = $name;
|
||||
};
|
||||
}
|
||||
} else {
|
||||
@@ -189,7 +247,7 @@ sub build_ref_tables
|
||||
|
||||
# gather the unresolved symbols
|
||||
foreach ( @$sym_ar ) {
|
||||
!/ __this_module/ && / U (.*)$/ and do {
|
||||
!/ ${symprefix}__this_module/ && / U (.*)$/ and do {
|
||||
warn "und = $1\n" if $verbose;
|
||||
push @{$dep->{$name}}, $1;
|
||||
};
|
||||
|
||||
+1
-1
@@ -284,7 +284,7 @@ USE_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
|
||||
USE_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
|
||||
USE_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
USE_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
|
||||
USE_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
USE_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
|
||||
USE_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_NEVER))
|
||||
USE_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_NEVER))
|
||||
USE_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_NEVER, pkill))
|
||||
|
||||
+9
-1
@@ -965,6 +965,12 @@ enum {
|
||||
/* How long the longest ESC sequence we know? */
|
||||
KEYCODE_BUFFER_SIZE = 4
|
||||
};
|
||||
/* Note: fd may be in blocking or non-blocking mode, both make sense.
|
||||
* For one, less uses non-blocking mode.
|
||||
* Only the first read syscall inside read_key may block indefinitely
|
||||
* (unless fd is in non-blocking mode),
|
||||
* subsequent reads will time out after a few milliseconds.
|
||||
*/
|
||||
int read_key(int fd, smalluint *nbuffered, char *buffer) FAST_FUNC;
|
||||
|
||||
|
||||
@@ -1019,7 +1025,7 @@ extern void run_applet_no_and_exit(int a, char **argv) NORETURN FAST_FUNC;
|
||||
|
||||
#ifdef HAVE_MNTENT_H
|
||||
extern int match_fstype(const struct mntent *mt, const char *fstypes) FAST_FUNC;
|
||||
extern struct mntent *find_mount_point(const char *name, const char *table) FAST_FUNC;
|
||||
extern struct mntent *find_mount_point(const char *name) FAST_FUNC;
|
||||
#endif
|
||||
extern void erase_mtab(const char * name) FAST_FUNC;
|
||||
extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC;
|
||||
@@ -1093,6 +1099,8 @@ const char *get_signame(int number) FAST_FUNC;
|
||||
void print_signames(void) FAST_FUNC;
|
||||
|
||||
char *bb_simplify_path(const char *path) FAST_FUNC;
|
||||
/* Returns ptr to NUL */
|
||||
char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
|
||||
|
||||
#define FAIL_DELAY 3
|
||||
extern void bb_do_delay(int seconds) FAST_FUNC;
|
||||
|
||||
+4
-1
@@ -173,7 +173,10 @@
|
||||
/* performs reasonably well (gcc usually inlines memcpy here) */
|
||||
#define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
|
||||
#define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
|
||||
#define move_to_unaligned32(u32p, v) (memcpy((u32p), &(v), 4))
|
||||
#define move_to_unaligned32(u32p, v) do { \
|
||||
uint32_t __t = (v); \
|
||||
memcpy((u32p), &__t, 4); \
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
/* ---- Networking ------------------------------------------ */
|
||||
|
||||
+5
-2
@@ -3404,12 +3404,15 @@
|
||||
"files do not block on disk I/O"
|
||||
|
||||
#define readlink_trivial_usage \
|
||||
USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
|
||||
USE_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
|
||||
#define readlink_full_usage "\n\n" \
|
||||
"Display the value of a symlink" \
|
||||
USE_FEATURE_READLINK_FOLLOW( "\n" \
|
||||
"\nOptions:" \
|
||||
"\n -f Canonicalize by following all symlinks") \
|
||||
"\n -f Canonicalize by following all symlinks" \
|
||||
"\n -n Don't add newline" \
|
||||
"\n -v Verbose" \
|
||||
) \
|
||||
|
||||
#define readprofile_trivial_usage \
|
||||
"[OPTIONS]..."
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
* Given any other file (or directory), find the mount table entry for its
|
||||
* filesystem.
|
||||
*/
|
||||
struct mntent* FAST_FUNC find_mount_point(const char *name, const char *table)
|
||||
struct mntent* FAST_FUNC find_mount_point(const char *name)
|
||||
{
|
||||
struct stat s;
|
||||
dev_t mountDevice;
|
||||
@@ -25,27 +25,35 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, const char *table)
|
||||
struct mntent *mountEntry;
|
||||
|
||||
if (stat(name, &s) != 0)
|
||||
return 0;
|
||||
return NULL;
|
||||
|
||||
if ((s.st_mode & S_IFMT) == S_IFBLK)
|
||||
if (S_ISBLK(s.st_mode))
|
||||
mountDevice = s.st_rdev;
|
||||
else
|
||||
mountDevice = s.st_dev;
|
||||
|
||||
|
||||
mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
|
||||
mountTable = setmntent(bb_path_mtab_file, "r");
|
||||
if (!mountTable)
|
||||
return 0;
|
||||
|
||||
while ((mountEntry = getmntent(mountTable)) != 0) {
|
||||
while ((mountEntry = getmntent(mountTable)) != NULL) {
|
||||
/* rootfs mount in Linux 2.6 exists always,
|
||||
* and it makes sense to always ignore it.
|
||||
* Otherwise people can't reference their "real" root! */
|
||||
if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
|
||||
continue;
|
||||
|
||||
if (strcmp(name, mountEntry->mnt_dir) == 0
|
||||
|| strcmp(name, mountEntry->mnt_fsname) == 0
|
||||
) { /* String match. */
|
||||
break;
|
||||
}
|
||||
if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice) /* Match the device. */
|
||||
/* Match the device. */
|
||||
if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)
|
||||
break;
|
||||
if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice) /* Match the directory's mount point. */
|
||||
/* Match the directory's mount point. */
|
||||
if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)
|
||||
break;
|
||||
}
|
||||
endmntent(mountTable);
|
||||
|
||||
@@ -778,8 +778,10 @@ des_crypt(struct des_ctx *ctx, char output[DES_OUT_BUFSIZE],
|
||||
to64_msb_first(output + 2, (r0 >> 8));
|
||||
/* bits 7..0 of r0 and 31..16 of r1 */
|
||||
to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16));
|
||||
/* (bits 15..0 of r1 + 00) and NUL byte */
|
||||
/* bits 15..0 of r1 and two zero bits (plus extra zero byte) */
|
||||
to64_msb_first(output + 10, (r1 << 8));
|
||||
/* extra zero byte is encoded as '.', fixing it */
|
||||
output[13] = '\0';
|
||||
#endif
|
||||
|
||||
return output;
|
||||
|
||||
+2
-2
@@ -229,7 +229,7 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
|
||||
if (size > 64*1024)
|
||||
size = 64*1024;
|
||||
}
|
||||
xrealloc(buf, total + 1);
|
||||
buf = xrealloc(buf, total + 1);
|
||||
buf[total] = '\0';
|
||||
|
||||
if (maxsz_p)
|
||||
@@ -273,7 +273,7 @@ void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *maxsz_p)
|
||||
free(buf);
|
||||
return NULL;
|
||||
}
|
||||
xrealloc(buf, size + 1);
|
||||
buf = xrealloc(buf, size + 1);
|
||||
buf[size] = '\0';
|
||||
|
||||
if (maxsz_p)
|
||||
|
||||
+19
-13
@@ -6,22 +6,13 @@
|
||||
*
|
||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||
*/
|
||||
|
||||
#include "libbb.h"
|
||||
|
||||
char* FAST_FUNC bb_simplify_path(const char *path)
|
||||
char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
|
||||
{
|
||||
char *s, *start, *p;
|
||||
char *s, *p;
|
||||
|
||||
if (path[0] == '/')
|
||||
start = xstrdup(path);
|
||||
else {
|
||||
s = xrealloc_getcwd_or_warn(NULL);
|
||||
start = concat_path_file(s, path);
|
||||
free(s);
|
||||
}
|
||||
p = s = start;
|
||||
|
||||
do {
|
||||
if (*p == '/') {
|
||||
if (*s == '/') { /* skip duplicate (or initial) slash */
|
||||
@@ -47,7 +38,22 @@ char* FAST_FUNC bb_simplify_path(const char *path)
|
||||
if ((p == start) || (*p != '/')) { /* not a trailing slash */
|
||||
++p; /* so keep last character */
|
||||
}
|
||||
*p = 0;
|
||||
*p = '\0';
|
||||
return p;
|
||||
}
|
||||
|
||||
return start;
|
||||
char* FAST_FUNC bb_simplify_path(const char *path)
|
||||
{
|
||||
char *s, *p;
|
||||
|
||||
if (path[0] == '/')
|
||||
s = xstrdup(path);
|
||||
else {
|
||||
p = xrealloc_getcwd_or_warn(NULL);
|
||||
s = concat_path_file(p, path);
|
||||
free(p);
|
||||
}
|
||||
|
||||
bb_simplify_abs_path_inplace(s);
|
||||
return s;
|
||||
}
|
||||
+26
-13
@@ -40,26 +40,28 @@ enum {
|
||||
ARG_r = (1<<6) /* Compat dummy. Linux Makefile uses it */
|
||||
};
|
||||
|
||||
static int FAST_FUNC parse_module(const char *fname, struct stat *sb,
|
||||
void *data, int UNUSED_PARAM depth)
|
||||
static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
|
||||
void *data, int depth UNUSED_PARAM)
|
||||
{
|
||||
char modname[MODULE_NAME_LEN];
|
||||
module_info **first = (module_info **) data;
|
||||
char *image, *ptr;
|
||||
module_info *info;
|
||||
size_t len = sb->st_size;
|
||||
/* Arbitrary. Was sb->st_size, but that breaks .gz etc */
|
||||
size_t len = (64*1024*1024 - 4096);
|
||||
|
||||
if (strrstr(fname, ".ko") == NULL)
|
||||
return TRUE;
|
||||
|
||||
image = xmalloc_open_zipped_read_close(fname, &len);
|
||||
info = xzalloc(sizeof(module_info));
|
||||
info = xzalloc(sizeof(*info));
|
||||
|
||||
info->next = *first;
|
||||
*first = info;
|
||||
|
||||
info->dnext = info->dprev = info;
|
||||
info->name = xasprintf("/%s", fname);
|
||||
info->modname = filename2modname(fname, NULL);
|
||||
info->modname = xstrdup(filename2modname(fname, modname));
|
||||
for (ptr = image; ptr < image + len - 10; ptr++) {
|
||||
if (strncmp(ptr, "depends=", 8) == 0) {
|
||||
char *u;
|
||||
@@ -69,12 +71,14 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb,
|
||||
if (*u == '-')
|
||||
*u = '_';
|
||||
ptr += string_to_llist(ptr, &info->dependencies, ",");
|
||||
} else if (ENABLE_FEATURE_MODUTILS_ALIAS &&
|
||||
strncmp(ptr, "alias=", 6) == 0) {
|
||||
} else if (ENABLE_FEATURE_MODUTILS_ALIAS
|
||||
&& strncmp(ptr, "alias=", 6) == 0
|
||||
) {
|
||||
llist_add_to(&info->aliases, xstrdup(ptr + 6));
|
||||
ptr += strlen(ptr);
|
||||
} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS &&
|
||||
strncmp(ptr, "__ksymtab_", 10) == 0) {
|
||||
} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
|
||||
&& strncmp(ptr, "__ksymtab_", 10) == 0
|
||||
) {
|
||||
ptr += 10;
|
||||
if (strncmp(ptr, "gpl", 3) == 0 ||
|
||||
strcmp(ptr, "strings") == 0)
|
||||
@@ -199,10 +203,17 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (!(option_mask32 & ARG_n))
|
||||
xfreopen_write("modules.alias", stdout);
|
||||
for (m = modules; m != NULL; m = m->next) {
|
||||
const char *fname = bb_basename(m->name);
|
||||
int fnlen = strchrnul(fname, '.') - fname;
|
||||
while (m->aliases) {
|
||||
printf("alias %s %s\n",
|
||||
/* Last word can well be m->modname instead,
|
||||
* but depmod from module-init-tools 3.4
|
||||
* uses module basename, i.e., no s/-/_/g.
|
||||
* (pathname and .ko.* are still stripped)
|
||||
* Mimicking that... */
|
||||
printf("alias %s %.*s\n",
|
||||
(char*)llist_pop(&m->aliases),
|
||||
m->modname);
|
||||
fnlen, fname);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -210,10 +221,12 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (!(option_mask32 & ARG_n))
|
||||
xfreopen_write("modules.symbols", stdout);
|
||||
for (m = modules; m != NULL; m = m->next) {
|
||||
const char *fname = bb_basename(m->name);
|
||||
int fnlen = strchrnul(fname, '.') - fname;
|
||||
while (m->symbols) {
|
||||
printf("alias symbol:%s %s\n",
|
||||
printf("alias symbol:%s %.*s\n",
|
||||
(char*)llist_pop(&m->symbols),
|
||||
m->modname);
|
||||
fnlen, fname);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -218,6 +218,7 @@ static void parse_module(module_info *info, const char *pathname)
|
||||
bksp(); /* remove last ' ' */
|
||||
appendc('\0');
|
||||
info->aliases = copy_stringbuf();
|
||||
replace(info->aliases, '-', '_');
|
||||
|
||||
/* "dependency1 depandency2" */
|
||||
reset_stringbuf();
|
||||
@@ -656,7 +657,7 @@ depmod -[aA] [-n -e -v -q -V -r -u]
|
||||
[-b basedirectory] [forced_version]
|
||||
depmod [-n -e -v -q -r -u] [-F kernelsyms] module1.ko module2.ko ...
|
||||
If no arguments (except options) are given, "depmod -a" is assumed.
|
||||
depmod will output a dependancy list suitable for the modprobe utility.
|
||||
depmod will output a dependency list suitable for the modprobe utility.
|
||||
Options:
|
||||
-a, --all Probe all modules
|
||||
-A, --quick Only does the work if there's a new module
|
||||
|
||||
+34
-11
@@ -8,12 +8,17 @@
|
||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||
*/
|
||||
|
||||
/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
|
||||
* we expect the full dependency list to be specified in modules.dep. Older
|
||||
* versions would only export the direct dependency list.
|
||||
*/
|
||||
|
||||
#include "libbb.h"
|
||||
#include "modutils.h"
|
||||
#include <sys/utsname.h>
|
||||
#include <fnmatch.h>
|
||||
|
||||
//#define DBG(...) bb_error_msg(__VA_ARGS__)
|
||||
//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
|
||||
#define DBG(...) ((void)0)
|
||||
|
||||
#define MODULE_FLAG_LOADED 0x0001
|
||||
@@ -109,11 +114,14 @@ static void add_probe(const char *name)
|
||||
struct module_entry *m;
|
||||
|
||||
m = get_or_add_modentry(name);
|
||||
if (m->flags & MODULE_FLAG_LOADED) {
|
||||
if (!(option_mask32 & MODPROBE_OPT_REMOVE)
|
||||
&& (m->flags & MODULE_FLAG_LOADED)
|
||||
) {
|
||||
DBG("skipping %s, it is already loaded", name);
|
||||
return;
|
||||
}
|
||||
|
||||
DBG("queuing %s", name);
|
||||
m->probed_name = name;
|
||||
m->flags |= MODULE_FLAG_NEED_DEPS;
|
||||
llist_add_to_end(&G.probes, m);
|
||||
@@ -203,9 +211,10 @@ static int read_config(const char *path)
|
||||
|
||||
static int do_modprobe(struct module_entry *m)
|
||||
{
|
||||
struct module_entry *m2;
|
||||
struct module_entry *m2 = m2; /* for compiler */
|
||||
char *fn, *options;
|
||||
int rc = -1;
|
||||
int rc, first;
|
||||
llist_t *l;
|
||||
|
||||
if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
|
||||
DBG("skipping %s, not found in modules.dep", m->modname);
|
||||
@@ -216,13 +225,25 @@ static int do_modprobe(struct module_entry *m)
|
||||
if (!(option_mask32 & MODPROBE_OPT_REMOVE))
|
||||
m->deps = llist_rev(m->deps);
|
||||
|
||||
for (l = m->deps; l != NULL; l = l->link)
|
||||
DBG("dep: %s", l->data);
|
||||
|
||||
first = 1;
|
||||
rc = 0;
|
||||
while (m->deps && rc == 0) {
|
||||
fn = llist_pop(&m->deps);
|
||||
m2 = get_or_add_modentry(fn);
|
||||
if (option_mask32 & MODPROBE_OPT_REMOVE) {
|
||||
if (bb_delete_module(m->modname, O_EXCL) != 0)
|
||||
rc = errno;
|
||||
if (m2->flags & MODULE_FLAG_LOADED) {
|
||||
if (bb_delete_module(m2->modname, O_EXCL) != 0) {
|
||||
if (first)
|
||||
rc = errno;
|
||||
} else {
|
||||
m2->flags &= ~MODULE_FLAG_LOADED;
|
||||
}
|
||||
}
|
||||
/* do not error out if *deps* fail to unload */
|
||||
first = 0;
|
||||
} else if (!(m2->flags & MODULE_FLAG_LOADED)) {
|
||||
options = m2->options;
|
||||
m2->options = NULL;
|
||||
@@ -240,11 +261,10 @@ static int do_modprobe(struct module_entry *m)
|
||||
free(fn);
|
||||
}
|
||||
|
||||
//FIXME: what if rc < 0?
|
||||
if (rc > 0 && !(option_mask32 & INSMOD_OPT_SILENT)) {
|
||||
if (rc && !(option_mask32 & INSMOD_OPT_SILENT)) {
|
||||
bb_error_msg("failed to %sload module %s: %s",
|
||||
(option_mask32 & MODPROBE_OPT_REMOVE) ? "un" : "",
|
||||
m->probed_name ? m->probed_name : m->modname,
|
||||
m2->probed_name ? m2->probed_name : m2->modname,
|
||||
moderror(rc)
|
||||
);
|
||||
}
|
||||
@@ -292,7 +312,8 @@ static void load_modules_dep(void)
|
||||
llist_add_to(&m->deps, xstrdup(tokens[0]));
|
||||
if (tokens[1])
|
||||
string_to_llist(tokens[1], &m->deps, " ");
|
||||
}
|
||||
} else
|
||||
DBG("skipping dep line");
|
||||
}
|
||||
config_close(p);
|
||||
}
|
||||
@@ -339,13 +360,15 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
|
||||
config_close(parser);
|
||||
}
|
||||
|
||||
if (opt & MODPROBE_OPT_INSERT_ALL) {
|
||||
if (opt & (MODPROBE_OPT_INSERT_ALL | MODPROBE_OPT_REMOVE)) {
|
||||
/* Each argument is a module name */
|
||||
do {
|
||||
DBG("adding module %s", *argv);
|
||||
add_probe(*argv++);
|
||||
} while (*argv);
|
||||
} else {
|
||||
/* First argument is module name, rest are parameters */
|
||||
DBG("probing just module %s", *argv);
|
||||
add_probe(argv[0]);
|
||||
G.cmdline_mopts = parse_cmdline_module_options(argv);
|
||||
}
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ char * FAST_FUNC filename2modname(const char *filename, char *modname)
|
||||
from = bb_get_last_path_component_nostrip(filename);
|
||||
for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
|
||||
modname[i] = (from[i] == '-') ? '_' : from[i];
|
||||
modname[i] = 0;
|
||||
modname[i] = '\0';
|
||||
|
||||
return modname;
|
||||
}
|
||||
|
||||
@@ -1320,6 +1320,8 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
|
||||
handle_appe();
|
||||
else if (cmdval == const_STOU) /* "store unique" */
|
||||
handle_stou();
|
||||
else
|
||||
goto bad_cmd;
|
||||
}
|
||||
#endif
|
||||
#if 0
|
||||
@@ -1340,6 +1342,9 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
|
||||
* (doesn't necessarily mean "we must support them")
|
||||
* foo 1.2.3: XXXX - comment
|
||||
*/
|
||||
#if ENABLE_FEATURE_FTP_WRITE
|
||||
bad_cmd:
|
||||
#endif
|
||||
cmdio_write_raw(STR(FTP_BADCMD)" Unknown command\r\n");
|
||||
}
|
||||
}
|
||||
|
||||
+213
-207
@@ -32,7 +32,7 @@
|
||||
* foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World"
|
||||
* bar=`httpd -e "<Hello World>"` # encode as "<Hello World>"
|
||||
* Note that url encoding for arguments is not the same as html encoding for
|
||||
* presentation. -d decodes a url-encoded argument while -e encodes in html
|
||||
* presentation. -d decodes an url-encoded argument while -e encodes in html
|
||||
* for page display.
|
||||
*
|
||||
* httpd.conf has the following format:
|
||||
@@ -54,7 +54,7 @@
|
||||
* /adm:admin:setup # Require user admin, pwd setup on urls starting with /adm/
|
||||
* /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/
|
||||
* .au:audio/basic # additional mime type for audio.au files
|
||||
* *.php:/path/php # running cgi.php scripts through an interpreter
|
||||
* *.php:/path/php # run xxx.php through an interpreter
|
||||
*
|
||||
* A/D may be as a/d or allow/deny - only first char matters.
|
||||
* Deny/Allow IP logic:
|
||||
@@ -94,13 +94,13 @@
|
||||
* server exits with an error.
|
||||
*
|
||||
*/
|
||||
/* TODO: use TCP_CORK, parse_config() */
|
||||
|
||||
#include "libbb.h"
|
||||
#if ENABLE_FEATURE_HTTPD_USE_SENDFILE
|
||||
# include <sys/sendfile.h>
|
||||
#endif
|
||||
|
||||
//#define DEBUG 1
|
||||
#define DEBUG 0
|
||||
|
||||
#define IOBUF_SIZE 8192 /* IO buffer */
|
||||
@@ -115,8 +115,8 @@
|
||||
|
||||
#define HEADER_READ_TIMEOUT 60
|
||||
|
||||
static const char default_path_httpd_conf[] ALIGN1 = "/etc";
|
||||
static const char httpd_conf[] ALIGN1 = "httpd.conf";
|
||||
static const char DEFAULT_PATH_HTTPD_CONF[] ALIGN1 = "/etc";
|
||||
static const char HTTPD_CONF[] ALIGN1 = "httpd.conf";
|
||||
static const char HTTP_200[] ALIGN1 = "HTTP/1.0 200 OK\r\n";
|
||||
|
||||
typedef struct has_next_ptr {
|
||||
@@ -242,7 +242,7 @@ struct globals {
|
||||
const char *bind_addr_or_port;
|
||||
|
||||
const char *g_query;
|
||||
const char *configFile;
|
||||
const char *opt_c_configFile;
|
||||
const char *home_httpd;
|
||||
const char *index_page;
|
||||
|
||||
@@ -289,7 +289,7 @@ struct globals {
|
||||
#define rmt_ip (G.rmt_ip )
|
||||
#define bind_addr_or_port (G.bind_addr_or_port)
|
||||
#define g_query (G.g_query )
|
||||
#define configFile (G.configFile )
|
||||
#define opt_c_configFile (G.opt_c_configFile )
|
||||
#define home_httpd (G.home_httpd )
|
||||
#define index_page (G.index_page )
|
||||
#define found_mime_type (G.found_mime_type )
|
||||
@@ -452,14 +452,6 @@ static int scan_ip_mask(const char *str, unsigned *ipp, unsigned *maskp)
|
||||
/*
|
||||
* Parse configuration file into in-memory linked list.
|
||||
*
|
||||
* The first non-white character is examined to determine if the config line
|
||||
* is one of the following:
|
||||
* .ext:mime/type # new mime type not compiled into httpd
|
||||
* [adAD]:from # ip address allow/deny, * for wildcard
|
||||
* /path:user:pass # username/password
|
||||
* Ennn:error.html # error page for status nnn
|
||||
* P:/url:[http://]hostname[:port]/new/path # reverse proxy
|
||||
*
|
||||
* Any previous IP rules are discarded.
|
||||
* If the flag argument is not SUBDIR_PARSE then all /path and mime rules
|
||||
* are also discarded. That is, previous settings are retained if flag is
|
||||
@@ -469,99 +461,150 @@ static int scan_ip_mask(const char *str, unsigned *ipp, unsigned *maskp)
|
||||
* path Path where to look for httpd.conf (without filename).
|
||||
* flag Type of the parse request.
|
||||
*/
|
||||
/* flag */
|
||||
#define FIRST_PARSE 0
|
||||
#define SUBDIR_PARSE 1
|
||||
#define SIGNALED_PARSE 2
|
||||
#define FIND_FROM_HTTPD_ROOT 3
|
||||
/* flag param: */
|
||||
enum {
|
||||
FIRST_PARSE = 0, /* path will be "/etc" */
|
||||
SIGNALED_PARSE = 1, /* path will be "/etc" */
|
||||
SUBDIR_PARSE = 2, /* path will be derived from URL */
|
||||
};
|
||||
static void parse_conf(const char *path, int flag)
|
||||
{
|
||||
/* internally used extra flag state */
|
||||
enum { TRY_CURDIR_PARSE = 3 };
|
||||
|
||||
FILE *f;
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
Htaccess *prev;
|
||||
#endif
|
||||
Htaccess *cur;
|
||||
const char *filename = configFile;
|
||||
const char *filename;
|
||||
char buf[160];
|
||||
char *p, *p0;
|
||||
char *after_colon;
|
||||
Htaccess_IP *pip;
|
||||
|
||||
/* discard old rules */
|
||||
free_Htaccess_IP_list(&ip_a_d);
|
||||
flg_deny_all = 0;
|
||||
/* retain previous auth and mime config only for subdir parse */
|
||||
if (flag != SUBDIR_PARSE) {
|
||||
free_Htaccess_list(&mime_a);
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
free_Htaccess_list(&g_auth);
|
||||
#endif
|
||||
free_Htaccess_list(&mime_a);
|
||||
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
|
||||
free_Htaccess_list(&script_i);
|
||||
#endif
|
||||
}
|
||||
|
||||
filename = opt_c_configFile;
|
||||
if (flag == SUBDIR_PARSE || filename == NULL) {
|
||||
filename = alloca(strlen(path) + sizeof(httpd_conf) + 2);
|
||||
sprintf((char *)filename, "%s/%s", path, httpd_conf);
|
||||
filename = alloca(strlen(path) + sizeof(HTTPD_CONF) + 2);
|
||||
sprintf((char *)filename, "%s/%s", path, HTTPD_CONF);
|
||||
}
|
||||
|
||||
while ((f = fopen_for_read(filename)) == NULL) {
|
||||
if (flag == SUBDIR_PARSE || flag == FIND_FROM_HTTPD_ROOT) {
|
||||
if (flag >= SUBDIR_PARSE) { /* SUBDIR or TRY_CURDIR */
|
||||
/* config file not found, no changes to config */
|
||||
return;
|
||||
}
|
||||
if (configFile && flag == FIRST_PARSE) /* if -c option given */
|
||||
bb_simple_perror_msg_and_die(filename);
|
||||
flag = FIND_FROM_HTTPD_ROOT;
|
||||
filename = httpd_conf;
|
||||
if (flag == FIRST_PARSE) {
|
||||
/* -c CONFFILE given, but CONFFILE doesn't exist? */
|
||||
if (opt_c_configFile)
|
||||
bb_simple_perror_msg_and_die(opt_c_configFile);
|
||||
/* else: no -c, thus we looked at /etc/httpd.conf,
|
||||
* and it's not there. try ./httpd.conf: */
|
||||
}
|
||||
flag = TRY_CURDIR_PARSE;
|
||||
filename = HTTPD_CONF;
|
||||
}
|
||||
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
prev = g_auth;
|
||||
/* in "/file:user:pass" lines, we prepend path in subdirs */
|
||||
if (flag != SUBDIR_PARSE)
|
||||
path = "";
|
||||
#endif
|
||||
/* This could stand some work */
|
||||
while ((p0 = fgets(buf, sizeof(buf), f)) != NULL) {
|
||||
after_colon = NULL;
|
||||
for (p = p0; *p0 != '\0' && *p0 != '#'; p0++) {
|
||||
if (!isspace(*p0)) {
|
||||
*p++ = *p0;
|
||||
if (*p0 == ':' && after_colon == NULL)
|
||||
after_colon = p;
|
||||
}
|
||||
}
|
||||
*p = '\0';
|
||||
/* The lines can be:
|
||||
*
|
||||
* I:default_index_file
|
||||
* H:http_home
|
||||
* [AD]:IP[/mask] # allow/deny, * for wildcard
|
||||
* Ennn:error.html # error page for status nnn
|
||||
* P:/url:[http://]hostname[:port]/new/path # reverse proxy
|
||||
* .ext:mime/type # mime type
|
||||
* *.php:/path/php # run xxx.php through an interpreter
|
||||
* /file:user:pass # username and password
|
||||
*/
|
||||
while (fgets(buf, sizeof(buf), f) != NULL) {
|
||||
unsigned strlen_buf;
|
||||
unsigned char ch;
|
||||
char *after_colon;
|
||||
|
||||
/* test for empty or strange line */
|
||||
if (after_colon == NULL || *after_colon == '\0')
|
||||
continue;
|
||||
p0 = buf;
|
||||
if (*p0 == 'd' || *p0 == 'a')
|
||||
*p0 -= 0x20; /* a/d -> A/D */
|
||||
if (*after_colon == '*') {
|
||||
if (*p0 == 'D') {
|
||||
/* memorize "deny all" */
|
||||
flg_deny_all = 1;
|
||||
{ /* remove all whitespace, and # comments */
|
||||
char *p, *p0;
|
||||
|
||||
p0 = buf;
|
||||
/* skip non-whitespace beginning. Often the whole line
|
||||
* is non-whitespace. We want this case to work fast,
|
||||
* without needless copying, therefore we don't merge
|
||||
* this operation into next while loop. */
|
||||
while ((ch = *p0) != '\0' && ch != '\n' && ch != '#'
|
||||
&& ch != ' ' && ch != '\t'
|
||||
) {
|
||||
p0++;
|
||||
}
|
||||
/* skip assumed "A:*", it is a default anyway */
|
||||
p = p0;
|
||||
/* if we enter this loop, we have some whitespace.
|
||||
* discard it */
|
||||
while (ch != '\0' && ch != '\n' && ch != '#') {
|
||||
if (ch != ' ' && ch != '\t') {
|
||||
*p++ = ch;
|
||||
}
|
||||
ch = *++p0;
|
||||
}
|
||||
*p = '\0';
|
||||
strlen_buf = p - buf;
|
||||
if (strlen_buf == 0)
|
||||
continue; /* empty line */
|
||||
}
|
||||
|
||||
after_colon = strchr(buf, ':');
|
||||
/* strange line? */
|
||||
if (after_colon == NULL || *++after_colon == '\0')
|
||||
goto config_error;
|
||||
|
||||
ch = (buf[0] & ~0x20); /* toupper if it's a letter */
|
||||
|
||||
if (ch == 'I') {
|
||||
index_page = xstrdup(after_colon);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (*p0 == 'A' || *p0 == 'D') {
|
||||
/* storing current config IP line */
|
||||
pip = xzalloc(sizeof(Htaccess_IP));
|
||||
if (scan_ip_mask(after_colon, &(pip->ip), &(pip->mask))) {
|
||||
/* do not allow jumping around using H in subdir's configs */
|
||||
if (flag == FIRST_PARSE && ch == 'H') {
|
||||
home_httpd = xstrdup(after_colon);
|
||||
xchdir(home_httpd);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ch == 'A' || ch == 'D') {
|
||||
Htaccess_IP *pip;
|
||||
|
||||
if (*after_colon == '*') {
|
||||
if (ch == 'D') {
|
||||
/* memorize "deny all" */
|
||||
flg_deny_all = 1;
|
||||
}
|
||||
/* skip assumed "A:*", it is a default anyway */
|
||||
continue;
|
||||
}
|
||||
/* store "allow/deny IP/mask" line */
|
||||
pip = xzalloc(sizeof(*pip));
|
||||
if (scan_ip_mask(after_colon, &pip->ip, &pip->mask)) {
|
||||
/* IP{/mask} syntax error detected, protect all */
|
||||
*p0 = 'D';
|
||||
ch = 'D';
|
||||
pip->mask = 0;
|
||||
}
|
||||
pip->allow_deny = *p0;
|
||||
if (*p0 == 'D') {
|
||||
pip->allow_deny = ch;
|
||||
if (ch == 'D') {
|
||||
/* Deny:from_IP - prepend */
|
||||
pip->next = ip_a_d;
|
||||
ip_a_d = pip;
|
||||
} else {
|
||||
/* A:from_IP - append (thus D precedes A) */
|
||||
/* A:from_IP - append (thus all D's precedes A's) */
|
||||
Htaccess_IP *prev_IP = ip_a_d;
|
||||
if (prev_IP == NULL) {
|
||||
ip_a_d = pip;
|
||||
@@ -575,12 +618,12 @@ static void parse_conf(const char *path, int flag)
|
||||
}
|
||||
|
||||
#if ENABLE_FEATURE_HTTPD_ERROR_PAGES
|
||||
if (flag == FIRST_PARSE && *p0 == 'E') {
|
||||
if (flag == FIRST_PARSE && ch == 'E') {
|
||||
unsigned i;
|
||||
int status = atoi(++p0); /* error status code */
|
||||
int status = atoi(buf + 1); /* error status code */
|
||||
|
||||
if (status < HTTP_CONTINUE) {
|
||||
bb_error_msg("config error '%s' in '%s'", buf, filename);
|
||||
continue;
|
||||
goto config_error;
|
||||
}
|
||||
/* then error page; find matching status */
|
||||
for (i = 0; i < ARRAY_SIZE(http_response_type); i++) {
|
||||
@@ -597,7 +640,7 @@ static void parse_conf(const char *path, int flag)
|
||||
#endif
|
||||
|
||||
#if ENABLE_FEATURE_HTTPD_PROXY
|
||||
if (flag == FIRST_PARSE && *p0 == 'P') {
|
||||
if (flag == FIRST_PARSE && ch == 'P') {
|
||||
/* P:/url:[http://]hostname[:port]/new/path */
|
||||
char *url_from, *host_port, *url_to;
|
||||
Htaccess_Proxy *proxy_entry;
|
||||
@@ -605,23 +648,20 @@ static void parse_conf(const char *path, int flag)
|
||||
url_from = after_colon;
|
||||
host_port = strchr(after_colon, ':');
|
||||
if (host_port == NULL) {
|
||||
bb_error_msg("config error '%s' in '%s'", buf, filename);
|
||||
continue;
|
||||
goto config_error;
|
||||
}
|
||||
*host_port++ = '\0';
|
||||
if (strncmp(host_port, "http://", 7) == 0)
|
||||
host_port += 7;
|
||||
if (*host_port == '\0') {
|
||||
bb_error_msg("config error '%s' in '%s'", buf, filename);
|
||||
continue;
|
||||
goto config_error;
|
||||
}
|
||||
url_to = strchr(host_port, '/');
|
||||
if (url_to == NULL) {
|
||||
bb_error_msg("config error '%s' in '%s'", buf, filename);
|
||||
continue;
|
||||
goto config_error;
|
||||
}
|
||||
*url_to = '\0';
|
||||
proxy_entry = xzalloc(sizeof(Htaccess_Proxy));
|
||||
proxy_entry = xzalloc(sizeof(*proxy_entry));
|
||||
proxy_entry->url_from = xstrdup(url_from);
|
||||
proxy_entry->host_port = xstrdup(host_port);
|
||||
*url_to = '/';
|
||||
@@ -631,115 +671,87 @@ static void parse_conf(const char *path, int flag)
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
/* the rest of directives are non-alphabetic,
|
||||
* must avoid using "toupper'ed" ch */
|
||||
ch = buf[0];
|
||||
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
if (*p0 == '/') {
|
||||
/* make full path from httpd root / current_path / config_line_path */
|
||||
const char *tp = (flag == SUBDIR_PARSE ? path : "");
|
||||
p0 = xmalloc(strlen(tp) + (after_colon - buf) + 2 + strlen(after_colon));
|
||||
after_colon[-1] = '\0';
|
||||
sprintf(p0, "/%s%s", tp, buf);
|
||||
|
||||
/* looks like bb_simplify_path... */
|
||||
tp = p = p0;
|
||||
do {
|
||||
if (*p == '/') {
|
||||
if (*tp == '/') { /* skip duplicate (or initial) slash */
|
||||
continue;
|
||||
}
|
||||
if (*tp == '.') {
|
||||
if (tp[1] == '/' || tp[1] == '\0') { /* remove extra '.' */
|
||||
continue;
|
||||
}
|
||||
if ((tp[1] == '.') && (tp[2] == '/' || tp[2] == '\0')) {
|
||||
++tp;
|
||||
if (p > p0) {
|
||||
while (*--p != '/') /* omit previous dir */
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
*++p = *tp;
|
||||
} while (*++tp);
|
||||
|
||||
if ((p == p0) || (*p != '/')) { /* not a trailing slash */
|
||||
++p; /* so keep last character */
|
||||
}
|
||||
*p = ':';
|
||||
strcpy(p + 1, after_colon);
|
||||
}
|
||||
#endif
|
||||
if (*p0 == 'I') {
|
||||
index_page = xstrdup(after_colon);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Do not allow jumping around using H in subdir's configs */
|
||||
if (flag == FIRST_PARSE && *p0 == 'H') {
|
||||
home_httpd = xstrdup(after_colon);
|
||||
xchdir(home_httpd);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* storing current config line */
|
||||
cur = xzalloc(sizeof(Htaccess) + strlen(p0));
|
||||
strcpy(cur->before_colon, p0);
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
if (*p0 == '/') /* was malloced - see above */
|
||||
free(p0);
|
||||
#endif
|
||||
cur->after_colon = strchr(cur->before_colon, ':');
|
||||
*cur->after_colon++ = '\0';
|
||||
if (cur->before_colon[0] == '.') {
|
||||
/* .mime line: prepend to mime_a list */
|
||||
cur->next = mime_a;
|
||||
mime_a = cur;
|
||||
continue;
|
||||
}
|
||||
if (ch == '.' /* ".ext:mime/type" */
|
||||
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
|
||||
if (cur->before_colon[0] == '*' && cur->before_colon[1] == '.') {
|
||||
/* script interpreter line: prepend to script_i list */
|
||||
cur->next = script_i;
|
||||
script_i = cur;
|
||||
|| (ch == '*' && buf[1] == '.') /* "*.php:/path/php" */
|
||||
#endif
|
||||
) {
|
||||
char *p;
|
||||
Htaccess *cur;
|
||||
|
||||
cur = xzalloc(sizeof(*cur) /* includes space for NUL */ + strlen_buf);
|
||||
strcpy(cur->before_colon, buf);
|
||||
p = cur->before_colon + (after_colon - buf);
|
||||
p[-1] = '\0';
|
||||
cur->after_colon = p;
|
||||
if (ch == '.') {
|
||||
/* .mime line: prepend to mime_a list */
|
||||
cur->next = mime_a;
|
||||
mime_a = cur;
|
||||
}
|
||||
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
|
||||
else {
|
||||
/* script interpreter line: prepend to script_i list */
|
||||
cur->next = script_i;
|
||||
script_i = cur;
|
||||
}
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
//TODO: we do not test for leading "/"??
|
||||
//also, do we leak cur if BASIC_AUTH is off?
|
||||
if (prev == NULL) {
|
||||
/* first line */
|
||||
g_auth = prev = cur;
|
||||
} else {
|
||||
/* sort path, if current length eq or bigger then move up */
|
||||
Htaccess *prev_hti = g_auth;
|
||||
size_t l = strlen(cur->before_colon);
|
||||
Htaccess *hti;
|
||||
|
||||
for (hti = prev_hti; hti; hti = hti->next) {
|
||||
if (l >= strlen(hti->before_colon)) {
|
||||
/* insert before hti */
|
||||
cur->next = hti;
|
||||
if (prev_hti != hti) {
|
||||
prev_hti->next = cur;
|
||||
} else {
|
||||
/* insert as top */
|
||||
g_auth = cur;
|
||||
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
|
||||
if (ch == '/') { /* "/file:user:pass" */
|
||||
char *p;
|
||||
Htaccess *cur;
|
||||
unsigned file_len;
|
||||
|
||||
/* note: path is "" unless we are in SUBDIR parse,
|
||||
* otherwise it does NOT start with "/" */
|
||||
cur = xzalloc(sizeof(*cur) /* includes space for NUL */
|
||||
+ 1 + strlen(path)
|
||||
+ strlen_buf
|
||||
);
|
||||
/* form "/path/file" */
|
||||
sprintf(cur->before_colon, "/%s%.*s",
|
||||
path,
|
||||
(int) (after_colon - buf - 1), /* includes "/", but not ":" */
|
||||
buf);
|
||||
/* canonicalize it */
|
||||
p = bb_simplify_abs_path_inplace(cur->before_colon);
|
||||
file_len = p - cur->before_colon;
|
||||
/* add "user:pass" after NUL */
|
||||
strcpy(++p, after_colon);
|
||||
cur->after_colon = p;
|
||||
|
||||
/* insert cur into g_auth */
|
||||
/* g_auth is sorted by decreased filename length */
|
||||
{
|
||||
Htaccess *auth, **authp;
|
||||
|
||||
authp = &g_auth;
|
||||
while ((auth = *authp) != NULL) {
|
||||
if (file_len >= strlen(auth->before_colon)) {
|
||||
/* insert cur before auth */
|
||||
cur->next = auth;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
authp = &auth->next;
|
||||
}
|
||||
if (prev_hti != hti)
|
||||
prev_hti = prev_hti->next;
|
||||
}
|
||||
if (!hti) { /* not inserted, add to bottom */
|
||||
prev->next = cur;
|
||||
prev = cur;
|
||||
*authp = cur;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
#endif /* BASIC_AUTH */
|
||||
|
||||
/* the line is not recognized */
|
||||
config_error:
|
||||
bb_error_msg("config error '%s' in '%s'", buf, filename);
|
||||
} /* while (fgets) */
|
||||
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
@@ -1527,11 +1539,6 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
|
||||
send_headers_and_exit(HTTP_NOT_FOUND);
|
||||
log_and_exit();
|
||||
}
|
||||
|
||||
if (DEBUG)
|
||||
bb_error_msg("sending file '%s' content-type: %s",
|
||||
url, found_mime_type);
|
||||
|
||||
/* If you want to know about EPIPE below
|
||||
* (happens if you abort downloads from local httpd): */
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
@@ -1559,6 +1566,11 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (DEBUG)
|
||||
bb_error_msg("sending file '%s' content-type: %s",
|
||||
url, found_mime_type);
|
||||
|
||||
#if ENABLE_FEATURE_HTTPD_RANGES
|
||||
if (what == SEND_BODY)
|
||||
range_start = 0; /* err pages and ranges don't mix */
|
||||
@@ -2031,8 +2043,8 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
|
||||
/* We are done reading headers, disable peer timeout */
|
||||
alarm(0);
|
||||
|
||||
if (strcmp(bb_basename(urlcopy), httpd_conf) == 0 || !ip_allowed) {
|
||||
/* protect listing [/path]/httpd_conf or IP deny */
|
||||
if (strcmp(bb_basename(urlcopy), HTTPD_CONF) == 0 || !ip_allowed) {
|
||||
/* protect listing [/path]/httpd.conf or IP deny */
|
||||
send_headers_and_exit(HTTP_FORBIDDEN);
|
||||
}
|
||||
|
||||
@@ -2074,7 +2086,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
|
||||
header_ptr += 2;
|
||||
write(proxy_fd, header_buf, header_ptr - header_buf);
|
||||
free(header_buf); /* on the order of 8k, free it */
|
||||
/* cgi_io_loop_and_exit needs to have two disctinct fds */
|
||||
/* cgi_io_loop_and_exit needs to have two distinct fds */
|
||||
cgi_io_loop_and_exit(proxy_fd, dup(proxy_fd), length);
|
||||
}
|
||||
#endif
|
||||
@@ -2089,8 +2101,12 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
|
||||
}
|
||||
send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (urlp[-1] == '/')
|
||||
strcpy(urlp, index_page);
|
||||
if (stat(tptr, &sb) == 0) {
|
||||
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
|
||||
{
|
||||
char *suffix = strrchr(tptr, '.');
|
||||
if (suffix) {
|
||||
Htaccess *cur;
|
||||
@@ -2100,16 +2116,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (prequest != request_GET && prequest != request_HEAD) {
|
||||
send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
|
||||
}
|
||||
#endif /* FEATURE_HTTPD_CGI */
|
||||
|
||||
if (urlp[-1] == '/')
|
||||
strcpy(urlp, index_page);
|
||||
if (stat(tptr, &sb) == 0) {
|
||||
file_size = sb.st_size;
|
||||
last_mod = sb.st_mtime;
|
||||
}
|
||||
@@ -2123,19 +2130,18 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
|
||||
send_cgi_and_exit("/cgi-bin/index.cgi", prequest, length, cookie, content_type);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/* else {
|
||||
* fall through to send_file, it errors out if open fails
|
||||
* }
|
||||
*/
|
||||
/* else fall through to send_file, it errors out if open fails: */
|
||||
|
||||
if (prequest != request_GET && prequest != request_HEAD) {
|
||||
/* POST for files does not make sense */
|
||||
send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
|
||||
}
|
||||
send_file_and_exit(tptr,
|
||||
#if ENABLE_FEATURE_HTTPD_CGI
|
||||
(prequest != request_HEAD ? SEND_HEADERS_AND_BODY : SEND_HEADERS)
|
||||
#else
|
||||
SEND_HEADERS_AND_BODY
|
||||
#endif
|
||||
);
|
||||
#else
|
||||
send_file_and_exit(tptr, SEND_HEADERS_AND_BODY);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -2245,7 +2251,7 @@ static void mini_httpd_inetd(void)
|
||||
|
||||
static void sighup_handler(int sig UNUSED_PARAM)
|
||||
{
|
||||
parse_conf(default_path_httpd_conf, SIGNALED_PARSE);
|
||||
parse_conf(DEFAULT_PATH_HTTPD_CONF, SIGNALED_PARSE);
|
||||
}
|
||||
|
||||
enum {
|
||||
@@ -2304,7 +2310,7 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
|
||||
USE_FEATURE_HTTPD_AUTH_MD5("m:")
|
||||
USE_FEATURE_HTTPD_SETUID("u:")
|
||||
"p:ifv",
|
||||
&configFile, &url_for_decode, &home_httpd
|
||||
&opt_c_configFile, &url_for_decode, &home_httpd
|
||||
USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
|
||||
USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
|
||||
USE_FEATURE_HTTPD_AUTH_MD5(, &pass)
|
||||
@@ -2375,7 +2381,7 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
|
||||
}
|
||||
#endif
|
||||
|
||||
parse_conf(default_path_httpd_conf, FIRST_PARSE);
|
||||
parse_conf(DEFAULT_PATH_HTTPD_CONF, FIRST_PARSE);
|
||||
if (!(opt & OPT_INETD))
|
||||
signal(SIGHUP, sighup_handler);
|
||||
|
||||
|
||||
+31
-11
@@ -199,9 +199,17 @@ static size_t iac_safe_write(int fd, const char *buf, size_t count)
|
||||
return total + rc;
|
||||
}
|
||||
|
||||
/* Must match getopt32 string */
|
||||
enum {
|
||||
OPT_WATCHCHILD = (1 << 2), /* -K */
|
||||
OPT_INETD = (1 << 3) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -i */
|
||||
OPT_PORT = (1 << 4) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -p */
|
||||
OPT_FOREGROUND = (1 << 6) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -F */
|
||||
};
|
||||
|
||||
static struct tsession *
|
||||
make_new_session(
|
||||
USE_FEATURE_TELNETD_STANDALONE(int sock)
|
||||
USE_FEATURE_TELNETD_STANDALONE(int master_fd, int sock)
|
||||
SKIP_FEATURE_TELNETD_STANDALONE(void)
|
||||
) {
|
||||
const char *login_argv[2];
|
||||
@@ -288,9 +296,29 @@ make_new_session(
|
||||
/* Restore default signal handling ASAP */
|
||||
bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
|
||||
|
||||
#if ENABLE_FEATURE_TELNETD_STANDALONE
|
||||
if (!(option_mask32 & OPT_INETD)) {
|
||||
struct tsession *tp = sessions;
|
||||
while (tp) {
|
||||
close(tp->ptyfd);
|
||||
close(tp->sockfd_read);
|
||||
/* sockfd_write == sockfd_read for standalone telnetd */
|
||||
/*close(tp->sockfd_write);*/
|
||||
tp = tp->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Make new session and process group */
|
||||
setsid();
|
||||
|
||||
close(fd);
|
||||
#if ENABLE_FEATURE_TELNETD_STANDALONE
|
||||
close(sock);
|
||||
if (master_fd >= 0)
|
||||
close(master_fd);
|
||||
#endif
|
||||
|
||||
/* Open the child's side of the tty. */
|
||||
/* NB: setsid() disconnects from any previous ctty's. Therefore
|
||||
* we must open child's side of the tty AFTER setsid! */
|
||||
@@ -329,14 +357,6 @@ make_new_session(
|
||||
_exit(EXIT_FAILURE); /*bb_perror_msg_and_die("execv %s", loginpath);*/
|
||||
}
|
||||
|
||||
/* Must match getopt32 string */
|
||||
enum {
|
||||
OPT_WATCHCHILD = (1 << 2), /* -K */
|
||||
OPT_INETD = (1 << 3) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -i */
|
||||
OPT_PORT = (1 << 4) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -p */
|
||||
OPT_FOREGROUND = (1 << 6) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -F */
|
||||
};
|
||||
|
||||
#if ENABLE_FEATURE_TELNETD_STANDALONE
|
||||
|
||||
static void
|
||||
@@ -465,7 +485,7 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
|
||||
|
||||
#if ENABLE_FEATURE_TELNETD_STANDALONE
|
||||
if (IS_INETD) {
|
||||
sessions = make_new_session(0);
|
||||
sessions = make_new_session(-1, 0);
|
||||
if (!sessions) /* pty opening or vfork problem, exit */
|
||||
return 1; /* make_new_session prints error message */
|
||||
} else {
|
||||
@@ -553,7 +573,7 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (fd < 0)
|
||||
goto again;
|
||||
/* Create a new session and link it into our active list */
|
||||
new_ts = make_new_session(fd);
|
||||
new_ts = make_new_session(master_fd, fd);
|
||||
if (new_ts) {
|
||||
new_ts->next = sessions;
|
||||
sessions = new_ts;
|
||||
|
||||
@@ -420,7 +420,7 @@ void FAST_FUNC read_leases(const char *file)
|
||||
continue;
|
||||
/* NB: add_lease takes "relative time", IOW,
|
||||
* lease duration, not lease deadline. */
|
||||
if (!(add_lease(lease.chaddr, lease.yiaddr, expires, lease.hostname))) {
|
||||
if (!(add_lease(lease.chaddr, lease.yiaddr, expires, NULL /* was lease.hostname. bug in add_lease, disabled */ ))) {
|
||||
bb_error_msg("too many leases while loading %s", file);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -63,7 +63,8 @@ struct dhcpOfferedAddr* FAST_FUNC add_lease(
|
||||
if (oldest) {
|
||||
oldest->hostname[0] = '\0';
|
||||
if (hostname) {
|
||||
hostname_length = hostname[-1]; /* look at option size byte */
|
||||
/* option size byte, + 1 for NUL */
|
||||
hostname_length = hostname[-1] + 1;
|
||||
if (hostname_length > sizeof(oldest->hostname))
|
||||
hostname_length = sizeof(oldest->hostname);
|
||||
hostname = (uint8_t*) safe_strncpy((char*)oldest->hostname, (char*)hostname, hostname_length);
|
||||
|
||||
+4
-4
@@ -214,11 +214,11 @@ static int sysctl_handle_preload_file(const char *filename)
|
||||
// (but _whitespace_ from ends should be trimmed first (and we do it right))
|
||||
//TODO: "var==1" is mishandled (must use "=1" as a value, but uses "1")
|
||||
while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) {
|
||||
char *tp;
|
||||
sysctl_dots_to_slashes(token[0]);
|
||||
/* Save ~4 bytes by using parser internals */
|
||||
/* parser->line is big enough for sprintf */
|
||||
sprintf(parser->line, "%s=%s", token[0], token[1]);
|
||||
sysctl_act_recursive(parser->line);
|
||||
tp = xasprintf("%s=%s", token[0], token[1]);
|
||||
sysctl_act_recursive(tp);
|
||||
free(tp);
|
||||
}
|
||||
if (ENABLE_FEATURE_CLEAN_UP)
|
||||
config_close(parser);
|
||||
|
||||
+4
-3
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.14.0
|
||||
# Wed Apr 15 04:12:17 2009
|
||||
# Busybox version: 1.14.1
|
||||
# Wed May 27 18:05:31 2009
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@@ -579,7 +579,7 @@ CONFIG_DEVMEM=y
|
||||
CONFIG_EJECT=y
|
||||
CONFIG_FEATURE_EJECT_SCSI=y
|
||||
CONFIG_FBSPLASH=y
|
||||
CONFIG_FLASH_ERASEALL=y
|
||||
# CONFIG_FLASH_ERASEALL is not set
|
||||
CONFIG_IONICE=y
|
||||
# CONFIG_INOTIFYD is not set
|
||||
CONFIG_LAST=y
|
||||
@@ -859,6 +859,7 @@ CONFIG_HUSH_IF=y
|
||||
CONFIG_HUSH_LOOPS=y
|
||||
CONFIG_HUSH_CASE=y
|
||||
CONFIG_HUSH_FUNCTIONS=y
|
||||
CONFIG_HUSH_EXPORT_N=y
|
||||
# CONFIG_LASH is not set
|
||||
CONFIG_MSH=y
|
||||
|
||||
|
||||
@@ -99,6 +99,11 @@ else
|
||||
fi
|
||||
)`
|
||||
|
||||
# The --gc-sections option is not supported by older versions of ld
|
||||
if test -n "$GC_SECTIONS"; then
|
||||
GC_SECTIONS=`check_cc "$GC_SECTIONS" ""`
|
||||
fi
|
||||
|
||||
# Sanitize lib list (dups, extra spaces etc)
|
||||
LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
|
||||
|
||||
|
||||
@@ -232,6 +232,13 @@ config HUSH_FUNCTIONS
|
||||
help
|
||||
Enable support for shell functions in hush. +800 bytes.
|
||||
|
||||
config HUSH_EXPORT_N
|
||||
bool "Support export '-n' option"
|
||||
default n
|
||||
depends on HUSH
|
||||
help
|
||||
Enable support for export '-n' option in hush. It is a bash extension.
|
||||
|
||||
config LASH
|
||||
bool "lash (deprecated: aliased to hush)"
|
||||
default n
|
||||
|
||||
+3
-2
@@ -5786,7 +5786,7 @@ argstr(char *p, int flag, struct strlist *var_str_list)
|
||||
};
|
||||
const char *reject = spclchars;
|
||||
int c;
|
||||
int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */
|
||||
int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */
|
||||
int breakall = flag & EXP_WORD;
|
||||
int inquotes;
|
||||
size_t length;
|
||||
@@ -11909,7 +11909,8 @@ find_dot_file(char *name)
|
||||
*/
|
||||
return fullname;
|
||||
}
|
||||
stunalloc(fullname);
|
||||
if (fullname != name)
|
||||
stunalloc(fullname);
|
||||
}
|
||||
|
||||
/* not found in the PATH */
|
||||
|
||||
+1131
-731
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,9 @@
|
||||
a\nb\nc\n
|
||||
a
|
||||
b
|
||||
c
|
||||
a\nb\nc\n
|
||||
a
|
||||
b
|
||||
c
|
||||
Done
|
||||
Executable
+7
@@ -0,0 +1,7 @@
|
||||
v="a\nb\nc\n"
|
||||
echo "$v"
|
||||
printf "$v"
|
||||
v='a\nb\nc\n'
|
||||
echo "$v"
|
||||
printf "$v"
|
||||
echo Done
|
||||
@@ -1,5 +1,4 @@
|
||||
hush: syntax error: unterminated ${name}
|
||||
hush: syntax error: unterminated ${name}
|
||||
0
|
||||
0
|
||||
_
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# do all of these in subshells since it's supposed to error out
|
||||
|
||||
# first try some invalid patterns
|
||||
"$THIS_SH" -c 'echo ${?}'
|
||||
#"$THIS_SH" -c 'echo ${?}' -- this is valid as it's the same as $?
|
||||
"$THIS_SH" -c 'echo ${:?}'
|
||||
|
||||
# then some funky ones
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
http://busybox.net
|
||||
http://busybox.net_abc
|
||||
1
|
||||
1
|
||||
1 1
|
||||
1 1
|
||||
@@ -4,6 +4,6 @@ echo $URL
|
||||
echo ${URL}_abc
|
||||
|
||||
true
|
||||
false; echo $?
|
||||
false; echo $? ${?}
|
||||
true
|
||||
{ false; echo $?; }
|
||||
{ false; echo $? ${?}; }
|
||||
@@ -1,3 +1,2 @@
|
||||
hush: syntax error: unterminated ${name}
|
||||
hush: syntax error: unterminated ${name}
|
||||
hush: syntax error: unterminated ${name}
|
||||
@@ -1,4 +1,4 @@
|
||||
# reject invalid vars
|
||||
"$THIS_SH" -c 'echo ${1q}'
|
||||
"$THIS_SH" -c 'echo ${&}'
|
||||
"$THIS_SH" -c 'echo ${$}'
|
||||
#"$THIS_SH" -c 'echo ${$}' -- this is valid as it's the same as $$
|
||||
@@ -1,4 +1,4 @@
|
||||
[ -n "$d" ] || d=..
|
||||
ls -1 "$d" > logfile.gnu
|
||||
busybox ls -1 "$d" > logfile.bb
|
||||
cmp logfile.gnu logfile.bb
|
||||
LC_ALL=C ls -1 "$d" > logfile.gnu
|
||||
LC_ALL=C busybox ls -1 "$d" > logfile.bb
|
||||
diff -ubw logfile.gnu logfile.bb
|
||||
@@ -1,4 +1,4 @@
|
||||
[ -n "$d" ] || d=..
|
||||
ls -h "$d" > logfile.gnu
|
||||
busybox ls -h "$d" > logfile.bb
|
||||
cmp logfile.gnu logfile.bb
|
||||
LC_ALL=C ls -h "$d" > logfile.gnu
|
||||
LC_ALL=C busybox ls -h "$d" > logfile.bb
|
||||
diff -ubw logfile.gnu logfile.bb
|
||||
@@ -1,4 +1,4 @@
|
||||
[ -n "$d" ] || d=..
|
||||
LC_ALL=C ls -l "$d" > logfile.gnu
|
||||
busybox ls -l "$d" > logfile.bb
|
||||
diff -w logfile.gnu logfile.bb
|
||||
LC_ALL=C busybox ls -l "$d" > logfile.bb
|
||||
diff -ubw logfile.gnu logfile.bb
|
||||
@@ -1,4 +1,4 @@
|
||||
[ -n "$d" ] || d=..
|
||||
LC_ALL=C ls -1s "$d" > logfile.gnu
|
||||
busybox ls -1s "$d" > logfile.bb
|
||||
cmp logfile.gnu logfile.bb
|
||||
LC_ALL=C busybox ls -1s "$d" > logfile.bb
|
||||
diff -ubw logfile.gnu logfile.bb
|
||||
@@ -21,6 +21,11 @@ testing "test '': should be false (1)" \
|
||||
"1\n" \
|
||||
"" ""
|
||||
|
||||
testing "test !: should be true (0)" \
|
||||
"busybox test !; echo \$?" \
|
||||
"0\n" \
|
||||
"" ""
|
||||
|
||||
testing "test a: should be true (0)" \
|
||||
"busybox test a; echo \$?" \
|
||||
"0\n" \
|
||||
@@ -51,6 +56,11 @@ testing "test -lt = -gt: should be false (1)" \
|
||||
"1\n" \
|
||||
"" ""
|
||||
|
||||
testing "test a -a !: should be true (0)" \
|
||||
"busybox test a -a !; echo \$?" \
|
||||
"0\n" \
|
||||
"" ""
|
||||
|
||||
testing "test -f = a -o b: should be true (0)" \
|
||||
"busybox test -f = a -o b; echo \$?" \
|
||||
"0\n" \
|
||||
|
||||
+2
-2
@@ -78,8 +78,8 @@ int acpid_main(int argc, char **argv)
|
||||
// goto configuration directory
|
||||
xchdir(opt_conf);
|
||||
|
||||
// // setup signals
|
||||
// bb_signals(BB_FATAL_SIGS, record_signo);
|
||||
// prevent zombies
|
||||
signal(SIGCHLD, SIG_IGN);
|
||||
|
||||
// no explicit evdev files given? -> use proc event interface
|
||||
if (!*argv) {
|
||||
|
||||
+2
-1
@@ -181,7 +181,8 @@ static void make_device(char *path, int delete)
|
||||
* the rest of fields unless keep_matching == 1 */
|
||||
|
||||
/* 2nd field: uid:gid - device ownership */
|
||||
parse_chown_usergroup_or_die(&ugid, tokens[1]);
|
||||
if (get_uidgid(&ugid, tokens[1], 1) == 0)
|
||||
bb_error_msg("unknown user/group %s", tokens[1]);
|
||||
|
||||
/* 3rd field: mode - device permissions */
|
||||
mode = strtoul(tokens[2], NULL, 8);
|
||||
|
||||
@@ -624,7 +624,6 @@ static void setup_tables(void)
|
||||
int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
struct mntent *mp;
|
||||
unsigned opt;
|
||||
char *tmp;
|
||||
struct stat statbuf;
|
||||
@@ -683,11 +682,8 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
|
||||
G.total_blocks = 65535;
|
||||
|
||||
/* Check if it is mounted */
|
||||
mp = find_mount_point(G.device_name, NULL);
|
||||
if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0)
|
||||
bb_error_msg_and_die("%s is mounted on %s; "
|
||||
"refusing to make a filesystem",
|
||||
G.device_name, mp->mnt_dir);
|
||||
if (find_mount_point(G.device_name))
|
||||
bb_error_msg_and_die("can't format mounted filesystem");
|
||||
|
||||
xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
|
||||
if (fstat(dev_fd, &statbuf) < 0)
|
||||
|
||||
@@ -273,10 +273,10 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
|
||||
device_num == 0x0d00 || // xd
|
||||
device_num == 0x1600 ) // hdc, hdd
|
||||
)
|
||||
bb_error_msg_and_die("Will not try to make filesystem on full-disk device (use -I if wanted)");
|
||||
bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)");
|
||||
// can't work on mounted filesystems
|
||||
if (find_mount_point(device_name, NULL))
|
||||
bb_error_msg_and_die("Can't format mounted filesystem");
|
||||
if (find_mount_point(device_name))
|
||||
bb_error_msg_and_die("can't format mounted filesystem");
|
||||
#endif
|
||||
// get true sector size
|
||||
// (parameter must be int*, not long* or size_t*)
|
||||
|
||||
Reference in new issue
Block a user