Fix/cmp n flag bug

Config.in

@@ -204,6 +204,13 @@ config FEATURE_INSTALLER
 	busybox at runtime to create hard links or symlinks for all the
 	applets that are compiled into busybox.
 
+config FEATURE_VERSION
+	bool "Support --version"
+	default y
+	depends on BUSYBOX
+	help
+	Enable 'busybox --version' support.
+
 config INSTALL_NO_USR
 	bool "Don't use /usr"
 	default n

Makefile

@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 37
+PATCHLEVEL = 38
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
@@ -476,6 +476,7 @@ libs-y		:= \
 		findutils/ \
 		init/ \
 		libbb/ \
+		libbb/yescrypt/ \
 		libpwdgrp/ \
 		loginutils/ \
 		mailutils/ \
@@ -612,8 +613,12 @@ quiet_cmd_busybox__ ?= LINK    $@
       "$(core-y)" \
       "$(libs-y)" \
       "$(LDLIBS)" \
-      "$(CONFIG_EXTRA_LDLIBS)" \
+      $(CONFIG_EXTRA_LDLIBS) \
       && $(srctree)/scripts/generate_BUFSIZ.sh --post include/common_bufsiz.h
+# ^^^ note: CONFIG_xyz strings already have double quotes: their value
+# is '"LIB LIB2"', therefore $(CONFIG_EXTRA_LDLIBS) above must NOT be written
+# as "$(CONFIG_EXTRA_LDLIBS)", it would be passed as ""LIB LIB2"",
+# and LIB2 would end up in $9, not $8 (and lost or misinterpreted).
 
 # Generate System.map
 quiet_cmd_sysmap = SYSMAP

Makefile.custom

@@ -156,12 +156,12 @@ docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
 docs/BusyBox.txt: docs/busybox.pod
 	$(disp_doc)
 	$(Q)-mkdir -p docs
-	$(Q)-pod2text $< > $@
+	$(Q)-pod2text --quotes=none $< > $@
 
 docs/busybox.1: docs/busybox.pod
 	$(disp_doc)
 	$(Q)-mkdir -p docs
-	$(Q)-pod2man --center=busybox --release="version $(KERNELVERSION)" $< > $@
+	$(Q)-pod2man --quotes=none --center=busybox --release="version $(KERNELVERSION)" $< > $@
 
 docs/BusyBox.html: docs/busybox.net/BusyBox.html
 	$(disp_doc)

NOFORK_NOEXEC.lst

@@ -336,6 +336,7 @@ setuidgid - noexec. spawner
 sha1sum - noexec. runner
 sha256sum - noexec. runner
 sha3sum - noexec. runner
+sha384sum - noexec. runner
 sha512sum - noexec. runner
 showkey - interactive, longterm
 shred - runner

applets/usage_pod.c

@@ -67,30 +67,37 @@ int main(void)
 		}
 		if (col == 0) {
 			col = 6;
-			printf("\t");
 		} else {
 			printf(", ");
 		}
-		printf("%s", usage_array[i].aname);
+		if (usage_array[i].usage[0] != NOUSAGE_STR[0]) {
+			/*
+			 * If the applet usage string will be included in the final document
+			 * optimistically link to its header (which is just the applet name).
+			 */
+			printf("L<C<%1$s>|/\"%1$s\">", usage_array[i].aname);
+		} else {
+			/* Without a usage string, just output the applet name with no link. */
+			printf("C<%s>", usage_array[i].aname);
+		}
 		col += len2;
 	}
 	printf("\n\n");
 
 	printf("=head1 COMMAND DESCRIPTIONS\n\n");
-	printf("=over 4\n\n");
 
 	for (i = 0; i < num_messages; i++) {
 		if (usage_array[i].aname[0] >= 'a' && usage_array[i].aname[0] <= 'z'
 		 && usage_array[i].usage[0] != NOUSAGE_STR[0]
 		) {
-			printf("=item B<%s>\n\n", usage_array[i].aname);
+			/* This is the heading that will be linked from the command list. */
+			printf("=head2 %s\n\n", usage_array[i].aname);
 			if (usage_array[i].usage[0])
 				printf("%s %s\n\n", usage_array[i].aname, usage_array[i].usage);
 			else
 				printf("%s\n\n", usage_array[i].aname);
 		}
 	}
-	printf("=back\n\n");
 
 	return 0;
 }

archival/Config.src

@@ -35,4 +35,15 @@ config FEATURE_LZMA_FAST
 	This option reduces decompression time by about 25% at the cost of
 	a 1K bigger binary.
 
+config FEATURE_PATH_TRAVERSAL_PROTECTION
+	bool "Prevent extraction of filenames with /../ path component"
+	default n
+	help
+	busybox tar and unzip remove "PREFIX/../" (if it exists)
+	from extracted names.
+	This option enables this behavior for all other unpacking applets,
+	such as cpio, ar, rpm.
+	GNU cpio 2.15 has NO such sanity check.
+# try other archivers and document their behavior?
+
 endmenu

archival/bbunzip.c

@@ -71,16 +71,16 @@ int FAST_FUNC bbunpack(char **argv,
 					goto err;
 			} else {
 				/* "clever zcat" with FILE */
-				/* fail_if_not_compressed because zcat refuses uncompressed input */
-				int fd = open_zipped(filename, /*fail_if_not_compressed:*/ 1);
+				/* die_if_not_compressed because zcat refuses uncompressed input */
+				int fd = open_zipped(filename, /*die_if_not_compressed:*/ 1);
 				if (fd < 0)
 					goto err_name;
 				xmove_fd(fd, STDIN_FILENO);
 			}
 		} else
 		if (option_mask32 & BBUNPK_SEAMLESS_MAGIC) {
 			/* "clever zcat" on stdin */
-			if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_compressed*/ 1))
+			if (setup_unzip_on_fd(STDIN_FILENO, /*die_if_not_compressed*/ 1))
 				goto err;
 		}
 

archival/cpio.c

@@ -350,6 +350,12 @@ static NOINLINE int cpio_o(void)
 			st.st_dev = st.st_rdev = 0;
 #endif
 
+		if (sizeof(st.st_size) > 4
+		 && st.st_size > (off_t)0xffffffff
+		) {
+			bb_error_msg_and_die("error: file '%s' is larger than 4GB", name);
+		}
+
 		bytes += printf("070701"
 				"%08X%08X%08X%08X%08X%08X%08X"
 				"%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
@@ -421,6 +427,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
 #endif
 		"owner\0"        Required_argument "R"
+		"file\0"         Required_argument "F"
 		"verbose\0"      No_argument       "v"
 		"null\0"         No_argument       "0"
 		"quiet\0"        No_argument       "\xff"

archival/libarchive/data_extract_all.c

@@ -65,6 +65,14 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 		} while (--n != 0);
 	}
 #endif
+#if ENABLE_FEATURE_PATH_TRAVERSAL_PROTECTION
+	/* Strip leading "/" and up to last "/../" path component */
+	dst_name = (char *)strip_unsafe_prefix(dst_name);
+#endif
+// ^^^ This may be a problem if some applets do need to extract absolute names.
+// (Probably will need to invent ARCHIVE_ALLOW_UNSAFE_NAME flag).
+// You might think that rpm needs it, but in my tests rpm's internal cpio
+// archive has names like "./usr/bin/FOO", not "/usr/bin/FOO".
 
 	if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) {
 		char *slash = strrchr(dst_name, '/');

archival/libarchive/header_list.c

@@ -8,5 +8,5 @@
 void FAST_FUNC header_list(const file_header_t *file_header)
 {
 //TODO: cpio -vp DIR should output "DIR/NAME", not just "NAME" */
-	puts(file_header->name);
+	puts(printable_string(file_header->name));
 }

archival/libarchive/header_verbose_list.c

@@ -57,13 +57,13 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 		ptm->tm_hour,
 		ptm->tm_min,
 		ptm->tm_sec,
-		file_header->name);
+		printable_string(file_header->name));
 
 #endif /* FEATURE_TAR_UNAME_GNAME */
 
 	/* NB: GNU tar shows "->" for symlinks and "link to" for hardlinks */
 	if (file_header->link_target) {
-		printf(" -> %s", file_header->link_target);
+		printf(" -> %s", printable_string(file_header->link_target));
 	}
 	bb_putchar('\n');
 }

archival/libarchive/open_transformer.c

@@ -157,7 +157,7 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
  */
-static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_compressed)
+static transformer_state_t *setup_transformer_on_fd(int fd, int die_if_not_compressed)
 {
 	transformer_state_t *xstate;
 
@@ -204,7 +204,7 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
 	}
 
 	/* No known magic seen */
-	if (fail_if_not_compressed)
+	if (die_if_not_compressed)
 		bb_simple_error_msg_and_die("no gzip"
 			IF_FEATURE_SEAMLESS_BZ2("/bzip2")
 			IF_FEATURE_SEAMLESS_XZ("/xz")
@@ -240,13 +240,15 @@ static void fork_transformer_and_free(transformer_state_t *xstate)
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
  */
-int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
+int FAST_FUNC setup_unzip_on_fd(int fd, int die_if_not_compressed)
 {
-	transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+	transformer_state_t *xstate = setup_transformer_on_fd(fd, die_if_not_compressed);
 
 	if (!xstate->xformer) {
+		/* Not compressed */
+		int retval = xstate->signature_skipped; /* never zero */
 		free(xstate);
-		return 1;
+		return retval;
 	}
 
 	fork_transformer_and_free(xstate);
@@ -264,7 +266,7 @@ void FAST_FUNC setup_lzma_on_fd(int fd)
 }
 #endif
 
-static transformer_state_t *open_transformer(const char *fname, int fail_if_not_compressed)
+static transformer_state_t *open_transformer(const char *fname, int die_if_not_compressed)
 {
 	transformer_state_t *xstate;
 	int fd;
@@ -284,18 +286,18 @@ static transformer_state_t *open_transformer(const char *fname, int fail_if_not_
 		}
 	}
 
-	xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+	xstate = setup_transformer_on_fd(fd, die_if_not_compressed);
 
 	return xstate;
 }
 
-int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
+int FAST_FUNC open_zipped(const char *fname, int die_if_not_compressed)
 {
 	int fd;
 	transformer_state_t *xstate;
 
-	xstate = open_transformer(fname, fail_if_not_compressed);
-	if (!xstate)
+	xstate = open_transformer(fname, die_if_not_compressed);
+	if (!xstate) /* open error */
 		return -1;
 
 	fd = xstate->src_fd;
@@ -326,7 +328,7 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
 	transformer_state_t *xstate;
 	char *image;
 
-	xstate = open_transformer(fname, /*fail_if_not_compressed:*/ 0);
+	xstate = open_transformer(fname, /*die_if_not_compressed:*/ 0);
 	if (!xstate) /* file open error */
 		return NULL;
 
@@ -371,7 +373,7 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
 	int fd;
 	char *image;
 
-	fd = open_zipped(fname, /*fail_if_not_compressed:*/ 0);
+	fd = open_zipped(fname, /*die_if_not_compressed:*/ 0);
 	if (fd < 0)
 		return NULL;
 

archival/libarchive/unsafe_prefix.c

@@ -14,7 +14,11 @@ const char* FAST_FUNC strip_unsafe_prefix(const char *str)
 			cp++;
 			continue;
 		}
-		if (is_prefixed_with(cp, "/../"+1)) {
+		/* We are called lots of times.
+		 * is_prefixed_with(cp, "../") is slower than open-coding it,
+		 * with minimal code growth (~few bytes).
+		 */
+		if (cp[0] == '.' && cp[1] == '.' && cp[2] == '/') {
 			cp += 3;
 			continue;
 		}

archival/rpm.c

@@ -316,7 +316,7 @@ static void extract_cpio(int fd, const char *source_rpm)
 	archive_handle->src_fd = fd;
 	/*archive_handle->offset = 0; - init_handle() did it */
 
-	setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_compressed:*/ 1);
+	setup_unzip_on_fd(archive_handle->src_fd, /*die_if_not_compressed:*/ 1);
 	while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
 		continue;
 }
@@ -533,6 +533,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
 	//	/* We need to know whether child (gzip/bzip/etc) exits abnormally */
 	//	signal(SIGCHLD, check_errors_in_children);
 
+	str = NULL;
 	if (ENABLE_FEATURE_SEAMLESS_LZMA
 	 && (str = rpm_getstr0(TAG_PAYLOADCOMPRESSOR)) != NULL
 	 && strcmp(str, "lzma") == 0
@@ -541,7 +542,11 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
 		// set up decompressor without detection
 		setup_lzma_on_fd(rpm_fd);
 	} else {
-		setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
+		int signature_bytes = setup_unzip_on_fd(rpm_fd, /*die_if_not_compressed:*/ 0);
+		if (signature_bytes != 0) {
+			xlseek(rpm_fd, - signature_bytes, SEEK_CUR);
+			bb_error_msg("warning, unknown compression '%s'", str);
+		}
 	}
 
 	if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)

archival/tar.c

@@ -1164,7 +1164,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
 		 * on e.g. tarball with 1st file named "BZh5".
 		 */
 		) {
-			tar_handle->src_fd = open_zipped(tar_filename, /*fail_if_not_compressed:*/ 0);
+			tar_handle->src_fd = open_zipped(tar_filename, /*die_if_not_compressed:*/ 0);
 			if (tar_handle->src_fd < 0)
 				bb_perror_msg_and_die("can't open '%s'", tar_filename);
 		} else {

console-tools/showkey.c

@@ -70,8 +70,8 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
 
 	INIT_G();
 
-	// FIXME: aks are all mutually exclusive
-	getopt32(argv, "aks");
+	// a,k,s are all mutually exclusive
+	getopt32(argv, "^" "aks" "\0" "a--ks:k--as:s--ak");
 
 	// prepare for raw mode
 	xget1(&tio, &tio0);

coreutils/cp.c

@@ -215,7 +215,8 @@ int cp_main(int argc, char **argv)
 					(flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
 			if (s_flags < 0) /* error other than ENOENT */
 				return EXIT_FAILURE;
-			d_flags = cp_mv_stat(last, &dest_stat);
+			d_flags = cp_mv_stat2(last, &dest_stat,
+					(flags & FILEUTILS_NO_TARGET_DIR) ? lstat : stat);
 			if (d_flags < 0) /* error other than ENOENT */
 				return EXIT_FAILURE;