← Commit list

c484846c4

Denys Vlasenko

2023-07-17

SUCCESS Duration: 154s

Subject

introduce and use exitcode_t

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

coreutils/cksum.c +1 -1 coreutils/cut.c +1 -1 coreutils/dd.c +1 -1 coreutils/df.c +1 -1 coreutils/expand.c +1 -1 coreutils/fold.c +1 -1 coreutils/ln.c +1 -1 coreutils/touch.c +1 -1 include/libbb.h +7 -0 miscutils/getfattr.c +1 -1 miscutils/makedevs.c +1 -1 miscutils/setfattr.c +1 -1 miscutils/strings.c +2 -1 networking/brctl.c +1 -1 networking/tc.c +2 -3 util-linux/renice.c +1 -1 util-linux/rev.c +1 -1 util-linux/umount.c +1 -1

coreutils/cksum.c+1 -1

@@ -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/cut.c+1 -1

@@ -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/dd.c+1 -1

@@ -375,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;

coreutils/df.c+1 -1

@@ -113,7 +113,7 @@ 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;

coreutils/expand.c+1 -1

@@ -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/fold.c+1 -1

@@ -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/ln.c+1 -1

@@ -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/touch.c+1 -1

@@ -77,7 +77,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
	{
	int fd;
	int opts;
-	smalluint status = EXIT_SUCCESS;
+	exitcode_t status = EXIT_SUCCESS;
	#if ENABLE_FEATURE_TOUCH_SUSV3
	char *reference_file;
	char *date_str;

include/libbb.h+7 -0

@@ -1444,6 +1444,13 @@ void bb_verror_msg(const char s, va_list p, const char strerr) FAST_FUNC;
	void bb_die_memory_exhausted(void) NORETURN FAST_FUNC;
	void bb_logenv_override(void) FAST_FUNC;

+	/* x86 benefits from narrow exit code variables
+	* (because it has no widening MOV imm8,word32 insn, has to use MOV imm32,w
+	* for "exitcode = EXIT_FAILURE" and similar. The downside is that sometimes
+	* gcc widens the variable to int in various ugly suboptimal ways).
+	*/
+	typedef smalluint exitcode_t;
+
	#if ENABLE_FEATURE_SYSLOG_INFO
	void bb_info_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
	void bb_simple_info_msg(const char *s) FAST_FUNC;

miscutils/getfattr.c+1 -1

@@ -77,7 +77,7 @@ int getfattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
	int getfattr_main(int argc UNUSED_PARAM, char **argv)
	{
	const char *name;
-	int status;
+	exitcode_t status;
	int opt;
	char *buf = NULL;
	size_t bufsize = 0;

miscutils/makedevs.c+1 -1

@@ -181,7 +181,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv)
	{
	parser_t *parser;
	char line = (char )"-";
-	int ret = EXIT_SUCCESS;
+	exitcode_t ret = EXIT_SUCCESS;

	getopt32(argv, "^" "d:" "\0" "=1", &line);
	argv += optind;

miscutils/setfattr.c+1 -1

@@ -32,7 +32,7 @@ int setfattr_main(int argc UNUSED_PARAM, char **argv)
	{
	const char *name;
	const char *value = "";
-	int status;
+	exitcode_t status;
	int opt;
	enum {
	OPT_h = (1 << 0),

miscutils/strings.c+2 -1

@@ -40,7 +40,8 @@
	int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
	int strings_main(int argc UNUSED_PARAM, char **argv)
	{
-	int n, c, status = EXIT_SUCCESS;
+	int n, c;
+	exitcode_t status = EXIT_SUCCESS;
	unsigned count;
	off_t offset;
	FILE *file;

networking/brctl.c+1 -1

@@ -538,7 +538,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
	DIR *net;
	struct dirent *ent;
	int need_hdr = 1;
-	int exitcode = EXIT_SUCCESS;
+	exitcode_t exitcode = EXIT_SUCCESS;

	if (*argv) {
	/* "show BR1 BR2 BR3" */

networking/tc.c+2 -3

@@ -502,7 +502,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
	};
	struct rtnl_handle rth;
	struct tcmsg msg;
-	int ret, obj, cmd, arg;
+	int obj, cmd, arg;
	char *dev = NULL;

	INIT_G();
@@ -510,7 +510,6 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
	if (!*++argv)
	bb_show_usage();
	xrtnl_open(&rth);
-	ret = EXIT_SUCCESS;

	obj = index_in_substrings(objects, *argv++);
	if (obj < 0)
@@ -625,5 +624,5 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
	if (ENABLE_FEATURE_CLEAN_UP) {
	rtnl_close(&rth);
	}
-	return ret;
+	return EXIT_SUCCESS;
	}

util-linux/renice.c+1 -1

@@ -45,7 +45,7 @@ int renice_main(int argc UNUSED_PARAM, char **argv)
	{
	static const char Xetpriority_msg[] ALIGN1 = "%cetpriority";

-	int retval = EXIT_SUCCESS;
+	exitcode_t retval = EXIT_SUCCESS;
	int which = PRIO_PROCESS; /* Default 'which' value. */
	int use_relative = 0;
	int adjustment, new_priority;

util-linux/rev.c+1 -1

@@ -51,7 +51,7 @@ static void strrev(CHAR_T *s, int len)
	int rev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
	int rev_main(int argc UNUSED_PARAM, char **argv)
	{
-	int retval;
+	exitcode_t retval;
	size_t bufsize;
	char *buf;

util-linux/umount.c+1 -1

@@ -97,7 +97,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
	struct mntent me;
	FILE *fp;
	char *fstype = NULL;
-	int status = EXIT_SUCCESS;
+	exitcode_t status = EXIT_SUCCESS;
	unsigned opt;
	struct mtab_list {
	char *dir;