ash: move hashvar() calls into findvar()

dash has accepted a patch to remove the first argument of findvar().
It's commit e85e972 (var: move hashvar() calls into findvar()).

Apply the same change to BusyBox ash.

function                                             old     new   delta
findvar                                               35      40      +5
mklocal                                              268     261      -7
exportcmd                                            164     157      -7
setvareq                                             319     310      -9
lookupvar                                            150     141      -9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/4 up/down: 5/-32)             Total: -27 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

AUTHORS

@@ -181,3 +181,6 @@ Jie Zhang <jie.zhang@analog.com>
 
 Maxime Coste <mawww@kakoune.org>
     paste implementation
+
+Roger Knecht <rknecht@pm.me>
+    tree

Config.in

@@ -108,6 +108,17 @@ config LFS
 	programs that can benefit from large file support include dd, gzip,
 	cp, mount, tar.
 
+config TIME64
+	bool "Support 64bit wide time types"
+	default y
+	depends on LFS
+	help
+	Make times later than 2038 representable for several libc syscalls
+	(stat, clk_gettime etc.). Note this switch is specific to glibc
+	and has no effect on platforms that already use 64bit wide time types
+	(i.e. all 64bit archs and some selected 32bit archs (currently riscv
+	and x32)).
+
 config PAM
 	bool "Support PAM (Pluggable Authentication Modules)"
 	default n

Makefile

@@ -1,7 +1,7 @@
 VERSION = 1
-PATCHLEVEL = 34
+PATCHLEVEL = 37
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = .git
 NAME = Unnamed
 
 # *DOCUMENTATION*
@@ -967,6 +967,7 @@ endif # CONFIG_MODULES
 # Directories & files removed with 'make clean'
 CLEAN_DIRS  += $(MODVERDIR) _install 0_lib
 CLEAN_FILES +=	busybox busybox_unstripped* busybox.links \
+		busybox*.suid busybox*.nosuid \
                 System.map .kernelrelease \
                 .tmp_kallsyms* .tmp_version .tmp_busybox* .tmp_System.map
 
@@ -1301,14 +1302,6 @@ quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN   $(wildcard $(rm-dirs)))
 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files)))
       cmd_rmfiles = rm -f $(rm-files)
 
-
-a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \
-	  $(NOSTDINC_FLAGS) $(CPPFLAGS) \
-	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
-
-quiet_cmd_as_o_S = AS      $@
-cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
-
 # read all saved command lines
 
 targets := $(wildcard $(sort $(targets)))

Makefile.flags

@@ -15,6 +15,7 @@ CPPFLAGS += \
 	-include include/autoconf.h \
 	-D_GNU_SOURCE -DNDEBUG \
 	$(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
+	$(if $(CONFIG_TIME64),-D_TIME_BITS=64) \
 	-DBB_VER=$(squote)$(quote)$(BB_VER)$(quote)$(squote)
 
 CFLAGS += $(call cc-option,-Wall,)
@@ -47,7 +48,7 @@ endif
 # gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action()
 CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition)
 
-ifneq ($(CC),clang)
+ifneq ($(lastword $(subst -, ,$(CC))),clang)
 # "clang-9: warning: optimization flag '-finline-limit=0' is not supported
 CFLAGS += $(call cc-option,-finline-limit=0,)
 endif
@@ -65,7 +66,7 @@ CFLAGS += $(call cc-option,-static-libgcc,)
 endif
 
 CFLAGS += $(call cc-option,-falign-functions=1,)
-ifneq ($(CC),clang)
+ifneq ($(lastword $(subst -, ,$(CC))),clang)
 # "clang-9: warning: optimization flag '-falign-jumps=1' is not supported" (and same for other two)
 CFLAGS += $(call cc-option,-falign-jumps=1 -falign-labels=1 -falign-loops=1,)
 endif
@@ -78,7 +79,7 @@ CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,)
 CFLAGS += $(call cc-option,-fno-builtin-printf,)
 
 # clang-9 does not like "str" + N and "if (CONFIG_ITEM && cond)" constructs
-ifeq ($(CC),clang)
+ifeq ($(lastword $(subst -, ,$(CC))),clang)
 CFLAGS += $(call cc-option,-Wno-string-plus-int -Wno-constant-logical-operand)
 endif
 
@@ -87,14 +88,14 @@ endif
 #CFLAGS += $(call cc-option,-Wconversion,)
 
 ifneq ($(CONFIG_DEBUG),y)
-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+CFLAGS += $(call cc-option,-Oz,$(call cc-option,-Os,$(call cc-option,-O2,)))
 else
 CFLAGS += $(call cc-option,-g,)
 #CFLAGS += "-D_FORTIFY_SOURCE=2"
 ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
 CFLAGS += $(call cc-option,-O0,)
 else
-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+CFLAGS += $(call cc-option,-Oz,$(call cc-option,-Os,$(call cc-option,-O2,)))
 endif
 endif
 ifeq ($(CONFIG_DEBUG_SANITIZE),y)
@@ -151,8 +152,8 @@ LDLIBS += m
 # gcc-4.2.1 fails if we try to feed C source on stdin:
 #  echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc -
 # fall back to using a temp file:
-CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c)
-RT_AVAILABLE    := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) -lrt    -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c)
+CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -lcrypt -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c)
+RT_AVAILABLE    := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -lrt    -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c)
 ifeq ($(CRYPT_AVAILABLE),y)
 LDLIBS += crypt
 endif
@@ -187,6 +188,9 @@ ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
 ifneq (,$(findstring linux,$(shell $(CC) $(CFLAGS) -dumpmachine)))
 LDLIBS += resolv
 endif
+ifneq (,$(findstring gnu,$(shell $(CC) $(CFLAGS) -dumpmachine)))
+LDLIBS += resolv
+endif
 endif
 
 ifeq ($(CONFIG_EFENCE),y)

TODO

@@ -222,8 +222,6 @@ Minor stuff:
 ---
   unify progress_meter. wget, flash_eraseall, pipe_progress, fbsplash, setfiles.
 ---
-  support start-stop-daemon -d <chdir-path>
----
 
 (TODO list after discussion 11.05.2009)
 

applets/individual.c

@@ -20,5 +20,5 @@ int main(int argc, char **argv)
 void bb_show_usage(void)
 {
 	fputs_stdout(APPLET_full_usage "\n");
-	exit(EXIT_FAILURE);
+	exit_FAILURE();
 }

archival/ar.c

@@ -196,9 +196,10 @@ static int write_ar_archive(archive_handle_t *handle)
 
 static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
 {
-	const char *mode = bb_mode_string(file_header->mode);
+	char mode[12];
 	char *mtime;
 
+	bb_mode_string(mode, file_header->mode);
 	mtime = ctime(&file_header->mtime);
 	mtime[16] = ' ';
 	memmove(&mtime[17], &mtime[20], 4);

archival/bbunzip.c

@@ -415,7 +415,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config BUNZIP2
-//config:	bool "bunzip2 (8.7 kb)"
+//config:	bool "bunzip2 (9.1 kb)"
 //config:	default y
 //config:	select FEATURE_BZIP2_DECOMPRESS
 //config:	help
@@ -429,7 +429,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //config:	should probably say N here.
 //config:
 //config:config BZCAT
-//config:	bool "bzcat (8.7 kb)"
+//config:	bool "bzcat (9 kb)"
 //config:	default y
 //config:	select FEATURE_BZIP2_DECOMPRESS
 //config:	help
@@ -485,7 +485,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNLZMA
-//config:	bool "unlzma (7.5 kb)"
+//config:	bool "unlzma (7.8 kb)"
 //config:	default y
 //config:	help
 //config:	unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -494,7 +494,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //config:	compressors.
 //config:
 //config:config LZCAT
-//config:	bool "lzcat (7.5 kb)"
+//config:	bool "lzcat (7.8 kb)"
 //config:	default y
 //config:	help
 //config:	Alias to "unlzma -c".

archival/chksum_and_xwrite_tar_header.c

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-$(CONFIG_FEATURE_TAR_CREATE) += chksum_and_xwrite_tar_header.o
+//kbuild:lib-$(CONFIG_SMEMCAP) += chksum_and_xwrite_tar_header.o
+
+#include "libbb.h"
+#include "bb_archive.h"
+
+void FAST_FUNC chksum_and_xwrite_tar_header(int fd, struct tar_header_t *hp)
+{
+	/* POSIX says that checksum is done on unsigned bytes
+	 * (Sun and HP-UX gets it wrong... more details in
+	 * GNU tar source) */
+	const unsigned char *cp;
+	unsigned int chksum, size;
+
+	strcpy(hp->magic, "ustar  ");
+
+	/* Calculate and store the checksum (the sum of all of the bytes of
+	 * the header).  The checksum field must be filled with blanks for the
+	 * calculation.  The checksum field is formatted differently from the
+	 * other fields: it has 6 digits, a NUL, then a space -- rather than
+	 * digits, followed by a NUL like the other fields... */
+	memset(hp->chksum, ' ', sizeof(hp->chksum));
+	cp = (const unsigned char *) hp;
+	chksum = 0;
+	size = sizeof(*hp);
+	do { chksum += *cp++; } while (--size);
+	sprintf(hp->chksum, "%06o", chksum);
+
+	xwrite(fd, hp, sizeof(*hp));
+}

archival/cpio.c

@@ -38,6 +38,20 @@
 //config:	depends on FEATURE_CPIO_O
 //config:	help
 //config:	Passthrough mode. Rarely used.
+//config:
+//config:config FEATURE_CPIO_IGNORE_DEVNO
+//config:	bool "Support --ignore-devno like GNU cpio"
+//config:	default y
+//config:	depends on FEATURE_CPIO_O && LONG_OPTS
+//config:	help
+//config:	Optionally ignore device numbers when creating archives.
+//config:
+//config:config FEATURE_CPIO_RENUMBER_INODES
+//config:	bool "Support --renumber-inodes like GNU cpio"
+//config:	default y
+//config:	depends on FEATURE_CPIO_O && LONG_OPTS
+//config:	help
+//config:	Optionally renumber inodes when creating archives.
 
 //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
 
@@ -48,7 +62,7 @@
 //usage:       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
 //usage:       " [EXTR_FILE]..."
 //usage:#define cpio_full_usage "\n\n"
-//usage:       "Extract (-i) or list (-t) files from a cpio archive"
+//usage:       "Extract (-i) or list (-t) files from a cpio archive on stdin"
 //usage:	IF_FEATURE_CPIO_O(", or"
 //usage:     "\ntake file list from stdin and create an archive (-o)"
 //usage:                IF_FEATURE_CPIO_P(" or copy files (-p)")
@@ -74,7 +88,13 @@
 //usage:     "\n	-F FILE	Input (-t,-i,-p) or output (-o) file"
 //usage:     "\n	-R USER[:GRP]	Set owner of created files"
 //usage:     "\n	-L	Dereference symlinks"
-//usage:     "\n	-0	Input is separated by NULs"
+//usage:     "\n	-0	NUL terminated input"
+//usage:	IF_FEATURE_CPIO_IGNORE_DEVNO(
+//usage:     "\n	--ignore-devno"
+//usage:	)
+//usage:	IF_FEATURE_CPIO_RENUMBER_INODES(
+//usage:     "\n	--renumber-inodes"
+//usage:	)
 
 /* GNU cpio 2.9 --help (abridged):
 
@@ -162,17 +182,22 @@ enum {
 	IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
 	IF_LONG_OPTS(     OPTBIT_QUIET      ,)
 	IF_LONG_OPTS(     OPTBIT_2STDOUT    ,)
+	IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
+	IF_FEATURE_CPIO_RENUMBER_INODES(OPTBIT_RENUMBER_INODES,)
 	OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
 	OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
 	OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
 	OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
 	OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
+	OPT_IGNORE_DEVNO       = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
+	OPT_RENUMBER_INODES    = IF_FEATURE_CPIO_RENUMBER_INODES((1 << OPTBIT_RENUMBER_INODES)) + 0,
 };
 
 #define OPTION_STR "it0uvdmLF:R:"
 
 struct globals {
 	struct bb_uidgid_t owner_ugid;
+	ino_t next_inode;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 void BUG_cpio_globals_too_big(void);
@@ -206,6 +231,9 @@ static NOINLINE int cpio_o(void)
 		struct inodes_s *next;
 		struct name_s *names;
 		struct stat st;
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+		ino_t mapped_inode;
+#endif
 	};
 
 	struct inodes_s *links = NULL;
@@ -260,6 +288,10 @@ static NOINLINE int cpio_o(void)
 						l = xzalloc(sizeof(*l));
 						l->st = st;
 						l->next = links;
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+						if (option_mask32 & OPT_RENUMBER_INODES)
+							l->mapped_inode = ++G.next_inode;
+#endif
 						links = l;
 						break;
 					}
@@ -278,6 +310,11 @@ static NOINLINE int cpio_o(void)
 				free(line);
 				continue;
 			}
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+			else if (option_mask32 & OPT_RENUMBER_INODES) {
+				st.st_ino = ++G.next_inode;
+			}
+#endif
 		} else { /* line == NULL: EOF */
  next_link:
 			if (links) {
@@ -285,6 +322,10 @@ static NOINLINE int cpio_o(void)
 				st = links->st;
 				name = links->names->name;
 				links->names = links->names->next;
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+				if (links->mapped_inode)
+					st.st_ino = links->mapped_inode;
+#endif
 				/* GNU cpio is reported to emit file data
 				 * only for the last instance. Mimic that. */
 				if (links->names == NULL)
@@ -304,6 +345,11 @@ static NOINLINE int cpio_o(void)
 			}
 		}
 
+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
+		if (option_mask32 & OPT_IGNORE_DEVNO)
+			st.st_dev = st.st_rdev = 0;
+#endif
+
 		bytes += printf("070701"
 				"%08X%08X%08X%08X%08X%08X%08X"
 				"%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
@@ -379,6 +425,12 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 		"null\0"         No_argument       "0"
 		"quiet\0"        No_argument       "\xff"
 		"to-stdout\0"    No_argument       "\xfe"
+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
+		"ignore-devno\0" No_argument	   "\xfd"
+#endif
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+		"renumber-inodes\0" No_argument    "\xfc"
+#endif
 		;
 #endif
 
@@ -452,7 +504,6 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 			goto dump;
 		}
 		/* parent */
-		USE_FOR_NOMMU(argv[-optind][0] &= 0x7f); /* undo fork_or_rexec() damage */
 		xchdir(*argv++);
 		close(pp.wr);
 		xmove_fd(pp.rd, STDIN_FILENO);

archival/dpkg.c

@@ -1115,7 +1115,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
 			if (package_edge->type == EDGE_PRE_DEPENDS
 			 || package_edge->type == EDGE_DEPENDS
 			) {
-				int result=1;
+				int result = 1;
 				status_num = 0;
 
 				/* If we are inside an alternative then check

archival/dpkg_deb.c

@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DPKG_DEB
-//config:	bool "dpkg-deb (30 kb)"
+//config:	bool "dpkg-deb (29 kb)"
 //config:	default y
 //config:	select FEATURE_SEAMLESS_GZ
 //config:	help

archival/libarchive/bz/blocksort.c

@@ -107,7 +107,7 @@ void fallbackSimpleSort(uint32_t* fmap,
 #define FALLBACK_QSORT_SMALL_THRESH 10
 #define FALLBACK_QSORT_STACK_SIZE   100
 
-static
+static NOINLINE
 void fallbackQSort3(uint32_t* fmap,
 		uint32_t* eclass,
 		int32_t   loSt,

archival/libarchive/bz/bzlib.c

@@ -99,9 +99,8 @@ void BZ2_bzCompressInit(bz_stream *strm, int blockSize100k)
 	s->ptr   = (uint32_t*)s->arr1;
 	s->arr2  = xmalloc((n + BZ_N_OVERSHOOT) * sizeof(uint32_t));
 	s->block = (uint8_t*)s->arr2;
-	s->ftab  = xmalloc(65537                * sizeof(uint32_t));
 
-	s->crc32table = crc32_filltable(NULL, 1);
+	crc32_filltable(s->crc32table, 1);
 
 	s->state             = BZ_S_INPUT;
 	s->mode              = BZ_M_RUNNING;
@@ -369,8 +368,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
 	s = strm->state;
 	free(s->arr1);
 	free(s->arr2);
-	free(s->ftab);
-	free(s->crc32table);
+	//free(s->ftab);       // made it array member of s
+	//free(s->crc32table); // ditto
 	free(s);
 }
 

archival/libarchive/bz/bzlib_private.h

@@ -134,7 +134,7 @@ typedef struct EState {
 	/* for doing the block sorting */
 	uint32_t *arr1;
 	uint32_t *arr2;
-	uint32_t *ftab;
+	//uint32_t *ftab; //moved into this struct, see below
 
 	uint16_t *quadrant;
 	int32_t  budget;
@@ -160,9 +160,6 @@ typedef struct EState {
 	uint32_t bsBuff;
 	int32_t  bsLive;
 
-	/* guess what */
-	uint32_t *crc32table;
-
 	/* block and combined CRCs */
 	uint32_t blockCRC;
 	uint32_t combinedCRC;
@@ -185,6 +182,12 @@ typedef struct EState {
 
 	uint8_t  len[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
 
+	/* guess what */
+	uint32_t crc32table[256];
+
+	/* for doing the block sorting */
+	uint32_t ftab[65537];
+
 	/* stack-saving measures: these can be local, but they are too big */
 	int32_t  sendMTFValues__code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
 	int32_t  sendMTFValues__rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];

archival/libarchive/decompress_bunzip2.c

@@ -654,7 +654,7 @@ static int read_bunzip(bunzip_data *bd, char *outbuf, int len)
 				/* Subtract the 1 copy we'd output anyway to get extras */
 				--bd->writeCopies;
 			}
-		} /* for(;;) */
+		} /* for (;;) */
 
 		/* Decompression of this input block completed successfully */
 		bd->writeCRC = CRC = ~CRC;

archival/libarchive/get_header_ar.c

@@ -92,8 +92,12 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
 	/* Only size is always present, the rest may be missing in
 	 * long filename pseudo file. Thus we decode the rest
 	 * after dealing with long filename pseudo file.
+	 *
+	 * GNU binutils in deterministic mode hard codes mode to 0644 (NOT
+	 * 0100644). AR archives can only contain files, so force file
+	 * mode.
 	 */
-	typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode));
+	typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode)) | S_IFREG;
 	typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid));
 	typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid));
 	typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date));

archival/libarchive/get_header_tar.c

@@ -147,6 +147,14 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
 #endif
 }
 
+#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+static void die_if_bad_fnamesize(off_t sz)
+{
+	if ((uoff_t)sz > 0xfff) /* more than 4k?! no funny business please */
+		bb_simple_error_msg_and_die("bad archive");
+}
+#endif
+
 char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 {
 	file_header_t *file_header = archive_handle->file_header;
@@ -331,8 +339,6 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 			file_header->name = xstrdup(tar.name);
 	}
 
-	/* Set bits 12-15 of the files mode */
-	/* (typeflag was not trashed because chksum does not use getOctal) */
 	switch (tar_typeflag) {
 	case '1': /* hardlink */
 		/* we mark hardlinks as regular files with zero size and a link name */
@@ -341,7 +347,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 		 * ... For tar archives written by pre POSIX.1-1988
 		 * implementations, the size field usually contains the size of
 		 * the file and needs to be ignored as no data may follow this
-		 * header type.  For POSIX.1- 1988 compliant archives, the size
+		 * header type.  For POSIX.1-1988 compliant archives, the size
 		 * field needs to be 0.  For POSIX.1-2001 compliant archives,
 		 * the size field may be non zero, indicating that file data is
 		 * included in the archive.
@@ -390,6 +396,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 		/* free: paranoia: tar with several consecutive longnames */
 		free(p_longname);
 		/* For paranoia reasons we allocate extra NUL char */
+		die_if_bad_fnamesize(file_header->size);
 		p_longname = xzalloc(file_header->size + 1);
 		/* We read ASCIZ string, including NUL */
 		xread(archive_handle->src_fd, p_longname, file_header->size);
@@ -400,6 +407,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 		goto again;
 	case 'K':
 		free(p_linkname);
+		die_if_bad_fnamesize(file_header->size);
 		p_linkname = xzalloc(file_header->size + 1);
 		xread(archive_handle->src_fd, p_linkname, file_header->size);
 		archive_handle->offset += file_header->size;

archival/libarchive/header_verbose_list.c

@@ -9,6 +9,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 {
 	struct tm tm_time;
 	struct tm *ptm = &tm_time; //localtime(&file_header->mtime);
+	char modestr[12];
 
 #if ENABLE_FEATURE_TAR_UNAME_GNAME
 	char uid[sizeof(int)*3 + 2];
@@ -29,7 +30,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 		group = utoa(file_header->gid);
 	}
 	printf("%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
-		bb_mode_string(file_header->mode),
+		bb_mode_string(modestr, file_header->mode),
 		user,
 		group,
 		file_header->size,
@@ -46,7 +47,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 	localtime_r(&file_header->mtime, ptm);
 
 	printf("%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
-		bb_mode_string(file_header->mode),
+		bb_mode_string(modestr, file_header->mode),
 		(unsigned)file_header->uid,
 		(unsigned)file_header->gid,
 		file_header->size,

archival/libarchive/unxz/xz_dec_stream.c

@@ -545,7 +545,7 @@ static enum xz_ret XZ_FUNC dec_block_header(struct xz_dec *s)
 	return XZ_OK;
 }
 
-static enum xz_ret XZ_FUNC dec_main(struct xz_dec *s, struct xz_buf *b)
+static NOINLINE enum xz_ret XZ_FUNC dec_main(struct xz_dec *s, struct xz_buf *b)
 {
 	enum xz_ret ret;
 

archival/lzop.c

@@ -25,7 +25,7 @@
    "Minimalized" for busybox by Alain Knaff
 */
 //config:config LZOP
-//config:	bool "lzop (12 kb)"
+//config:	bool "lzop (13 kb)"
 //config:	default y
 //config:	help
 //config:	Lzop compression/decompresion.

archival/tar.c

@@ -254,32 +254,6 @@ static void putOctal(char *cp, int len, off_t value)
 }
 #define PUT_OCTAL(a, b) putOctal((a), sizeof(a), (b))
 
-static void chksum_and_xwrite(int fd, struct tar_header_t* hp)
-{
-	/* POSIX says that checksum is done on unsigned bytes
-	 * (Sun and HP-UX gets it wrong... more details in
-	 * GNU tar source) */
-	const unsigned char *cp;
-	int chksum, size;
-
-	strcpy(hp->magic, "ustar  ");
-
-	/* Calculate and store the checksum (i.e., the sum of all of the bytes of
-	 * the header).  The checksum field must be filled with blanks for the
-	 * calculation.  The checksum field is formatted differently from the
-	 * other fields: it has 6 digits, a null, then a space -- rather than
-	 * digits, followed by a null like the other fields... */
-	memset(hp->chksum, ' ', sizeof(hp->chksum));
-	cp = (const unsigned char *) hp;
-	chksum = 0;
-	size = sizeof(*hp);
-	do { chksum += *cp++; } while (--size);
-	putOctal(hp->chksum, sizeof(hp->chksum)-1, chksum);
-
-	/* Now write the header out to disk */
-	xwrite(fd, hp, sizeof(*hp));
-}
-
 # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
 static void writeLongname(int fd, int type, const char *name, int dir)
 {
@@ -310,7 +284,7 @@ static void writeLongname(int fd, int type, const char *name, int dir)
 	/* + dir: account for possible '/' */
 
 	PUT_OCTAL(header.size, size);
-	chksum_and_xwrite(fd, &header);
+	chksum_and_xwrite_tar_header(fd, &header);
 
 	/* Write filename[/] and pad the block. */
 	/* dir=0: writes 'name<NUL>', pads */
@@ -441,8 +415,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
 				header_name, S_ISDIR(statbuf->st_mode));
 # endif
 
-	/* Now write the header out to disk */
-	chksum_and_xwrite(tbInfo->tarFd, &header);
+	chksum_and_xwrite_tar_header(tbInfo->tarFd, &header);
 
 	/* Now do the verbose thing (or not) */
 	if (tbInfo->verboseFlag) {
@@ -648,7 +621,7 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
 		execlp(gzip, gzip, "-f", (char *)0);
 
 		vfork_exec_errno = errno;
-		_exit(EXIT_FAILURE);
+		_exit_FAILURE();
 	}
 
 	/* parent */

archival/unzip.c

@@ -56,7 +56,7 @@
 //kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 
 //usage:#define unzip_trivial_usage
-//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
+//usage:       "[-lnojpqK] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract FILEs from ZIP archive\n"
 //usage:     "\n	-l	List contents (with -q for short form)"
@@ -66,6 +66,7 @@
 //usage:     "\n	-p	Write to stdout"
 //usage:     "\n	-t	Test"
 //usage:     "\n	-q	Quiet"
+//usage:     "\n	-K	Do not clear SUID bit"
 //usage:     "\n	-x FILE	Exclude FILEs"
 //usage:     "\n	-d DIR	Extract into DIR"
 
@@ -118,6 +119,8 @@ typedef union {
 #define FIX_ENDIANNESS_ZIP(zip) \
 do { if (BB_BIG_ENDIAN) { \
 	(zip).fmt.method        = SWAP_LE16((zip).fmt.method      ); \
+	(zip).fmt.modtime       = SWAP_LE16((zip).fmt.modtime     ); \
+	(zip).fmt.moddate       = SWAP_LE16((zip).fmt.moddate     ); \
 	(zip).fmt.crc32         = SWAP_LE32((zip).fmt.crc32       ); \
 	(zip).fmt.cmpsize       = SWAP_LE32((zip).fmt.cmpsize     ); \
 	(zip).fmt.ucmpsize      = SWAP_LE32((zip).fmt.ucmpsize    ); \
@@ -492,6 +495,7 @@ int unzip_main(int argc, char **argv)
 		OPT_l = (1 << 0),
 		OPT_x = (1 << 1),
 		OPT_j = (1 << 2),
+		OPT_K = (1 << 3),
 	};
 	unsigned opts;
 	smallint quiet = 0;
@@ -555,9 +559,14 @@ int unzip_main(int argc, char **argv)
  *    204372                   1 file
  */
 
+//TODO: accept and ignore these?
+// -a	convert to text files with 't' label, -aa: all files
+// -b	do not convert to text - bbox: we don't convert anything
+// -D	skip restoration of timestamps for extracted items - bbox: we don't restore these (yet?)
+// -X	restore user:group ownership
 	opts = 0;
 	/* '-' makes getopt return 1 for non-options */
-	while ((i = getopt(argc, argv, "-d:lnotpqxjv")) != -1) {
+	while ((i = getopt(argc, argv, "-d:lnotpqxjvK")) != -1) {
 		switch (i) {
 		case 'd':  /* Extract to base directory */
 			base_dir = optarg;
@@ -579,6 +588,7 @@ int unzip_main(int argc, char **argv)
 			xmove_fd(xopen("/dev/null", O_WRONLY), STDOUT_FILENO);
 			/*fallthrough*/
 
+// NB: -c extract files to stdout/screen (unlike -p, also prints .zip and file names to stdout)
 		case 'p': /* Extract files to stdout */
 			dst_fd = STDOUT_FILENO;
 			/*fallthrough*/
@@ -600,6 +610,10 @@ int unzip_main(int argc, char **argv)
 			opts |= OPT_j;
 			break;
 
+		case 'K':
+			opts |= OPT_K;
+			break;
+
 		case 1:
 			if (!src_fn) {
 				/* The zip file */
@@ -817,7 +831,10 @@ int unzip_main(int argc, char **argv)
 # endif
 			if ((cdf.fmt.version_made_by >> 8) == 3) {
 				/* This archive is created on Unix */
-				dir_mode = file_mode = (cdf.fmt.external_attributes >> 16);
+				file_mode = (cdf.fmt.external_attributes >> 16);
+				if (!(opts & OPT_K))
+					file_mode &= ~(mode_t)(S_ISUID | S_ISGID);
+				dir_mode = file_mode;
 			}
 		}
 #endif
@@ -842,6 +859,7 @@ int unzip_main(int argc, char **argv)
 		unzip_skip(zip.fmt.extra_len);
 
 		/* Guard against "/abspath", "/../" and similar attacks */
+// NB: UnZip 6.00 has option -: to disable this
 		overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
 
 		/* Filter zip entries */

busybox_ldscript.README.txt

@@ -0,0 +1,47 @@
+/* Add SORT_BY_ALIGNMENT to linker script (found in busybox_unstripped.out):
+##  .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
+##  .data   : { *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*) }
+##  .bss    : { *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*) }
+## This will eliminate most of the padding (~3kb).
+## Hmm, "ld --sort-section alignment" should do it too.
+##
+## There is a ld hack which is meant to decrease disk usage
+## at the cost of more RAM usage (??!!) in standard ld script:
+##  . = ALIGN (0x1000) - ((0x1000 - .) & (0x1000 - 1)); . = DATA_SEGMENT_ALIGN (0x1000, 0x1000);
+## Replace it with:
+##  . = ALIGN (0x1000); . = DATA_SEGMENT_ALIGN (0x1000, 0x1000);
+## to unconditionally align .data to the next page boundary,
+## instead of "next page, plus current offset in this page"
+*/
+
+/* To reduce the number of VMAs each bbox process has,
+## move *(.bss SORT_BY_ALIGNMENT(.bss.*) ...)
+## part from .bss : {...} block to .data : { ... } block.
+## (This usually increases .data section by only one page).
+## Result:
+##
+##    text data  bss     dec    hex filename
+## 1050792  560 7580 1058932 102874 busybox.bss
+## 1050792 8149    0 1058941 10287d busybox.nobss
+##
+## $ exec busybox.bss pmap $$
+## 0000000008048000    1028K r-xp  /path/to/busybox.bss
+## 0000000008149000       8K rw-p  /path/to/busybox.bss
+## 000000000814b000       4K rw-p    [ anon ]  <---- this VMA is eliminated
+## 00000000085f5000       4K ---p  [heap]
+## 00000000085f6000       4K rw-p  [heap]
+## 00000000f7778000       8K rw-p    [ anon ]
+## 00000000f777a000      12K r--p  [vvar]
+## 00000000f777d000       8K r-xp  [vdso]
+## 00000000ff7e9000     132K rw-p  [stack]
+##
+## $ exec busybox.nobss pmap $$
+## 0000000008048000    1028K r-xp  /path/to/busybox.nobss
+## 0000000008149000      12K rw-p  /path/to/busybox.nobss
+## 00000000086f0000       4K ---p  [heap]
+## 00000000086f1000       4K rw-p  [heap]
+## 00000000f7783000       8K rw-p    [ anon ]
+## 00000000f7785000      12K r--p  [vvar]
+## 00000000f7788000       8K r-xp  [vdso]
+## 00000000ffac0000     132K rw-p  [stack]
+*/

configs/TEST_nommu_defconfig

@@ -703,6 +703,7 @@ CONFIG_FEATURE_INETD_RPC=y
 CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_LINK_CAN=y
 CONFIG_FEATURE_IP_ROUTE=y
 CONFIG_FEATURE_IP_TUNNEL=y
 CONFIG_FEATURE_IP_RULE=y

console-tools/chvt.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHVT
-//config:	bool "chvt (2 kb)"
+//config:	bool "chvt (2.2 kb)"
 //config:	default y
 //config:	help
 //config:	This program is used to change to another terminal.

console-tools/clear.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CLEAR
-//config:	bool "clear (tiny)"
+//config:	bool "clear (371 bytes)"
 //config:	default y
 //config:	help
 //config:	This program clears the terminal screen.

console-tools/deallocvt.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DEALLOCVT
-//config:	bool "deallocvt (1.9 kb)"
+//config:	bool "deallocvt (2.2 kb)"
 //config:	default y
 //config:	help
 //config:	This program deallocates unused virtual consoles.

console-tools/dumpkmap.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DUMPKMAP
-//config:	bool "dumpkmap (1.6 kb)"
+//config:	bool "dumpkmap (1.9 kb)"
 //config:	default y
 //config:	help
 //config:	This program dumps the kernel's keyboard translation table to

console-tools/fgconsole.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FGCONSOLE
-//config:	bool "fgconsole (1.5 kb)"
+//config:	bool "fgconsole (1.8 kb)"
 //config:	default y
 //config:	help
 //config:	This program prints active (foreground) console number.

console-tools/kbd_mode.c

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KBD_MODE
-//config:	bool "kbd_mode (4.1 kb)"
+//config:	bool "kbd_mode (4.3 kb)"
 //config:	default y
 //config:	help
 //config:	This program reports and sets keyboard mode.

console-tools/loadfont.c

@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LOADFONT
-//config:	bool "loadfont (5.2 kb)"
+//config:	bool "loadfont (5.4 kb)"
 //config:	default y
 //config:	help
 //config:	This program loads a console font from standard input.

console-tools/loadkmap.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOADKMAP
-//config:	bool "loadkmap (1.8 kb)"
+//config:	bool "loadkmap (2.1 kb)"
 //config:	default y
 //config:	help
 //config:	This program loads a keyboard translation table from

console-tools/openvt.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config OPENVT
-//config:	bool "openvt (7.2 kb)"
+//config:	bool "openvt (7.4 kb)"
 //config:	default y
 //config:	help
 //config:	This program is used to start a command on an unused

console-tools/reset.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RESET
-//config:	bool "reset (345 bytes)"
+//config:	bool "reset (676 bytes)"
 //config:	default y
 //config:	help
 //config:	This program is used to reset the terminal screen, if it
@@ -21,7 +21,7 @@
 //usage:#define reset_trivial_usage
 //usage:       ""
 //usage:#define reset_full_usage "\n\n"
-//usage:       "Reset the screen"
+//usage:       "Reset terminal (ESC codes) and termios (signals, buffering, echo)"
 
 /* "Standard" version of this tool is in ncurses package */
 
@@ -36,7 +36,7 @@ int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-	static const char *const args[] = {
+	static const char *const args[] ALIGN_PTR = {
 		"stty", "sane", NULL
 	};
 

console-tools/resize.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RESIZE
-//config:	bool "resize (903 bytes)"
+//config:	bool "resize (1.2 kb)"
 //config:	default y
 //config:	help
 //config:	This program is used to (re)set the width and height of your current
@@ -45,7 +45,7 @@ static void
 onintr(int sig UNUSED_PARAM)
 {
 	tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
-	_exit(EXIT_FAILURE);
+	_exit_FAILURE();
 }
 
 int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -74,7 +74,19 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 		+ (1 << SIGTERM)
 		+ (1 << SIGALRM)
 		, onintr);
-	tcsetattr(STDERR_FILENO, TCSANOW, &new);
+	/* Users report:
+	 *	The resize command messes up the terminal.
+	 *	In my case it looks like it is hanging and
+	 *	I need to press ctrl-c to get a prompt.
+	 *	Actually the program does not hang but just
+	 *	the terminal is messed up.
+	 * Replaced TCSANOW with TCSAFLUSH:
+	 * "the change occurs after all output written to fd
+	 * has been transmitted, and all input that has been
+	 * received but not read will be discarded before
+	 * the change is made.
+	 */
+	tcsetattr(STDERR_FILENO, TCSAFLUSH, &new);
 
 	/* save_cursor_pos 7
 	 * scroll_whole_screen [r

console-tools/setconsole.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETCONSOLE
-//config:	bool "setconsole (3.6 kb)"
+//config:	bool "setconsole (3.8 kb)"
 //config:	default y
 //config:	help
 //config:	Redirect writes to /dev/console to another device,

console-tools/setkeycodes.c

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETKEYCODES
-//config:	bool "setkeycodes (2.1 kb)"
+//config:	bool "setkeycodes (2.4 kb)"
 //config:	default y
 //config:	help
 //config:	This program loads entries into the kernel's scancode-to-keycode

console-tools/setlogcons.c

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETLOGCONS
-//config:	bool "setlogcons (1.8 kb)"
+//config:	bool "setlogcons (2 kb)"
 //config:	default y
 //config:	help
 //config:	This program redirects the output console of kernel messages.

console-tools/showkey.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SHOWKEY
-//config:	bool "showkey (4.7 kb)"
+//config:	bool "showkey (4.9 kb)"
 //config:	default y
 //config:	help
 //config:	Shows keys pressed.

coreutils/Config.src

@@ -5,10 +5,6 @@
 
 menu "Coreutils"
 
-INSERT
-
-comment "Common options"
-
 config FEATURE_VERBOSE
 	bool "Support verbose options (usually -v) for various applets"
 	default y
@@ -17,6 +13,19 @@ config FEATURE_VERBOSE
 	Also enables long option (--verbose) if it exists.
 	Without this option, -v is accepted but ignored.
 
+comment "Common options for date and touch"
+
+config FEATURE_TIMEZONE
+	bool "Allow timezone in dates"
+	default y
+	depends on DESKTOP
+	help
+	Permit the use of timezones when parsing user-provided data
+	strings, e.g. '1996-04-09 12:45:00 -0500'.
+
+	This requires support for the '%z' extension to strptime() which
+	may not be available in all implementations.
+
 comment "Common options for cp and mv"
 	depends on CP || MV
 
@@ -37,4 +46,6 @@ config FEATURE_HUMAN_READABLE
 	help
 	Allow df, du, and ls to have human readable output.
 
+INSERT
+
 endmenu

coreutils/basename.c

@@ -14,7 +14,7 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 //config:config BASENAME
-//config:	bool "basename (438 bytes)"
+//config:	bool "basename (3.7 kb)"
 //config:	default y
 //config:	help
 //config:	basename is used to strip the directory and suffix from filenames,
@@ -29,9 +29,11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
 
 //usage:#define basename_trivial_usage
-//usage:       "FILE [SUFFIX]"
+//usage:       "FILE [SUFFIX] | -a FILE... | -s SUFFIX FILE..."
 //usage:#define basename_full_usage "\n\n"
-//usage:       "Strip directory path and .SUFFIX from FILE"
+//usage:       "Strip directory path and SUFFIX from FILE\n"
+//usage:     "\n	-a		All arguments are FILEs"
+//usage:     "\n	-s SUFFIX	Remove SUFFIX (implies -a)"
 //usage:
 //usage:#define basename_example_usage
 //usage:       "$ basename /usr/local/bin/foo\n"
@@ -48,31 +50,43 @@
 int basename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int basename_main(int argc UNUSED_PARAM, char **argv)
 {
-	size_t m, n;
-	char *s;
+	unsigned opts;
+	const char *suffix = NULL;
 
-	if (argv[1] && strcmp(argv[1], "--") == 0) {
-		argv++;
-	}
-	if (!argv[1])
-		bb_show_usage();
+	/* '+': stop at first non-option */
+	opts = getopt32(argv, "^+" "as:"
+		"\0" "-1" /* At least one argument */
+		, &suffix
+	);
+	argv += optind;
 
-	/* It should strip slash: /abc/def/ -> def */
-	s = bb_get_last_path_component_strip(*++argv);
+	do {
+		char *s;
+		size_t m;
 
-	m = strlen(s);
-	if (*++argv) {
-		if (argv[1])
-			bb_show_usage();
-		n = strlen(*argv);
-		if ((m > n) && (strcmp(s+m-n, *argv) == 0)) {
-			m -= n;
-			/*s[m] = '\0'; - redundant */
+		/* It should strip slash: /abc/def/ -> def */
+		s = bb_get_last_path_component_strip(*argv++);
+		m = strlen(s);
+		if (!opts) {
+			if (*argv) {
+				suffix = *argv;
+				if (argv[1])
+					bb_show_usage();
+			}
 		}
-	}
+		if (suffix) {
+			size_t n = strlen(suffix);
+			if ((m > n) && (strcmp(s + m - n, suffix) == 0)) {
+				m -= n;
+				/*s[m] = '\0'; - redundant */
+			}
+		}
+		/* puts(s) will do, but we can do without stdio this way: */
+		s[m++] = '\n';
+		/* NB: != is correct here: */
+		if (full_write(STDOUT_FILENO, s, m) != (ssize_t)m)
+			return EXIT_FAILURE;
+	} while (opts && *argv);
 
-	/* puts(s) will do, but we can do without stdio this way: */
-	s[m++] = '\n';
-	/* NB: != is correct here: */
-	return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
+	return EXIT_SUCCESS;
 }

coreutils/cat.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CAT
-//config:	bool "cat (5.6 kb)"
+//config:	bool "cat (5.8 kb)"
 //config:	default y
 //config:	help
 //config:	cat is used to concatenate files and print them to the standard

coreutils/chmod.c

@@ -88,10 +88,12 @@ static int FAST_FUNC fileAction(struct recursive_state *state,
 
 	if (chmod(fileName, newmode) == 0) {
 		if (OPT_VERBOSE
-		 || (OPT_CHANGED && statbuf->st_mode != newmode)
+		 || (OPT_CHANGED
+		     && (statbuf->st_mode & 07777) != (newmode & 07777))
 		) {
+			char modestr[12];
 			printf("mode of '%s' changed to %04o (%s)\n", fileName,
-				newmode & 07777, bb_mode_string(newmode)+1);
+				newmode & 07777, bb_mode_string(modestr, newmode)+1);
 		}
 		return TRUE;
 	}

coreutils/chroot.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHROOT
-//config:	bool "chroot (3.7 kb)"
+//config:	bool "chroot (4 kb)"
 //config:	default y
 //config:	help
 //config:	chroot is used to change the root directory and run a command.

coreutils/cksum.c

@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CKSUM
-//config:	bool "cksum (4.1 kb)"
+//config:	bool "cksum (4.3 kb)"
 //config:	default y
 //config:
 //config:config CRC32
-//config:	bool "crc32 (4.1 kb)"
+//config:	bool "crc32 (4.2 kb)"
 //config:	default y
 
 //                APPLET_NOEXEC:name   main   location        suid_type     help
@@ -39,7 +39,7 @@ int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
 	uint32_t *crc32_table = crc32_filltable(NULL, IS_CKSUM);
-	int exit_code = EXIT_SUCCESS;
+	exitcode_t exit_code = EXIT_SUCCESS;
 
 #if ENABLE_DESKTOP
 	getopt32(argv, ""); /* cksum coreutils 6.9 compat */

coreutils/comm.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config COMM
-//config:	bool "comm (4.2 kb)"
+//config:	bool "comm (4.4 kb)"
 //config:	default y
 //config:	help
 //config:	comm is used to compare two files line by line and return

coreutils/cut.c

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CUT
-//config:	bool "cut (5.8 kb)"
+//config:	bool "cut (6.7 kb)"
 //config:	default y
 //config:	help
 //config:	cut is used to print selected parts of lines from
@@ -167,7 +167,7 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
 					if (!cl_pos && !dcount && !shoe) {
 						if (option_mask32 & CUT_OPT_SUPPRESS_FLGS)
 							goto next_line;
-					} else if (dcount<cut_lists[cl_pos].startpos)
+					} else if (dcount < cut_lists[cl_pos].startpos)
 						start = linelen;
 					end = linelen;
 				} else {
@@ -311,7 +311,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
 	}
 
 	{
-		int retval = EXIT_SUCCESS;
+		exitcode_t retval = EXIT_SUCCESS;
 
 		if (!*argv)
 			*--argv = (char *)"-";

coreutils/date.c

@@ -19,7 +19,7 @@
    much as possible, missed out a lot of bounds checking */
 
 //config:config DATE
-//config:	bool "date (7 kb)"
+//config:	bool "date (7.2 kb)"
 //config:	default y
 //config:	help
 //config:	date is used to set the system date or display the
@@ -266,6 +266,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
 
 	/* If date string is given, update tm_time, and maybe set date */
 	if (date_str != NULL) {
+		int check_dst = 1;
 		/* Zero out fields - take her back to midnight! */
 		tm_time.tm_sec = 0;
 		tm_time.tm_min = 0;
@@ -276,12 +277,12 @@ int date_main(int argc UNUSED_PARAM, char **argv)
 			if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
 				bb_error_msg_and_die(bb_msg_invalid_date, date_str);
 		} else {
-			parse_datestr(date_str, &tm_time);
+			check_dst = parse_datestr(date_str, &tm_time);
 		}
 
 		/* Correct any day of week and day of year etc. fields */
-		/* Be sure to recheck dst (but not if date is time_t format) */
-		if (date_str[0] != '@')
+		/* Be sure to recheck dst (but not if date is UTC) */
+		if (check_dst)
 			tm_time.tm_isdst = -1;
 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
 		ts.tv_nsec = 0;

coreutils/dd.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DD
-//config:	bool "dd (7.5 kb)"
+//config:	bool "dd (8.3 kb)"
 //config:	default y
 //config:	help
 //config:	dd copies a file (from standard input to standard output,
@@ -200,6 +200,7 @@ static void dd_output_status(int UNUSED_PARAM cur_signal)
 }
 
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
 static int clear_O_DIRECT(int fd)
 {
 	if (errno == EINVAL) {
@@ -211,6 +212,7 @@ static int clear_O_DIRECT(int fd)
 	}
 	return 0;
 }
+# endif
 #endif
 
 static ssize_t dd_read(void *ibuf, size_t ibs)
@@ -225,8 +227,10 @@ static ssize_t dd_read(void *ibuf, size_t ibs)
 #endif
 		n = safe_read(ifd, ibuf, ibs);
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
 	if (n < 0 && (G.flags & FLAG_IDIRECT) && clear_O_DIRECT(ifd))
 		goto read_again;
+# endif
 #endif
 	return n;
 }
@@ -239,8 +243,10 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
  IF_FEATURE_DD_IBS_OBS(write_again:)
 	n = full_write(ofd, buf, len);
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
 	if (n < 0 && (G.flags & FLAG_ODIRECT) && clear_O_DIRECT(ofd))
 		goto write_again;
+# endif
 #endif
 
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
@@ -369,7 +375,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 		OP_oflag_direct,
 #endif
 	};
-	smallint exitcode = EXIT_FAILURE;
+	exitcode_t exitcode = EXIT_FAILURE;
 	int i;
 	size_t ibs = 512;
 	char *ibuf;
@@ -501,8 +507,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 	if (infile) {
 		int iflag = O_RDONLY;
 #if ENABLE_FEATURE_DD_IBS_OBS
-		if (G.flags & FLAG_IDIRECT)
+		if (G.flags & FLAG_IDIRECT) {
+# ifdef O_DIRECT
 			iflag |= O_DIRECT;
+# else
+			bb_error_msg_and_die("O_DIRECT not supported on this platform");
+# endif
+		}
 #endif
 		xmove_fd(xopen(infile, iflag), ifd);
 	} else {
@@ -516,8 +527,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 		if (G.flags & FLAG_APPEND)
 			oflag |= O_APPEND;
 #if ENABLE_FEATURE_DD_IBS_OBS
-		if (G.flags & FLAG_ODIRECT)
+		if (G.flags & FLAG_ODIRECT) {
+# ifdef O_DIRECT
 			oflag |= O_DIRECT;
+# else
+			bb_error_msg_and_die("O_DIRECT not supported on this platform");
+# endif
+		}
 #endif
 		xmove_fd(xopen(outfile, oflag), ofd);
 

coreutils/df.c

@@ -18,7 +18,7 @@
  * Implement -P and -B; better coreutils compat; cleanup
  */
 //config:config DF
-//config:	bool "df (6.8 kb)"
+//config:	bool "df (7.1 kb)"
 //config:	default y
 //config:	help
 //config:	df reports the amount of disk space used and available
@@ -32,6 +32,26 @@
 //config:	-a Show all filesystems
 //config:	-i Inodes
 //config:	-B <SIZE> Blocksize
+//config:
+//config:config FEATURE_SKIP_ROOTFS
+//config:	bool "Skip rootfs in mount table"
+//config:	default y
+//config:	depends on DF
+//config:	help
+//config:	Ignore rootfs entry in mount table.
+//config:
+//config:	In Linux, kernel has a special filesystem, rootfs, which is initially
+//config:	mounted on /. It contains initramfs data, if kernel is configured
+//config:	to have one. Usually, another file system is mounted over / early
+//config:	in boot process, and therefore most tools which manipulate
+//config:	mount table, such as df, will skip rootfs entry.
+//config:
+//config:	However, some systems do not mount anything on /.
+//config:	If you need to configure busybox for one of these systems,
+//config:	you may find it useful to turn this option off to make df show
+//config:	initramfs statistics.
+//config:
+//config:	Otherwise, choose Y.
 
 //applet:IF_DF(APPLET_NOEXEC(df, df, BB_DIR_BIN, BB_SUID_DROP, df))
 
@@ -93,21 +113,22 @@ int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int df_main(int argc UNUSED_PARAM, char **argv)
 {
 	unsigned long df_disp_hr = 1024;
-	int status = EXIT_SUCCESS;
+	exitcode_t status = EXIT_SUCCESS;
 	unsigned opt;
 	FILE *mount_table;
 	struct mntent *mount_entry;
 	struct statvfs s;
 	enum {
-		OPT_KILO   = (1 << 0),
-		OPT_POSIX  = (1 << 1),
-		OPT_FSTYPE = (1 << 2),
-		OPT_t      = (1 << 3),
-		OPT_ALL    = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
-		OPT_INODE  = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
-		OPT_BSIZE  = (1 << 6) * ENABLE_FEATURE_DF_FANCY,
-		OPT_HUMAN  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
-		OPT_MEGA   = (1 << (5 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+		OPT_KILO     = (1 << 0),
+		OPT_POSIX    = (1 << 1),
+		OPT_FSTYPE   = (1 << 2),
+		OPT_t        = (1 << 3),
+		OPT_ALL      = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
+		OPT_INODE    = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
+		OPT_BSIZE    = (1 << 6) * ENABLE_FEATURE_DF_FANCY,
+		OPT_HUMAN    = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+		OPT_HUMANDEC = (1 << (5 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+		OPT_MEGA     = (1 << (6 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
 	};
 	const char *disp_units_hdr = NULL;
 	char *chp, *opt_t;
@@ -124,7 +145,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 	opt = getopt32(argv, "^"
 			"kPTt:"
 			IF_FEATURE_DF_FANCY("aiB:")
-			IF_FEATURE_HUMAN_READABLE("hm")
+			IF_FEATURE_HUMAN_READABLE("hHm")
 			"\0"
 #if ENABLE_FEATURE_HUMAN_READABLE && ENABLE_FEATURE_DF_FANCY
 			"k-mB:m-Bk:B-km"
@@ -151,8 +172,11 @@ int df_main(int argc UNUSED_PARAM, char **argv)
  got_it: ;
 	}
 
-	if (opt & OPT_HUMAN) {
+	if (opt & (OPT_HUMAN|OPT_HUMANDEC)) {
 		df_disp_hr = 0;
+//TODO: need to add support in make_human_readable_str() for "decimal human readable"
+		//if (opt & OPT_HUMANDEC)
+		//	df_disp_hr--;
 		disp_units_hdr = "     Size";
 	}
 	if (opt & OPT_INODE)

coreutils/dirname.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DIRNAME
-//config:	bool "dirname (329 bytes)"
+//config:	bool "dirname (611 bytes)"
 //config:	default y
 //config:	help
 //config:	dirname is used to strip a non-directory suffix from

coreutils/dos2unix.c

@@ -12,14 +12,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DOS2UNIX
-//config:	bool "dos2unix (5.2 kb)"
+//config:	bool "dos2unix (5.5 kb)"
 //config:	default y
 //config:	help
 //config:	dos2unix is used to convert a text file from DOS format to
 //config:	UNIX format, and vice versa.
 //config:
 //config:config UNIX2DOS
-//config:	bool "unix2dos (5.2 kb)"
+//config:	bool "unix2dos (5.5 kb)"
 //config:	default y
 //config:	help
 //config:	unix2dos is used to convert a text file from UNIX format to

coreutils/du.c

@@ -19,7 +19,7 @@
  * 4) Fixed busybox bug #1284 involving long overflow with human_readable.
  */
 //config:config DU
-//config:	bool "du (6.3 kb)"
+//config:	bool "du (6.5 kb)"
 //config:	default y
 //config:	help
 //config:	du is used to report the amount of disk space used

coreutils/echo.c

@@ -19,7 +19,7 @@
  *    The previous version did not allow 4-digit octals.
  */
 //config:config ECHO
-//config:	bool "echo (1.8 kb)"
+//config:	bool "echo (2 kb)"
 //config:	default y
 //config:	help
 //config:	echo prints a specified string to stdout.
@@ -321,6 +321,8 @@ int echo_main(int argc, char **argv)
 				if (*arg == '0' && (unsigned char)(arg[1] - '0') < 8) {
 					arg++;
 				}
+//FIXME? we also accept non-0 starting sequences (see echo-prints-slash_41 test)
+// echo -ne '-\41-' prints "-!-". bash 5.0.17 does not (prints "-\41-").
 				/* bb_process_escape_sequence can handle nul correctly */
 				c = bb_process_escape_sequence( (void*) &arg);
 			}

coreutils/env.c

@@ -24,7 +24,7 @@
  * - use xfunc_error_retval
  */
 //config:config ENV
-//config:	bool "env (4 kb)"
+//config:	bool "env (4.3 kb)"
 //config:	default y
 //config:	help
 //config:	env is used to set an environment variable and run
@@ -100,7 +100,7 @@ int env_main(int argc UNUSED_PARAM, char **argv)
 		}
 	}
 
-	fflush_stdout_and_exit(EXIT_SUCCESS);
+	fflush_stdout_and_exit_SUCCESS();
 }
 
 /*

coreutils/expand.c

@@ -21,13 +21,13 @@
  *  Caveat: this versions of expand and unexpand don't accept tab lists.
  */
 //config:config EXPAND
-//config:	bool "expand (5.1 kb)"
+//config:	bool "expand (5.3 kb)"
 //config:	default y
 //config:	help
 //config:	By default, convert all tabs to spaces.
 //config:
 //config:config UNEXPAND
-//config:	bool "unexpand (5.3 kb)"
+//config:	bool "unexpand (5.5 kb)"
 //config:	default y
 //config:	help
 //config:	By default, convert only leading sequences of blanks to tabs.
@@ -192,7 +192,7 @@ int expand_main(int argc UNUSED_PARAM, char **argv)
 	FILE *file;
 	unsigned tab_size;
 	unsigned opt;
-	int exit_status = EXIT_SUCCESS;
+	exitcode_t exit_status = EXIT_SUCCESS;
 
 	init_unicode();
 

coreutils/expr.c

@@ -23,7 +23,7 @@
  * provided they all associate ((x op x) op x).
  */
 //config:config EXPR
-//config:	bool "expr (6.6 kb)"
+//config:	bool "expr (6.8 kb)"
 //config:	default y
 //config:	help
 //config:	expr is used to calculate numbers and print the result

coreutils/factor.c

@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FACTOR
-//config:	bool "factor (2.7 kb)"
+//config:	bool "factor (3.2 kb)"
 //config:	default y
 //config:	help
 //config:	factor factorizes integers
@@ -48,38 +48,40 @@ typedef unsigned long half_t;
  * Larger wheels improve sieving only slightly, but quickly grow in size
  * (adding just one prime, 13, results in 5766 element sieve).
  */
-#define R(a,b,c,d,e,f,g,h,i,j,A,B,C,D,E,F,G,H,I,J) \
-	(((uint64_t)(a<<0) | (b<<3) | (c<<6) | (d<<9) | (e<<12) | (f<<15) | (g<<18) | (h<<21) | (i<<24) | (j<<27)) << 1) | \
-	(((uint64_t)(A<<0) | (B<<3) | (C<<6) | (D<<9) | (E<<12) | (F<<15) | (G<<18) | (H<<21) | (I<<24) | (J<<27)) << 31)
-#define P(a,b,c,d,e,f,g,h,i,j,A,B,C,D,E,F,G,H,I,J) \
+#define R(a,b,c,d,e,f,g,h,i,j,A,B,C,D,E,F,G,H,I,J,x) \
+	(((uint64_t)(a<<0) | (b<<3) | (c<<6) | (d<<9) | (e<<12) | (f<<15) | (g<<18) | (h<<21) | (i<<24) | (j<<27)) << 1)  | \
+	(((uint64_t)(A<<0) | (B<<3) | (C<<6) | (D<<9) | (E<<12) | (F<<15) | (G<<18) | (H<<21) | (I<<24) | (J<<27)) << 31) | \
+	((uint64_t)x << 61)
+#define P(a,b,c,d,e,f,g,h,i,j,A,B,C,D,E,F,G,H,I,J,x) \
 	R(	(a/2),(b/2),(c/2),(d/2),(e/2),(f/2),(g/2),(h/2),(i/2),(j/2), \
-		(A/2),(B/2),(C/2),(D/2),(E/2),(F/2),(G/2),(H/2),(I/2),(J/2)  )
+		(A/2),(B/2),(C/2),(D/2),(E/2),(F/2),(G/2),(H/2),(I/2),(J/2), \
+		(x/2) \
+	)
 static const uint64_t packed_wheel[] = {
-	/*1, 2, 2, 4, 2,*/
-	P( 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 4, 2, 6, 4, 6, 8, 4), //01
-	P( 2, 4, 2, 4,14, 4, 6, 2,10, 2, 6, 6, 4, 2, 4, 6, 2,10, 2, 4), //02
-	P( 2,12,10, 2, 4, 2, 4, 6, 2, 6, 4, 6, 6, 6, 2, 6, 4, 2, 6, 4), //03
-	P( 6, 8, 4, 2, 4, 6, 8, 6,10, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2), //04
-	P( 6, 4, 2, 6,10, 2,10, 2, 4, 2, 4, 6, 8, 4, 2, 4,12, 2, 6, 4), //05
-	P( 2, 6, 4, 6,12, 2, 4, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6,10, 2), //06
-	P( 4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 6, 6, 2, 6, 6, 4, 6), //07
-	P( 6, 2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 6, 4, 8, 6, 4, 6, 2, 4, 6), //08
-	P( 8, 6, 4, 2,10, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 2, 4, 8, 6), //09
-	P( 4, 2, 4, 6, 6, 2, 6, 4, 8, 4, 6, 8, 4, 2, 4, 2, 4, 8, 6, 4), //10
-	P( 6, 6, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2), //11
-	P( 6, 4, 6, 2, 6, 4, 2, 4, 6, 6, 8, 4, 2, 6,10, 8, 4, 2, 4, 2), //12
-	P( 4, 8,10, 6, 2, 4, 8, 6, 6, 4, 2, 4, 6, 2, 6, 4, 6, 2,10, 2), //13
-	P(10, 2, 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 6, 6, 4, 6, 8), //14
-	P( 4, 2, 4, 2, 4, 8, 6, 4, 8, 4, 6, 2, 6, 6, 4, 2, 4, 6, 8, 4), //15
-	P( 2, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2,10, 2, 4, 6, 8, 6, 4, 2), //16
-	P( 6, 4, 6, 8, 4, 6, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6, 6, 4, 6), //17
-	P( 6, 2, 6, 6, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2, 6, 4, 2,10, 6), //18
-	P( 2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 4, 2,12, 6, 4, 6, 2, 4, 6, 2), //19
-	P(12, 4, 2, 4, 8, 6, 4, 2, 4, 2,10, 2,10, 6, 2, 4, 6, 2, 6, 4), //20
-	P( 2, 4, 6, 6, 2, 6, 4, 2,10, 6, 8, 6, 4, 2, 4, 8, 6, 4, 6, 2), //21
-	P( 4, 6, 2, 6, 6, 6, 4, 6, 2, 6, 4, 2, 4, 2,10,12, 2, 4, 2,10), //22
-	P( 2, 6, 4, 2, 4, 6, 6, 2,10, 2, 6, 4,14, 4, 2, 4, 2, 4, 8, 6), //23
-	P( 4, 6, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4,12, 2,12), //24
+	/* 1, 2, */
+	P( 2, 4, 2, 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 4, 2, 6, 4, 6),
+	P( 8, 4, 2, 4, 2, 4,14, 4, 6, 2,10, 2, 6, 6, 4, 2, 4, 6, 2,10, 2),
+	P( 4, 2,12,10, 2, 4, 2, 4, 6, 2, 6, 4, 6, 6, 6, 2, 6, 4, 2, 6, 4),
+	P( 6, 8, 4, 2, 4, 6, 8, 6,10, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6),
+	P( 4, 2, 6,10, 2,10, 2, 4, 2, 4, 6, 8, 4, 2, 4,12, 2, 6, 4, 2, 6),
+	P( 4, 6,12, 2, 4, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6,10, 2, 4, 6, 2),
+	P( 6, 4, 2, 4, 2,10, 2,10, 2, 4, 6, 6, 2, 6, 6, 4, 6, 6, 2, 6, 4),
+	P( 2, 6, 4, 6, 8, 4, 2, 6, 4, 8, 6, 4, 6, 2, 4, 6, 8, 6, 4, 2,10),
+	P( 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 2, 4, 8, 6, 4, 2, 4, 6, 6, 2),
+	P( 6, 4, 8, 4, 6, 8, 4, 2, 4, 2, 4, 8, 6, 4, 6, 6, 6, 2, 6, 6, 4),
+	P( 2, 4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 6, 4, 6, 2, 6, 4, 2, 4),
+	P( 6, 6, 8, 4, 2, 6,10, 8, 4, 2, 4, 2, 4, 8,10, 6, 2, 4, 8, 6, 6),
+	P( 4, 2, 4, 6, 2, 6, 4, 6, 2,10, 2,10, 2, 4, 2, 4, 6, 2, 6, 4, 2),
+	P( 4, 6, 6, 2, 6, 6, 6, 4, 6, 8, 4, 2, 4, 2, 4, 8, 6, 4, 8, 4, 6),
+	P( 2, 6, 6, 4, 2, 4, 6, 8, 4, 2, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2),
+	P(10, 2, 4, 6, 8, 6, 4, 2, 6, 4, 6, 8, 4, 6, 2, 4, 8, 6, 4, 6, 2),
+	P( 4, 6, 2, 6, 6, 4, 6, 6, 2, 6, 6, 4, 2,10, 2,10, 2, 4, 2, 4, 6),
+	P( 2, 6, 4, 2,10, 6, 2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 4, 2,12, 6, 4),
+	P( 6, 2, 4, 6, 2,12, 4, 2, 4, 8, 6, 4, 2, 4, 2,10, 2,10, 6, 2, 4),
+	P( 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 4, 2,10, 6, 8, 6, 4, 2, 4, 8, 6),
+	P( 4, 6, 2, 4, 6, 2, 6, 6, 6, 4, 6, 2, 6, 4, 2, 4, 2,10,12, 2, 4),
+	P( 2,10, 2, 6, 4, 2, 4, 6, 6, 2,10, 2, 6, 4,14, 4, 2, 4, 2, 4, 8),
+	P( 6, 4, 6, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4,12, 2,12),
 };
 #undef P
 #undef R
@@ -93,8 +95,8 @@ static const uint64_t packed_wheel[] = {
  *	function                old     new   delta
  *	wheel_tab                 -     485    +485
  * 3-bit-packed insanity:
- *	packed_wheel              -     192    +192
- *	factor_main             108     171     +63
+ *	packed_wheel              -     184    +184
+ *	factor_main             108     163     +55
  */
 static void unpack_wheel(void)
 {
@@ -104,10 +106,7 @@ static void unpack_wheel(void)
 	setup_common_bufsiz();
 	wheel_tab[0] = 1;
 	wheel_tab[1] = 2;
-	wheel_tab[2] = 2;
-	wheel_tab[3] = 4;
-	wheel_tab[4] = 2;
-	p = &wheel_tab[5];
+	p = &wheel_tab[2];
 	for (i = 0; i < ARRAY_SIZE(packed_wheel); i++) {
 		uint64_t v = packed_wheel[i];
 		while ((v & 0xe) != 0) {

coreutils/false.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FALSE
-//config:	bool "false (tiny)"
+//config:	bool "false (314 bytes)"
 //config:	default y
 //config:	help
 //config:	false returns an exit code of FALSE (1).

coreutils/fold.c

@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FOLD
-//config:	bool "fold (4.6 kb)"
+//config:	bool "fold (4.8 kb)"
 //config:	default y
 //config:	help
 //config:	Wrap text to fit a specific width.
@@ -77,7 +77,7 @@ int fold_main(int argc UNUSED_PARAM, char **argv)
 	char *line_out = NULL;
 	const char *w_opt = "80";
 	unsigned width;
-	smallint exitcode = EXIT_SUCCESS;
+	exitcode_t exitcode = EXIT_SUCCESS;
 
 	init_unicode();
 

coreutils/head.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HEAD
-//config:	bool "head (3.8 kb)"
+//config:	bool "head (4 kb)"
 //config:	default y
 //config:	help
 //config:	head is used to print the first specified number of lines
@@ -76,7 +76,7 @@ print_except_N_last_bytes(FILE *fp, unsigned count)
 {
 	unsigned char *circle = xmalloc(++count);
 	unsigned head = 0;
-	for(;;) {
+	for (;;) {
 		int c;
 		c = getc(fp);
 		if (c == EOF)
@@ -105,7 +105,7 @@ print_except_N_last_lines(FILE *fp, unsigned count)
 {
 	char **circle = xzalloc((++count) * sizeof(circle[0]));
 	unsigned head = 0;
-	for(;;) {
+	for (;;) {
 		char *c;
 		c = xmalloc_fgets(fp);
 		if (!c)
@@ -127,7 +127,7 @@ print_except_N_last_lines(FILE *fp, unsigned count)
 	}
  ret:
 	head = 0;
-	for(;;) {
+	for (;;) {
 		free(circle[head++]);
 		if (head == count)
 			break;

coreutils/hostid.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HOSTID
-//config:	bool "hostid (286 bytes)"
+//config:	bool "hostid (566 bytes)"
 //config:	default y
 //config:	help
 //config:	hostid prints the numeric identifier (in hexadecimal) for

coreutils/id.c

@@ -13,13 +13,13 @@
  * Added -G option Tito Ragusa (C) 2008 for SUSv3.
  */
 //config:config ID
-//config:	bool "id (7 kb)"
+//config:	bool "id (7.1 kb)"
 //config:	default y
 //config:	help
 //config:	id displays the current user and group ID names.
 //config:
 //config:config GROUPS
-//config:	bool "groups (6.7 kb)"
+//config:	bool "groups (6.8 kb)"
 //config:	default y
 //config:	help
 //config:	Print the group names associated with current user id.

coreutils/install.c

@@ -244,6 +244,15 @@ int install_main(int argc, char **argv)
 			}
 		}
 
+		/* Set the user and group id */
+		/* (must be before chmod, or else chown may clear suid/gid bits) */
+		if ((opts & (OPT_OWNER|OPT_GROUP))
+		 && lchown(dest, uid, gid) == -1
+		) {
+			bb_perror_msg("can't change %s of %s", "ownership", dest);
+			ret = EXIT_FAILURE;
+		}
+
 		/* Set the file mode (always, not only with -m).
 		 * GNU coreutils 6.10 is not affected by umask. */
 		if (chmod(dest, mode) == -1) {
@@ -254,13 +263,6 @@ int install_main(int argc, char **argv)
 		if (use_default_selinux_context)
 			setdefaultfilecon(dest);
 #endif
-		/* Set the user and group id */
-		if ((opts & (OPT_OWNER|OPT_GROUP))
-		 && lchown(dest, uid, gid) == -1
-		) {
-			bb_perror_msg("can't change %s of %s", "ownership", dest);
-			ret = EXIT_FAILURE;
-		}
  next:
 		if (ENABLE_FEATURE_CLEAN_UP && isdir)
 			free(dest);

coreutils/link.c

@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LINK
-//config:	bool "link (3.2 kb)"
+//config:	bool "link (3.5 kb)"
 //config:	default y
 //config:	help
 //config:	link creates hard links between files.

coreutils/ln.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LN
-//config:	bool "ln (4.9 kb)"
+//config:	bool "ln (5.1 kb)"
 //config:	default y
 //config:	help
 //config:	ln is used to create hard or soft links between files.
@@ -52,7 +52,7 @@
 int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ln_main(int argc, char **argv)
 {
-	int status = EXIT_SUCCESS;
+	exitcode_t status = EXIT_SUCCESS;
 	int opts;
 	char *last;
 	char *src_name;

coreutils/logname.c

@@ -16,7 +16,7 @@
  * a diagnostic message and an error return.
  */
 //config:config LOGNAME
-//config:	bool "logname (1.1 kb)"
+//config:	bool "logname (1.4 kb)"
 //config:	default y
 //config:	help
 //config:	logname is used to print the current user's login name.

coreutils/ls.c

@@ -498,12 +498,20 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
 
 	if (opt & OPT_i) /* show inode# */
 		column += printf("%7llu ", (long long) dn->dn_ino);
-//TODO: -h should affect -s too:
-	if (opt & OPT_s) /* show allocated blocks */
-		column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
+	if (opt & OPT_s) { /* show allocated blocks */
+		if (opt & OPT_h) {
+			column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
+				/* print size, show one fractional, use suffixes */
+				make_human_readable_str((off_t)dn->dn_blocks << 9, 1, 0)
+			);
+		} else {
+			column += printf("%6"OFF_FMT"u ", (off_t)(dn->dn_blocks >> 1));
+		}
+	}
 	if (opt & OPT_l) {
 		/* long listing: show mode */
-		column += printf("%-10s ", (char *) bb_mode_string(dn->dn_mode));
+		char modestr[12];
+		column += printf("%-10s ", bb_mode_string(modestr, dn->dn_mode));
 		/* long listing: show number of links */
 		column += printf("%4lu ", (long) dn->dn_nlink);
 		/* long listing: show user/group */
@@ -518,10 +526,10 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
 #if ENABLE_FEATURE_LS_USERNAME
 		else {
 			if (opt & OPT_g) {
-				column += printf("%-8.8s ",
+				column += printf("%-8s ",
 					get_cached_groupname(dn->dn_gid));
 			} else {
-				column += printf("%-8.8s %-8.8s ",
+				column += printf("%-8s %-8s ",
 					get_cached_username(dn->dn_uid),
 					get_cached_groupname(dn->dn_gid));
 			}

coreutils/md5_sha1_sum.c

@@ -6,31 +6,31 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MD5SUM
-//config:	bool "md5sum (6.5 kb)"
+//config:	bool "md5sum (6.7 kb)"
 //config:	default y
 //config:	help
 //config:	Compute and check MD5 message digest
 //config:
 //config:config SHA1SUM
-//config:	bool "sha1sum (5.9 kb)"
+//config:	bool "sha1sum (6.7 kb)"
 //config:	default y
 //config:	help
 //config:	Compute and check SHA1 message digest
 //config:
 //config:config SHA256SUM
-//config:	bool "sha256sum (7 kb)"
+//config:	bool "sha256sum (8.2 kb)"
 //config:	default y
 //config:	help
 //config:	Compute and check SHA256 message digest
 //config:
 //config:config SHA512SUM
-//config:	bool "sha512sum (7.4 kb)"
+//config:	bool "sha512sum (7.3 kb)"
 //config:	default y
 //config:	help
 //config:	Compute and check SHA512 message digest
 //config:
 //config:config SHA3SUM
-//config:	bool "sha3sum (6.1 kb)"
+//config:	bool "sha3sum (6.3 kb)"
 //config:	default y
 //config:	help
 //config:	Compute and check SHA3 message digest
@@ -151,10 +151,12 @@ static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
 	return (unsigned char *)hex_value;
 }
 
+#define BUFSZ (CONFIG_FEATURE_COPYBUF_KB < 4 ? 4096 : CONFIG_FEATURE_COPYBUF_KB * 1024)
+
 #if !ENABLE_SHA3SUM
-# define hash_file(f,w) hash_file(f)
+# define hash_file(b,f,w) hash_file(b,f)
 #endif
-static uint8_t *hash_file(const char *filename, unsigned sha3_width)
+static uint8_t *hash_file(unsigned char *in_buf, const char *filename, unsigned sha3_width)
 {
 	int src_fd, hash_len, count;
 	union _ctx_ {
@@ -227,8 +229,7 @@ static uint8_t *hash_file(const char *filename, unsigned sha3_width)
 	}
 
 	{
-		RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-		while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
+		while ((count = safe_read(src_fd, in_buf, BUFSZ)) > 0) {
 			update(&context, in_buf, count);
 		}
 		hash_value = NULL;
@@ -238,7 +239,6 @@ static uint8_t *hash_file(const char *filename, unsigned sha3_width)
 			final(&context, in_buf);
 			hash_value = hash_bin_to_hex(in_buf, hash_len);
 		}
-		RELEASE_CONFIG_BUFFER(in_buf);
 	}
 
 	if (src_fd != STDIN_FILENO) {
@@ -251,6 +251,7 @@ static uint8_t *hash_file(const char *filename, unsigned sha3_width)
 int md5_sha1_sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 {
+	unsigned char *in_buf;
 	int return_value = EXIT_SUCCESS;
 	unsigned flags;
 #if ENABLE_SHA3SUM
@@ -279,6 +280,12 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 	if (!*argv)
 		*--argv = (char*)"-";
 
+	/* The buffer is not alloc/freed for each input file:
+	 * for big values of COPYBUF_KB, this helps to keep its pages
+	 * pre-faulted and possibly even fully cached on local CPU.
+	 */
+	in_buf = xmalloc(BUFSZ);
+
 	do {
 		if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
 			FILE *pre_computed_stream;
@@ -293,12 +300,8 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 				char *filename_ptr;
 
 				count_total++;
-				filename_ptr = strstr(line, "  ");
-				/* handle format for binary checksums */
-				if (filename_ptr == NULL) {
-					filename_ptr = strstr(line, " *");
-				}
-				if (filename_ptr == NULL) {
+				filename_ptr = strchr(line, ' ');
+				if (!filename_ptr) {
 					if (flags & FLAG_WARN) {
 						bb_simple_error_msg("invalid format");
 					}
@@ -307,12 +310,17 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 					free(line);
 					continue;
 				}
-				*filename_ptr = '\0';
-				filename_ptr += 2;
+				*filename_ptr++ = '\0';
+				/* coreutils 9.1 allows "HASH FILENAME" format,
+				 * with only one space. Skip the 'correct'
+				 * "  " or " *" delimiter if it is there:
+				 */
+				if (*filename_ptr == ' ' || *filename_ptr == '*')
+					filename_ptr++;
 
-				hash_value = hash_file(filename_ptr, sha3_width);
+				hash_value = hash_file(in_buf, filename_ptr, sha3_width);
 
-				if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
+				if (hash_value && (strcasecmp((char*)hash_value, line) == 0)) {
 					if (!(flags & FLAG_SILENT))
 						printf("%s: OK\n", filename_ptr);
 				} else {
@@ -339,7 +347,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 			}
 			fclose_if_not_stdin(pre_computed_stream);
 		} else {
-			uint8_t *hash_value = hash_file(*argv, sha3_width);
+			uint8_t *hash_value = hash_file(in_buf, *argv, sha3_width);
 			if (hash_value == NULL) {
 				return_value = EXIT_FAILURE;
 			} else {

coreutils/mkdir.c

@@ -14,7 +14,7 @@
 /* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
  */
 //config:config MKDIR
-//config:	bool "mkdir (4.5 kb)"
+//config:	bool "mkdir (4.7 kb)"
 //config:	default y
 //config:	help
 //config:	mkdir is used to create directories with the specified names.

coreutils/mkfifo.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MKFIFO
-//config:	bool "mkfifo (3.8 kb)"
+//config:	bool "mkfifo (4 kb)"
 //config:	default y
 //config:	help
 //config:	mkfifo is used to create FIFOs (named pipes).

coreutils/mknod.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MKNOD
-//config:	bool "mknod (4.5 kb)"
+//config:	bool "mknod (4.6 kb)"
 //config:	default y
 //config:	help
 //config:	mknod is used to create FIFOs or block/character special

coreutils/mktemp.c

@@ -29,7 +29,7 @@
  *        -p; else /tmp [deprecated]
  */
 //config:config MKTEMP
-//config:	bool "mktemp (4.2 kb)"
+//config:	bool "mktemp (4.5 kb)"
 //config:	default y
 //config:	help
 //config:	mktemp is used to create unique temporary files
@@ -72,13 +72,27 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
 		OPT_t = 1 << 2,
 		OPT_p = 1 << 3,
 		OPT_u = 1 << 4,
+		OPT_tmpdir = (1 << 5) * ENABLE_LONG_OPTS,
 	};
 
 	path = getenv("TMPDIR");
 	if (!path || path[0] == '\0')
 		path = "/tmp";
 
+#if ENABLE_LONG_OPTS
+	opts = getopt32long(argv, "^"
+		"dqtp:u"
+		"\0"
+		"?1" /* 1 arg max */,
+		"directory\0" No_argument       "d"
+		"quiet\0"     No_argument       "q"
+		"dry-run\0"   No_argument       "u"
+		"tmpdir\0"    Optional_argument "\xff"
+		, &path, &path
+	);
+#else
 	opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path);
+#endif
 
 	chp = argv[optind];
 	if (!chp) {
@@ -95,7 +109,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
 		goto error;
 	}
 #endif
-	if (opts & (OPT_t|OPT_p))
+	if (opts & (OPT_t|OPT_p|OPT_tmpdir))
 		chp = concat_path_file(path, chp);
 
 	if (opts & OPT_u) {

coreutils/mv.c

@@ -71,9 +71,9 @@ int mv_main(int argc, char **argv)
 			"no-target-directory\0" No_argument "T"
 			"target-directory\0" Required_argument "t"
 			IF_FEATURE_VERBOSE(
-			"verbose\0"     No_argument "v",
-			&last
+			"verbose\0"     No_argument "v"
 			)
+			, &last
 	);
 	argc -= optind;
 	argv += optind;

coreutils/nice.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NICE
-//config:	bool "nice (2.1 kb)"
+//config:	bool "nice (2.3 kb)"
 //config:	default y
 //config:	help
 //config:	nice runs a program with modified scheduling priority.
@@ -33,7 +33,7 @@ int nice_main(int argc UNUSED_PARAM, char **argv)
 
 	if (!*++argv) { /* No args, so (GNU) output current nice value. */
 		printf("%d\n", old_priority);
-		fflush_stdout_and_exit(EXIT_SUCCESS);
+		fflush_stdout_and_exit_SUCCESS();
 	}
 
 	adjustment = 10;  /* Set default adjustment. */

coreutils/nl.c

@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config NL
-//config:	bool "nl (4.6 kb)"
+//config:	bool "nl (4.9 kb)"
 //config:	default y
 //config:	help
 //config:	nl is used to number lines of files.

coreutils/nohup.c

@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NOHUP
-//config:	bool "nohup (2 kb)"
+//config:	bool "nohup (2.2 kb)"
 //config:	default y
 //config:	help
 //config:	run a command immune to hangups, with output to a non-tty.

coreutils/nproc.c

@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see LICENSE in this source tree
  */
 //config:config NPROC
-//config:	bool "nproc (3.7 kb)"
+//config:	bool "nproc (3.9 kb)"
 //config:	default y
 //config:	help
 //config:	Print number of CPUs
@@ -23,13 +23,11 @@
 //usage:     "\n	--ignore=N	Exclude N CPUs"
 //usage:	)
 
-#include <sched.h>
 #include "libbb.h"
 
 int nproc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-	unsigned long mask[1024];
 	int count = 0;
 #if ENABLE_LONG_OPTS
 	int ignore = 0;
@@ -52,16 +50,16 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 		}
 	} else
 #endif
-	if (sched_getaffinity(0, sizeof(mask), (void*)mask) == 0) {
+	{
 		int i;
-		for (i = 0; i < ARRAY_SIZE(mask); i++) {
-			unsigned long m = mask[i];
-			while (m) {
-				if (m & 1)
-					count++;
-				m >>= 1;
-			}
+		unsigned sz = 2 * 1024;
+		unsigned long *mask = get_malloc_cpu_affinity(0, &sz);
+		sz /= sizeof(long);
+		for (i = 0; i < sz; i++) {
+			if (mask[i] != 0) /* most mask[i] are usually 0 */
+				count += bb_popcnt_long(mask[i]);
 		}
+		IF_FEATURE_CLEAN_UP(free(mask);)
 	}
 
 	IF_LONG_OPTS(count -= ignore;)

coreutils/od.c

@@ -22,7 +22,9 @@
 
 //usage:#if !ENABLE_DESKTOP
 //usage:#define od_trivial_usage
-//usage:       "[-aBbcDdeFfHhIiLlOovXx] [FILE]"
+//usage:       "[-abcdeFfhiloxsv] [FILE]"
+// We also support -BDOHXIL, but they are not documented in coreutils 9.1
+// manpage/help, so don't show them either.
 //usage:#define od_full_usage "\n\n"
 //usage:       "Print FILE (or stdin) unambiguously, as octal bytes by default"
 //usage:#endif
@@ -144,29 +146,50 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
 	}
 }
 
-static const char *const add_strings[] = {
-	"16/1 \"%3_u \" \"\\n\"",              /* a */
-	"8/2 \" %06o \" \"\\n\"",              /* B, o */
-	"16/1 \"%03o \" \"\\n\"",              /* b */
-	"16/1 \"%3_c \" \"\\n\"",              /* c */
-	"8/2 \"  %05u \" \"\\n\"",             /* d */
-	"4/4 \"     %010u \" \"\\n\"",         /* D */
-	"2/8 \"          %21.14e \" \"\\n\"",  /* e (undocumented in od), F */
-	"4/4 \" %14.7e \" \"\\n\"",            /* f */
-	"4/4 \"       %08x \" \"\\n\"",        /* H, X */
-	"8/2 \"   %04x \" \"\\n\"",            /* h, x */
-	"4/4 \"    %11d \" \"\\n\"",           /* I, L, l */
-	"8/2 \" %6d \" \"\\n\"",               /* i */
-	"4/4 \"    %011o \" \"\\n\"",          /* O */
+// bb_dump_add():
+// A format string contains format units separated by [optional] whitespace.
+// A format unit contains up to three items: an iteration count, a byte count,
+// and a format.
+// The iteration count is an optional integer (default 1).
+// Each format is applied iteration count times.
+// The byte count is an optional integer. It defines the number
+// of bytes to be interpreted by each iteration of the format.
+// If an iteration count and/or a byte count is specified, a slash must be
+// placed after the iteration count and/or before the byte count
+// to disambiguate them.
+// The printf-style format is required and must be surrounded by " "s.
+// (Below, each string contains two format units)
+static const char *const add_strings[] ALIGN_PTR = {
+	"16/1 \" %3_u\""   "\"\n\"",            /* 0: a */
+	"8/2 \" %06o\""    "\"\n\"",            /* 1: B (undocumented in od), o */
+	"16/1 \" %03o\""   "\"\n\"",            /* 2: b */
+	"16/1 \" %3_c\""   "\"\n\"",            /* 3: c */
+	"8/2 \" %5u\""     "\"\n\"",            /* 4: d */
+	"4/4 \" %10u\""    "\"\n\"",            /* 5: D */
+	"2/8 \" %24.14e\"" "\"\n\"",            /* 6: e (undocumented in od), F */
+	"4/4 \" %15.7e\""  "\"\n\"",            /* 7: f */
+	"4/4 \" %08x\""    "\"\n\"",            /* 8: H, X */
+	"8/2 \" %04x\""    "\"\n\"",            /* 9: h, x */
+	"4/4 \" %11d\""    "\"\n\"",            /* 10: i */
+	"4/4 \" %011o\""   "\"\n\"",            /* 11: O */
+	"8/2 \" %6d\""     "\"\n\"",            /* 12: s */
+	/* -I,L,l: depend on word width of the arch (what is "long"?) */
+#if ULONG_MAX > 0xffffffff
+	"2/8 \" %20lld\""  "\"\n\"",            /* 13: I, L, l */
+#define L_ 13
+#else
+	/* 32-bit arch: -I,L,l are the same as -i */
+#define L_ 10
+#endif
 };
 
-static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
+static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxsv";
 
 static const char od_o2si[] ALIGN1 = {
-	0, 1, 2, 3, 5,
-	4, 6, 6, 7, 8,
-	9, 0xa, 0xb, 0xa, 0xa,
-	0xb, 1, 8, 9,
+	0, 1, 2, 3, 5,     /* aBbcD */
+	4, 6, 6, 7, 8,     /* deFfH */
+	9, L_, 10, L_, L_, /* hIiLl */
+	11, 1, 8, 9, 12    /* OoXxs */
 };
 
 int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -184,19 +207,21 @@ int od_main(int argc, char **argv)
 			if (first) {
 				first = 0;
 				bb_dump_add(dumper, "\"%07.7_Ao\n\"");
-				bb_dump_add(dumper, "\"%07.7_ao  \"");
+				bb_dump_add(dumper, "\"%07.7_ao\"");
 			} else {
-				bb_dump_add(dumper, "\"         \"");
+				bb_dump_add(dumper, "\"       \"");
 			}
 			bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]);
-		} else {  /* P, p, s, w, or other unhandled */
+		} else {  /* P, p, w, or other unhandled */
 			bb_show_usage();
 		}
 	}
 	if (!dumper->fshead) {
 		bb_dump_add(dumper, "\"%07.7_Ao\n\"");
-		bb_dump_add(dumper, "\"%07.7_ao  \" 8/2 \"%06o \" \"\\n\"");
+		bb_dump_add(dumper, "\"%07.7_ao\"");
+		bb_dump_add(dumper, add_strings[1]); /* -o format is default */
 	}
+	dumper->od_eofstring = "\n";
 
 	argc -= optind;
 	argv += optind;
@@ -205,7 +230,7 @@ int od_main(int argc, char **argv)
 
 	return bb_dump_dump(dumper, argv);
 }
-#endif /* ENABLE_DESKTOP */
+#endif /* !ENABLE_DESKTOP */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.

coreutils/od_bloaty.c

@@ -27,6 +27,8 @@
 //usage:#if ENABLE_DESKTOP
 //usage:#define od_trivial_usage
 //usage:       "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE]..."
+// We also support -BDOHXIL, but they are not documented in coreutils 9.1
+// manpage/help, so don't show them either.
 // We don't support:
 // ... [FILE] [[+]OFFSET[.][b]]
 // Support is buggy for:
@@ -43,26 +45,33 @@ enum {
 	OPT_b = 1 << 3,
 	OPT_c = 1 << 4,
 	OPT_d = 1 << 5,
-	OPT_f = 1 << 6,
-	OPT_h = 1 << 7,
-	OPT_i = 1 << 8,
-	OPT_j = 1 << 9,
-	OPT_l = 1 << 10,
-	OPT_o = 1 << 11,
-	OPT_t = 1 << 12,
+	OPT_D = 1 << 6, /* undocumented in coreutils 9.1 */
+	OPT_f = 1 << 7,
+	OPT_h = 1 << 8,
+	OPT_H = 1 << 9, /* undocumented in coreutils 9.1 */
+	OPT_i = 1 << 10,
+	OPT_I = 1 << 11, /* undocumented in coreutils 9.1 */
+	OPT_j = 1 << 12,
+	OPT_l = 1 << 13,
+	OPT_L = 1 << 14, /* undocumented in coreutils 9.1 */
+	OPT_o = 1 << 15,
+	OPT_O = 1 << 16, /* undocumented in coreutils 9.1 */
+	OPT_B = 1 << 17, /* undocumented synonym to -o */
+	OPT_t = 1 << 18,
 	/* When zero and two or more consecutive blocks are equal, format
 	   only the first block and output an asterisk alone on the following
 	   line to indicate that identical blocks have been elided: */
-	OPT_v = 1 << 13,
-	OPT_x = 1 << 14,
-	OPT_s = 1 << 15,
-	OPT_S = 1 << 16,
-	OPT_w = 1 << 17,
-	OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS,
+	OPT_v = 1 << 19,
+	OPT_x = 1 << 20,
+	OPT_X = 1 << 21, /* undocumented in coreutils 9.1 */
+	OPT_s = 1 << 22,
+	OPT_S = 1 << 23,
+	OPT_w = 1 << 24,
+	OPT_traditional = (1 << 25) * ENABLE_LONG_OPTS,
 };
 
 #define OD_GETOPT32() getopt32long(argv, \
-	"A:N:abcdfhij:lot:*vxsS:w:+:", od_longopts, \
+	"A:N:abcdDfhHiIj:lLoOBt:*vxXsS:w:+:", od_longopts, \
 	/* -w with optional param */ \
 	/* -S was -s and also had optional parameter */ \
 	/* but in coreutils 6.3 it was renamed and now has */ \
@@ -1239,20 +1248,29 @@ int od_main(int argc UNUSED_PARAM, char **argv)
 	if (opt & OPT_N) {
 		max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm_suffixes);
 	}
+
 	if (opt & OPT_a) decode_format_string("a");
 	if (opt & OPT_b) decode_format_string("oC");
 	if (opt & OPT_c) decode_format_string("c");
 	if (opt & OPT_d) decode_format_string("u2");
+	if (opt & OPT_D) decode_format_string("uI");
 	if (opt & OPT_f) decode_format_string("fF");
-	if (opt & OPT_h) decode_format_string("x2");
-	if (opt & OPT_i) decode_format_string("d2");
+	if (opt & (OPT_h|OPT_x)) decode_format_string("x2");
+	if (opt & (OPT_H|OPT_X)) decode_format_string("xI");
+	/* -I,L,l: depend on word width of the arch (what is "long"?) */
+#if ULONG_MAX > 0xffffffff
+	if (opt & OPT_i) decode_format_string("dI");
+	if (opt & (OPT_I|OPT_l|OPT_L)) decode_format_string("dL");
+#else
+	/* 32-bit arch: -I,L,l are the same as -i */
+	if (opt & (OPT_i|OPT_I|OPT_l|OPT_L)) decode_format_string("dI");
+#endif
 	if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm_suffixes);
-	if (opt & OPT_l) decode_format_string("d4");
-	if (opt & OPT_o) decode_format_string("o2");
+	if (opt & (OPT_o|OPT_B)) decode_format_string("o2");
+	if (opt & OPT_O) decode_format_string("oI");
 	while (lst_t) {
 		decode_format_string(llist_pop(&lst_t));
 	}
-	if (opt & OPT_x) decode_format_string("x2");
 	if (opt & OPT_s) decode_format_string("d2");
 	if (opt & OPT_S) {
 		G.string_min = xstrtou_sfx(str_S, 0, bkm_suffixes);

coreutils/paste.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PASTE
-//config:	bool "paste (4.9 kb)"
+//config:	bool "paste (5.1 kb)"
 //config:	default y
 //config:	help
 //config:	paste is used to paste lines of different files together

coreutils/printenv.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PRINTENV
-//config:	bool "printenv (1.3 kb)"
+//config:	bool "printenv (1.6 kb)"
 //config:	default y
 //config:	help
 //config:	printenv is used to print all or part of environment.

coreutils/printf.c

@@ -38,7 +38,7 @@
 /* 19990508 Busy Boxed! Dave Cinege */
 
 //config:config PRINTF
-//config:	bool "printf (3.8 kb)"
+//config:	bool "printf (4.1 kb)"
 //config:	default y
 //config:	help
 //config:	printf is used to format and print specified strings.
@@ -313,7 +313,7 @@ static char **print_formatted(char *f, char **argv, int *conv_err)
 				}
 				break;
 			}
-			if (*f && strchr("-+ #", *f)) {
+			while (*f && strchr("-+ #0", *f)) {
 				++f;
 				++direc_length;
 			}
@@ -425,10 +425,10 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
 	/* bash builtin errors out on "printf '-%s-\n' foo",
 	 * coreutils-6.9 works. Both work with "printf -- '-%s-\n' foo".
 	 * We will mimic coreutils. */
-	if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
-		argv++;
-	if (!argv[1]) {
-		if (ENABLE_ASH_PRINTF
+	argv = skip_dash_dash(argv);
+
+	if (!argv[0]) {
+		if ((ENABLE_ASH_PRINTF || ENABLE_HUSH_PRINTF)
 		 && applet_name[0] != 'p'
 		) {
 			bb_simple_error_msg("usage: printf FORMAT [ARGUMENT...]");
@@ -437,8 +437,8 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
 		bb_show_usage();
 	}
 
-	format = argv[1];
-	argv2 = argv + 2;
+	format = argv[0];
+	argv2 = argv + 1;
 
 	conv_err = 0;
 	do {

coreutils/pwd.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PWD
-//config:	bool "pwd (3.7 kb)"
+//config:	bool "pwd (4 kb)"
 //config:	default y
 //config:	help
 //config:	pwd is used to print the current directory.

coreutils/readlink.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config READLINK
-//config:	bool "readlink (4 kb)"
+//config:	bool "readlink (4.8 kb)"
 //config:	default y
 //config:	help
 //config:	This program reads a symbolic link and returns the name
@@ -25,12 +25,14 @@
 //kbuild:lib-$(CONFIG_READLINK) += readlink.o
 
 //usage:#define readlink_trivial_usage
-//usage:	IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
+//usage:	IF_FEATURE_READLINK_FOLLOW("[-fnv] ")
+//usage:	IF_NOT_FEATURE_READLINK_FOLLOW("[-n] ")
+//usage:	"FILE"
 //usage:#define readlink_full_usage "\n\n"
-//usage:       "Display the value of a symlink"
-//usage:	IF_FEATURE_READLINK_FOLLOW( "\n"
-//usage:     "\n	-f	Canonicalize by following all symlinks"
+//usage:       "Display the value of a symlink" "\n"
 //usage:     "\n	-n	Don't add newline"
+//usage:	IF_FEATURE_READLINK_FOLLOW(
+//usage:     "\n	-f	Canonicalize by following all symlinks"
 //usage:     "\n	-v	Verbose"
 //usage:	)
 
@@ -66,35 +68,27 @@ int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int readlink_main(int argc UNUSED_PARAM, char **argv)
 {
 	char *buf;
-	char *fname;
+	unsigned opt;
 
-	IF_FEATURE_READLINK_FOLLOW(
-		unsigned opt;
-		/* We need exactly one non-option argument.  */
-		opt = getopt32(argv, "^" "fnvsq" "\0" "=1");
-		fname = argv[optind];
-	)
-	IF_NOT_FEATURE_READLINK_FOLLOW(
-		const unsigned opt = 0;
-		if (argc != 2) bb_show_usage();
-		fname = argv[1];
-	)
+	/* -n must use bit 0 (see printf below) */
+	opt = getopt32(argv, "^" "n" IF_FEATURE_READLINK_FOLLOW("fvsq")
+                       "\0" "=1");
 
 	/* compat: coreutils readlink reports errors silently via exit code */
 	if (!(opt & 4)) /* not -v */
 		logmode = LOGMODE_NONE;
 
 	/* NOFORK: only one alloc is allowed; must free */
-	if (opt & 1) { /* -f */
-		buf = xmalloc_realpath_coreutils(fname);
+	if (opt & 2) { /* -f */
+		buf = xmalloc_realpath_coreutils(argv[optind]);
 	} else {
-		buf = xmalloc_readlink_or_warn(fname);
+		buf = xmalloc_readlink_or_warn(argv[optind]);
 	}
 
 	if (!buf)
 		return EXIT_FAILURE;
-	printf((opt & 2) ? "%s" : "%s\n", buf);
+	printf("%s%s", buf, &"\n"[opt & 1]);
 	free(buf);
 
-	fflush_stdout_and_exit(EXIT_SUCCESS);
+	fflush_stdout_and_exit_SUCCESS();
 }

coreutils/realpath.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config REALPATH
-//config:	bool "realpath (1.6 kb)"
+//config:	bool "realpath (2.5 kb)"
 //config:	default y
 //config:	help
 //config:	Return the canonicalized absolute pathname.

coreutils/rm.c

@@ -11,7 +11,7 @@
  * Size reduction.
  */
 //config:config RM
-//config:	bool "rm (5.4 kb)"
+//config:	bool "rm (5.5 kb)"
 //config:	default y
 //config:	help
 //config:	rm is used to remove files or directories.

coreutils/rmdir.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RMDIR
-//config:	bool "rmdir (3.5 kb)"
+//config:	bool "rmdir (3.8 kb)"
 //config:	default y
 //config:	help
 //config:	rmdir is used to remove empty directories.

coreutils/seq.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SEQ
-//config:	bool "seq (3.8 kb)"
+//config:	bool "seq (4 kb)"
 //config:	default y
 //config:	help
 //config:	print a sequence of numbers
@@ -22,7 +22,7 @@
 //usage:#define seq_full_usage "\n\n"
 //usage:       "Print numbers from FIRST to LAST, in steps of INC.\n"
 //usage:       "FIRST, INC default to 1.\n"
-//usage:     "\n	-w	Pad to last with leading zeros"
+//usage:     "\n	-w	Pad with leading zeros"
 //usage:     "\n	-s SEP	String separator"
 
 #include "libbb.h"
@@ -41,6 +41,7 @@ int seq_main(int argc, char **argv)
 	unsigned width;
 	unsigned frac_part;
 	const char *sep, *opt_s = "\n";
+	char *saved;
 	unsigned opt;
 
 #if ENABLE_LOCALE_SUPPORT
@@ -49,7 +50,29 @@ int seq_main(int argc, char **argv)
 	setlocale(LC_NUMERIC, "C");
 #endif
 
-	opt = getopt32(argv, "+ws:", &opt_s);
+	/* Cater for negative arguments: if we see one, truncate argv[] on it */
+	n = 0;
+	for (;;) {
+		char c;
+		saved = argv[++n];
+		if (!saved)
+			break;
+		if (saved[0] != '-') {
+			// break; // "seq -s : -1 1" won't be treated correctly
+			continue;
+		}
+// "seq -s -1 1 9" is not treated correctly, but such usage
+// (delimiter string which looks like negative number) is very unlikely
+		c = saved[1];
+		if (c == '.' || (c >= '0' && c <= '9')) {
+			argv[n] = NULL;
+			break;
+		}
+	}
+	opt = getopt32(argv, "+ws:", &opt_s); /* "+": stop at first non-option */
+	/* Restore possibly truncated argv[] */
+	argv[n] = saved;
+
 	argc -= optind;
 	argv += optind;
 	first = increment = 1;

coreutils/shred.c

@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SHRED
-//config:	bool "shred (4.9 kb)"
+//config:	bool "shred (5.5 kb)"
 //config:	default y
 //config:	help
 //config:	Overwrite a file to hide its contents, and optionally delete it

coreutils/shuf.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SHUF
-//config:	bool "shuf (5.4 kb)"
+//config:	bool "shuf (6 kb)"
 //config:	default y
 //config:	help
 //config:	Generate random permutations
@@ -17,14 +17,14 @@
 //kbuild:lib-$(CONFIG_SHUF) += shuf.o
 
 //usage:#define shuf_trivial_usage
-//usage:       "[-e|-i L-H] [-n NUM] [-o FILE] [-z] [FILE|ARG...]"
+//usage:       "[-n NUM] [-o FILE] [-z] [FILE | -e [ARG...] | -i L-H]"
 //usage:#define shuf_full_usage "\n\n"
 //usage:       "Randomly permute lines\n"
-//usage:     "\n	-e	Treat ARGs as lines"
-//usage:     "\n	-i L-H	Treat numbers L-H as lines"
 //usage:     "\n	-n NUM	Output at most NUM lines"
 //usage:     "\n	-o FILE	Write to FILE, not standard output"
-//usage:     "\n	-z	End lines with zero byte, not newline"
+//usage:     "\n	-z	NUL terminated output"
+//usage:     "\n	-e	Treat ARGs as lines"
+//usage:     "\n	-i L-H	Treat numbers L-H as lines"
 
 #include "libbb.h"
 
@@ -39,36 +39,54 @@
 
 /*
  * Use the Fisher-Yates shuffle algorithm on an array of lines.
+ * If the required number of output lines is less than the total
+ * we can stop shuffling early.
  */
-static void shuffle_lines(char **lines, unsigned numlines)
+static void shuffle_lines(char **lines, unsigned numlines, unsigned outlines)
 {
-	unsigned i;
-	unsigned r;
-	char *tmp;
-
 	srand(monotonic_us());
 
-	for (i = numlines-1; i > 0; i--) {
-		r = rand();
+	while (outlines != 0) {
+		char *tmp;
+		unsigned r = rand();
 		/* RAND_MAX can be as small as 32767 */
-		if (i > RAND_MAX)
+		if (numlines > RAND_MAX)
 			r ^= rand() << 15;
-		r %= i + 1;
-		tmp = lines[i];
-		lines[i] = lines[r];
+		r %= numlines;
+//TODO: the above method is seriously non-uniform when numlines is very large.
+//For example, with numlines of   0xf0000000,
+//values of (r % numlines) in [0, 0x0fffffff] range
+//are more likely: e.g. r=1 and r=0xf0000001 both map to 1,
+//whereas only one value, r=0xefffffff, maps to 0xefffffff.
+		numlines--;
+		tmp = lines[numlines];
+		lines[numlines] = lines[r];
 		lines[r] = tmp;
+		outlines--;
 	}
 }
 
+/* We can handle insanity like this:
+ * shuf -i 333333333333333333333333333333001-333333333333333333333333333333019
+ * but do we want to have +200 bytes of code (~40% code growth)?
+ */
+#define COMMON_PREFIX_HACK 0
+
 int shuf_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int shuf_main(int argc, char **argv)
 {
 	unsigned opts;
 	char *opt_i_str, *opt_n_str, *opt_o_str;
-	unsigned i;
 	char **lines;
-	unsigned numlines;
+	unsigned long long lo = lo;
+	unsigned numlines, outlines;
+	unsigned i;
 	char eol;
+#if COMMON_PREFIX_HACK
+	unsigned pfx_len = 0;
+	unsigned padding_width = padding_width;
+	const char *pfx = pfx;
+#endif
 
 	opts = getopt32(argv, "^"
 			OPT_STR
@@ -87,35 +105,78 @@ int shuf_main(int argc, char **argv)
 	} else
 	if (opts & OPT_i) {
 		/* create a range of numbers */
+		unsigned long long hi;
 		char *dash;
-		unsigned lo, hi;
+
+		if (argv[0])
+			bb_show_usage();
 
 		dash = strchr(opt_i_str, '-');
 		if (!dash) {
 			bb_error_msg_and_die("bad range '%s'", opt_i_str);
 		}
-		*dash = '\0';
-		lo = xatou(opt_i_str);
-		hi = xatou(dash + 1);
-		*dash = '-';
-		if (hi < lo) {
+		*dash++ = '\0';
+#if COMMON_PREFIX_HACK
+		{
+			const char *a = opt_i_str;
+			const char *b = dash;
+			/* Skip leading zeros (they may mask that common prefix does exist) */
+			while (*a == '0') a++;
+			while (*b == '0') b++;
+			/* Do we have a common prefix (long enough to bother)? */
+			padding_width = strlen(a);
+			if (padding_width > 5 && padding_width == strlen(b)) {
+				/* How long is it? */
+				pfx = a;
+				while (isdigit(*a) && *a == *b
+				 && a[1] /* "111111-111111" case: avoid xatoull("") */
+				) {
+					a++;
+					b++;
+				}
+				pfx_len = a - pfx; /* can end up being 0 */
+				padding_width -= pfx_len;
+			} else {
+				/* Undo leading zero 'eating' (think "0-9") */
+				a = opt_i_str;
+				b = dash;
+			}
+			lo = xatoull(a);
+			hi = xatoull(b);
+		}
+#else
+		lo = xatoull(opt_i_str);
+		hi = xatoull(dash);
+#endif
+		dash[-1] = '-';
+		if (hi < lo)
 			bb_error_msg_and_die("bad range '%s'", opt_i_str);
+		hi -= lo;
+		if (sizeof(size_t) > sizeof(numlines)) {
+			if (hi >= UINT_MAX)
+				bb_error_msg_and_die("bad range '%s'", opt_i_str);
+		} else {
+			if (hi >= UINT_MAX / sizeof(lines[0]))
+				bb_error_msg_and_die("bad range '%s'", opt_i_str);
 		}
 
-		numlines = (hi+1) - lo;
-		lines = xmalloc(numlines * sizeof(lines[0]));
+		numlines = hi + 1;
+		lines = xmalloc((size_t)numlines * sizeof(lines[0]));
 		for (i = 0; i < numlines; i++) {
-			lines[i] = (char*)(uintptr_t)lo;
-			lo++;
+			lines[i] = (char*)(uintptr_t)i;
 		}
 	} else {
 		/* default - read lines from stdin or the input file */
 		FILE *fp;
+		const char *fname = "-";
 
-		if (argc > 1)
-			bb_show_usage();
+		if (argv[0]) {
+			if (argv[1])
+				bb_show_usage();
+			fname = argv[0];
+		}
 
-		fp = xfopen_stdin(argv[0] ? argv[0] : "-");
+		fp = xfopen_stdin(fname);
 		lines = NULL;
 		numlines = 0;
 		for (;;) {
@@ -128,29 +189,33 @@ int shuf_main(int argc, char **argv)
 		fclose_if_not_stdin(fp);
 	}
 
-	if (numlines != 0)
-		shuffle_lines(lines, numlines);
+	outlines = numlines;
+	if (opts & OPT_n) {
+		outlines = xatou(opt_n_str);
+		if (outlines > numlines)
+			outlines = numlines;
+	}
+
+	shuffle_lines(lines, numlines, outlines);
 
 	if (opts & OPT_o)
 		xmove_fd(xopen(opt_o_str, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
 
-	if (opts & OPT_n) {
-		unsigned maxlines;
-		maxlines = xatou(opt_n_str);
-		if (numlines > maxlines)
-			numlines = maxlines;
-	}
-
 	eol = '\n';
 	if (opts & OPT_z)
 		eol = '\0';
 
-	for (i = 0; i < numlines; i++) {
-		if (opts & OPT_i)
-			printf("%u%c", (unsigned)(uintptr_t)lines[i], eol);
-		else
+	for (i = numlines - outlines; i < numlines; i++) {
+		if (opts & OPT_i) {
+#if COMMON_PREFIX_HACK
+			if (pfx_len != 0)
+				printf("%.*s%0*llu%c", pfx_len, pfx, padding_width, lo + (uintptr_t)lines[i], eol);
+			else
+#endif
+				printf("%llu%c", lo + (uintptr_t)lines[i], eol);
+		} else
 			printf("%s%c", lines[i], eol);
 	}
 
-	fflush_stdout_and_exit(EXIT_SUCCESS);
+	fflush_stdout_and_exit_SUCCESS();
 }

coreutils/sleep.c

@@ -13,18 +13,19 @@
  * time suffixes for seconds, minutes, hours, and days.
  */
 //config:config SLEEP
-//config:	bool "sleep (2 kb)"
+//config:	bool "sleep (2.4 kb)"
 //config:	default y
 //config:	help
 //config:	sleep is used to pause for a specified number of seconds.
-//config:	It comes in 3 versions:
+//config:	It comes in 2 versions:
 //config:	- small: takes one integer parameter
-//config:	- fancy: takes multiple integer arguments with suffixes:
-//config:		sleep 1d 2h 3m 15s
-//config:	- fancy with fractional numbers:
-//config:		sleep 2.3s 4.5h sleeps for 16202.3 seconds
-//config:	Last one is "the most compatible" with coreutils sleep,
-//config:	but it adds around 1k of code.
+//config:	- fancy:
+//config:		* takes multiple integer arguments with suffixes:
+//config:			sleep 1d 2h 3m 15s
+//config:		* allows fractional numbers:
+//config:			sleep 2.3s 4.5h sleeps for 16202.3 seconds
+//config:	fancy is more compatible with coreutils sleep, but it adds around
+//config:	1k of code.
 //config:
 //config:config FEATURE_FANCY_SLEEP
 //config:	bool "Enable multiple arguments and s/m/h/d suffixes"
@@ -37,6 +38,7 @@
 //applet:IF_SLEEP(APPLET(sleep, BB_DIR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_SLEEP) += sleep.o
+//kbuild:lib-$(CONFIG_ASH_SLEEP) += sleep.o
 
 /* BB_AUDIT SUSv3 compliant */
 /* BB_AUDIT GNU issues -- fancy version matches except args must be ints. */
@@ -64,15 +66,29 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
 {
 	duration_t duration;
 
-	++argv;
-	if (!*argv)
+	/* Note: sleep_main may be directly called from ash as a builtin.
+	 * This brings some complications:
+	 * + we can't use xfunc here
+	 * + we can't use bb_show_usage
+	 * + applet_name can be the name of the shell
+	 */
+	argv = skip_dash_dash(argv);
+	if (!argv[0]) {
+		/* Without this, bare "sleep" in ash shows _ash_ --help */
+		/* (ash can be the "sh" applet as well, so check 2nd char) */
+		if (ENABLE_ASH_SLEEP && applet_name[1] != 'l') {
+			bb_simple_error_msg("sleep: missing operand");
+			return EXIT_FAILURE;
+		}
 		bb_show_usage();
+	}
 
 	/* GNU sleep accepts "inf", "INF", "infinity" and "INFINITY" */
 	if (strncasecmp(argv[0], "inf", 3) == 0)
 		for (;;)
 			sleep(INT_MAX);
 
+//FIXME: in ash, "sleep 123qwerty" as a builtin aborts the shell
 #if ENABLE_FEATURE_FANCY_SLEEP
 	duration = 0;
 	do {

coreutils/sort.c

@@ -12,13 +12,13 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
  */
 //config:config SORT
-//config:	bool "sort (7.7 kb)"
+//config:	bool "sort (8.1 kb)"
 //config:	default y
 //config:	help
 //config:	sort is used to sort lines of text in specified files.
 //config:
 //config:config FEATURE_SORT_BIG
-//config:	bool "Full SuSv3 compliant sort (support -ktcbdfiogM)"
+//config:	bool "Full SuSv3 compliant sort (support -ktcbdfioghM)"
 //config:	default y
 //config:	depends on SORT
 //config:	help
@@ -43,7 +43,7 @@
 
 //usage:#define sort_trivial_usage
 //usage:       "[-nru"
-//usage:	IF_FEATURE_SORT_BIG("gMcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
+//usage:	IF_FEATURE_SORT_BIG("ghMcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
@@ -59,6 +59,7 @@
 //usage:     "\n	-n	Sort numbers"
 //usage:	IF_FEATURE_SORT_BIG(
 //usage:     "\n	-g	General numerical sort"
+//usage:     "\n	-h	Sort human readable numbers (2K 1G)"
 //usage:     "\n	-M	Sort month"
 //usage:     "\n	-V	Sort version"
 //usage:     "\n	-t CHAR	Field separator"
@@ -94,31 +95,32 @@
 enum {
 	FLAG_n  = 1 << 0,       /* Numeric sort */
 	FLAG_g  = 1 << 1,       /* Sort using strtod() */
-	FLAG_M  = 1 << 2,       /* Sort date */
-	FLAG_V  = 1 << 3,       /* Sort version */
+	FLAG_h  = 1 << 2,       /* Sort using strtod(), plus KMGT suffixes */
+	FLAG_M  = 1 << 3,       /* Sort date */
+	FLAG_V  = 1 << 4,       /* Sort version */
 /* ucsz apply to root level only, not keys.  b at root level implies bb */
-	FLAG_u  = 1 << 4,       /* Unique */
-	FLAG_c  = 1 << 5,       /* Check: no output, exit(!ordered) */
-	FLAG_s  = 1 << 6,       /* Stable sort, no ascii fallback at end */
-	FLAG_z  = 1 << 7,       /* Input and output is NUL terminated, not \n */
+	FLAG_u  = 1 << 5,       /* Unique */
+	FLAG_c  = 1 << 6,       /* Check: no output, exit(!ordered) */
+	FLAG_s  = 1 << 7,       /* Stable sort, no ascii fallback at end */
+	FLAG_z  = 1 << 8,       /* Input and output is NUL terminated, not \n */
 /* These can be applied to search keys, the previous four can't */
-	FLAG_b  = 1 << 8,       /* Ignore leading blanks */
-	FLAG_r  = 1 << 9,       /* Reverse */
-	FLAG_d  = 1 << 10,      /* Ignore !(isalnum()|isspace()) */
-	FLAG_f  = 1 << 11,      /* Force uppercase */
-	FLAG_i  = 1 << 12,      /* Ignore !isprint() */
-	FLAG_m  = 1 << 13,      /* ignored: merge already sorted files; do not sort */
-	FLAG_S  = 1 << 14,      /* ignored: -S, --buffer-size=SIZE */
-	FLAG_T  = 1 << 15,      /* ignored: -T, --temporary-directory=DIR */
-	FLAG_o  = 1 << 16,
-	FLAG_k  = 1 << 17,
-	FLAG_t  = 1 << 18,
+	FLAG_b  = 1 << 9,       /* Ignore leading blanks */
+	FLAG_r  = 1 << 10,      /* Reverse */
+	FLAG_d  = 1 << 11,      /* Ignore !(isalnum()|isspace()) */
+	FLAG_f  = 1 << 12,      /* Force uppercase */
+	FLAG_i  = 1 << 13,      /* Ignore !isprint() */
+	FLAG_m  = 1 << 14,      /* ignored: merge already sorted files; do not sort */
+	FLAG_S  = 1 << 15,      /* ignored: -S, --buffer-size=SIZE */
+	FLAG_T  = 1 << 16,      /* ignored: -T, --temporary-directory=DIR */
+	FLAG_o  = 1 << 17,
+	FLAG_k  = 1 << 18,
+	FLAG_t  = 1 << 19,
 	FLAG_bb = 0x80000000,   /* Ignore trailing blanks  */
 	FLAG_no_tie_break = 0x40000000,
 };
 
 static const char sort_opt_str[] ALIGN1 = "^"
-			"ngMVucszbrdfimS:T:o:k:*t:"
+			"nghMVucszbrdfimS:T:o:k:*t:"
 			"\0" "o--o:t--t"/*-t, -o: at most one of each*/;
 /*
  * OPT_STR must not be string literal, needs to have stable address:
@@ -253,6 +255,25 @@ static struct sort_key *add_key(void)
 #define GET_LINE(fp) xmalloc_fgetline(fp)
 #endif
 
+#if ENABLE_FEATURE_SORT_BIG
+static int scale_suffix(const char *tail)
+{
+	static const char suffix[] ALIGN1 = "kmgtpezy";
+	const char *s;
+	int n;
+
+	if (!tail[0])
+		return -1;
+	s = strchr(suffix, tail[0] | 0x20);
+	if (!s)
+		return -1;
+	n = s - suffix;
+	if (n != 0 && tail[0] >= 'a')
+		return -1; /* mg... not accepted, only MG... */
+	return n;
+}
+#endif
+
 /* Iterate through keys list and perform comparisons */
 static int compare_keys(const void *xarg, const void *yarg)
 {
@@ -275,7 +296,7 @@ static int compare_keys(const void *xarg, const void *yarg)
 		y = *(char **)yarg;
 #endif
 		/* Perform actual comparison */
-		switch (flags & (FLAG_n | FLAG_g | FLAG_M | FLAG_V)) {
+		switch (flags & (FLAG_n | FLAG_g | FLAG_h | FLAG_M | FLAG_V)) {
 		default:
 			bb_simple_error_msg_and_die("unknown sort type");
 			break;
@@ -293,7 +314,8 @@ static int compare_keys(const void *xarg, const void *yarg)
 #endif
 			break;
 #if ENABLE_FEATURE_SORT_BIG
-		case FLAG_g: {
+		case FLAG_g:
+		case FLAG_h: {
 			char *xx, *yy;
 //TODO: needs setlocale(LC_NUMERIC, "C")?
 			double dx = strtod(x, &xx);
@@ -308,16 +330,26 @@ static int compare_keys(const void *xarg, const void *yarg)
 				retval = (dy != dy) ? 0 : -1;
 			else if (dy != dy)
 				retval = 1;
-			/* Check for infinity.  Could underflow, but it avoids libm. */
-			else if (1.0 / dx == 0.0) {
-				if (dx < 0)
-					retval = (1.0 / dy == 0.0 && dy < 0) ? 0 : -1;
+			else {
+				if (flags & FLAG_h) {
+					int xs = scale_suffix(xx);
+					int ys = scale_suffix(yy);
+					if (xs != ys) {
+						retval = xs - ys;
+						break;
+					}
+				}
+				/* Check for infinity.  Could underflow, but it avoids libm. */
+				if (1.0 / dx == 0.0) {
+					if (dx < 0)
+						retval = (1.0 / dy == 0.0 && dy < 0) ? 0 : -1;
+					else
+						retval = (1.0 / dy == 0.0 && dy > 0) ? 0 : 1;
+				} else if (1.0 / dy == 0.0)
+					retval = (dy < 0) ? 1 : -1;
 				else
-					retval = (1.0 / dy == 0.0 && dy > 0) ? 0 : 1;
-			} else if (1.0 / dy == 0.0)
-				retval = (dy < 0) ? 1 : -1;
-			else
-				retval = (dx > dy) ? 1 : ((dx < dy) ? -1 : 0);
+					retval = (dx > dy) ? 1 : ((dx < dy) ? -1 : 0);
+			}
 			break;
 		}
 		case FLAG_M: {
@@ -325,9 +357,9 @@ static int compare_keys(const void *xarg, const void *yarg)
 			int dx;
 			char *xx, *yy;
 
-			xx = strptime(x, "%b", &thyme);
+			xx = strptime(skip_whitespace(x), "%b", &thyme);
 			dx = thyme.tm_mon;
-			yy = strptime(y, "%b", &thyme);
+			yy = strptime(skip_whitespace(y), "%b", &thyme);
 			if (!xx)
 				retval = (!yy) ? 0 : -1;
 			else if (!yy)
@@ -380,7 +412,9 @@ static int compare_keys(const void *xarg, const void *yarg)
 
 			/* If x > y, 1, else -1 */
 			retval = (x32 > y32) * 2 - 1;
-		} else
+			/* Here, -r has no effect! */
+			return retval;
+		}
 		if (!(option_mask32 & FLAG_no_tie_break)) {
 			/* fallback sort */
 			flags = option_mask32;
@@ -474,6 +508,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 			FLAG_allowed_for_k =
 				FLAG_n | /* Numeric sort */
 				FLAG_g | /* Sort using strtod() */
+				FLAG_h | /* Sort using strtod(), plus KMGT suffixes */
 				FLAG_M | /* Sort date */
 				FLAG_b | /* Ignore leading blanks */
 				FLAG_r | /* Reverse */
@@ -617,11 +652,12 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 	/* Handle -u */
 	if (option_mask32 & FLAG_u) {
 		int j = 0;
-		/* coreutils 6.3 drop lines for which only key is the same
-		 * -- disabling last-resort compare, or else compare_keys()
-		 * will be the same only for completely identical lines.
+		/* coreutils 6.3 drop lines for which only key is the same:
+		 * - disabling last-resort compare, or else compare_keys()
+		 * will be the same only for completely identical lines
+		 * - disabling -s (same reasons)
 		 */
-		option_mask32 |= FLAG_no_tie_break;
+		option_mask32 = (option_mask32 | FLAG_no_tie_break) & (~FLAG_s);
 		for (i = 1; i < linecount; i++) {
 			if (compare_keys(&lines[j], &lines[i]) == 0)
 				free(lines[i]);
@@ -644,5 +680,5 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 			printf("%s%c", lines[i], ch);
 	}
 
-	fflush_stdout_and_exit(EXIT_SUCCESS);
+	fflush_stdout_and_exit_SUCCESS();
 }

coreutils/split.c

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SPLIT
-//config:	bool "split (5 kb)"
+//config:	bool "split (5.2 kb)"
 //config:	default y
 //config:	help
 //config:	Split a file into pieces.

coreutils/stat.c

@@ -339,7 +339,8 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
 		strcat(pformat, "lo");
 		printf(pformat, (unsigned long) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)));
 	} else if (m == 'A') {
-		printfs(pformat, bb_mode_string(statbuf->st_mode));
+		char modestr[12];
+		printfs(pformat, bb_mode_string(modestr, statbuf->st_mode));
 	} else if (m == 'f') {
 		strcat(pformat, "lx");
 		printf(pformat, (unsigned long) statbuf->st_mode);
@@ -702,6 +703,7 @@ static bool do_stat(const char *filename, const char *format)
 			bb_putchar('\n');
 # endif
 	} else {
+		char modestr[12];
 		char *linkname = NULL;
 		struct passwd *pw_ent;
 		struct group *gw_ent;
@@ -736,7 +738,7 @@ static bool do_stat(const char *filename, const char *format)
 			bb_putchar('\n');
 		printf("Access: (%04lo/%10.10s)  Uid: (%5lu/%8s)   Gid: (%5lu/%8s)\n",
 		       (unsigned long) (statbuf.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)),
-		       bb_mode_string(statbuf.st_mode),
+		       bb_mode_string(modestr, statbuf.st_mode),
 		       (unsigned long) statbuf.st_uid,
 		       (pw_ent != NULL) ? pw_ent->pw_name : "UNKNOWN",
 		       (unsigned long) statbuf.st_gid,

coreutils/stty.c

@@ -10,7 +10,7 @@
  * Special for busybox ported by Vladimir Oleynik <dzo@simtreas.ru> 2001
  */
 //config:config STTY
-//config:	bool "stty (8.9 kb)"
+//config:	bool "stty (9.2 kb)"
 //config:	default y
 //config:	help
 //config:	stty is used to change and print terminal line settings.

coreutils/sum.c

@@ -13,7 +13,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SUM
-//config:	bool "sum (4 kb)"
+//config:	bool "sum (4.2 kb)"
 //config:	default y
 //config:	help
 //config:	checksum and count the blocks in a file

coreutils/sync.c

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SYNC
-//config:	bool "sync (3.8 kb)"
+//config:	bool "sync (4 kb)"
 //config:	default y
 //config:	help
 //config:	sync is used to flush filesystem buffers.
@@ -113,7 +113,7 @@ int sync_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FSYNC
-//config:	bool "fsync (3.6 kb)"
+//config:	bool "fsync (3.8 kb)"
 //config:	default y
 //config:	help
 //config:	fsync is used to flush file-related cached blocks to disk.