Merge branch 'for-2010.08' of git://git.busybox.net/~tpetazzoni/git/buildroot

diff -urpN busybox-1.17.1/editors/sed.c busybox-1.17.1-sed/editors/sed.c

--- busybox-1.17.1/editors/sed.c	2010-07-06 04:25:53.000000000 +0200

+++ busybox-1.17.1-sed/editors/sed.c	2010-08-01 04:15:39.000000000 +0200

@@ -61,6 +61,10 @@

 #include "libbb.h"

 #include "xregex.h"

+enum {

+	OPT_in_place = 1 << 0,

+};

+

 /* Each sed command turns into one of these structures. */

 typedef struct sed_cmd_s {

 	/* Ordered by alignment requirements: currently 36 bytes on x86 */

@@ -938,8 +942,11 @@ static void process_files(void)

 		if (matched) {

 			/* once matched, "n,xxx" range is dead, disabling it */

-			if (sed_cmd->beg_line > 0)

+			if (sed_cmd->beg_line > 0

+			 && !(option_mask32 & OPT_in_place) /* but not for -i */

+			) {

 				sed_cmd->beg_line = -2;

+			}

 			sed_cmd->in_match = !(

 				/* has the ending line come, or is this a single address command? */

 				(sed_cmd->end_line ?

@@ -1270,9 +1277,6 @@ static void add_cmd_block(char *cmdstr)

 int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

 int sed_main(int argc UNUSED_PARAM, char **argv)

 {

-	enum {

-		OPT_in_place = 1 << 0,

-	};

 	unsigned opt;

 	llist_t *opt_e, *opt_f;

 	int status = EXIT_SUCCESS;

@@ -1292,6 +1296,7 @@ int sed_main(int argc UNUSED_PARAM, char

 	opt_e = opt_f = NULL;

 	opt_complementary = "e::f::" /* can occur multiple times */

 	                    "nn"; /* count -n */

+	/* -i must be first, to match OPT_in_place definition */

 	opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,

 			    &G.be_quiet); /* counter for -n */

 	//argc -= optind;

diff -urpN busybox-1.17.1/testsuite/sed.tests busybox-1.17.1-sed/testsuite/sed.tests

--- busybox-1.17.1/testsuite/sed.tests	2010-07-06 04:25:54.000000000 +0200

+++ busybox-1.17.1-sed/testsuite/sed.tests	2010-08-01 04:19:26.000000000 +0200

@@ -270,11 +270,16 @@ testing "sed a cmd ended by double backs

 	| two \\

 '

-# fisrt three lines are deleted; 4th line is matched and printed by "2,3" and by "4" ranges

+# first three lines are deleted; 4th line is matched and printed by "2,3" and by "4" ranges

 testing "sed with N skipping lines past ranges on next cmds" \

 	"sed -n '1{N;N;d};1p;2,3p;3p;4p'" \

 	"4\n4\n" "" "1\n2\n3\n4\n"

+testing "sed -i with address modifies all files, not only first" \

+	"cp input input2; sed -i -e '1s/foo/bar/' input input2 && cat input input2; rm input2" \

+	"bar\nbar\n" "foo\n" ""

+

+

 # testing "description" "arguments" "result" "infile" "stdin"

 exit $FAILCOUNT

+&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD"

+echo "Bug detected: $?"

+}

diff -urpN busybox-1.17.1/shell/shell_common.c busybox-1.17.1-shell/shell/shell_common.c

--- busybox-1.17.1/shell/shell_common.c	2010-07-06 04:25:54.000000000 +0200

+++ busybox-1.17.1-shell/shell/shell_common.c	2010-07-27 08:41:43.000000000 +0200

@@ -428,9 +428,14 @@ shell_builtin_ulimit(char **argv)

 						val <<= l->factor_shift;

 					}

 //bb_error_msg("opt %c val_str:'%s' val:%lld", opt_char, val_str, (long long)val);

+					/* from man bash: "If neither -H nor -S

+					 * is specified, both the soft and hard

+					 * limits are set. */

+					if (!opts)

+						opts = OPT_hard + OPT_soft;

 					if (opts & OPT_hard)

 						limit.rlim_max = val;

-					if ((opts & OPT_soft) || opts == 0)

+					if (opts & OPT_soft)

 						limit.rlim_cur = val;

 //bb_error_msg("setrlimit(%d, %lld, %lld)", l->cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);

 					if (setrlimit(l->cmd, &limit) < 0) {

config BR2_PACKAGE_CGILUA

	bool "cgilua"

	depends on BR2_LARGEFILE

	select BR2_PACKAGE_LUA_SHARED_LIBRARY

	select BR2_PACKAGE_LUAFILESYSTEM

	help

	  and manipulating input data from Web forms.

	  http://luaforge.net/projects/cgilua/

comment "cgilua requires a toolchain with LARGEFILE support"

	depends on !BR2_LARGEFILE

	touch $@

$(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB)

	ls -l $(IMAGEMAGICK_LIB) >> datefile

	$(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate

	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/animate

	touch $@

config BR2_PACKAGE_INTLTOOL

       bool "intltool"

       # Hide from configuration as we only support the host package

       # for the moment

       depends on BR2_HOST_ONLY

       help

         Utility scripts for internationalizing XML