lib/: Simplify error handling

alejandro-colomar · alejandro-colomar · commit 3a752c77132b · 2026-05-15T16:25:21.000+02:00
Print simpler messages that don't need translation.
Check libc errors with ==-1 and ==NULL instead of &lt;0 (or !=0) and !p.

Signed-off-by: Alejandro Colomar &lt;alx@kernel.org&gt;
diff --git a/lib/commonio.c b/lib/commonio.c
@@ -72,9 +72,9 @@ static int check_link_count (const char *file, bool log)
 {
 	struct stat sb;
 
-	if (stat (file, &sb) != 0) {
+	if (stat(file, &sb) == -1) {
 		if (log) {
-			fprinte(log_get_logfd(), "%s: %s file stat error",
+			fprinte(log_get_logfd(), "%s: stat(\"%s\")",
 			        log_get_progname(), file);
 		}
 		return 0;
@@ -104,7 +104,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 	fd = open (file, O_CREAT | O_TRUNC | O_WRONLY, 0600);
 	if (-1 == fd) {
 		if (log) {
-			fprinte(log_get_logfd(), "%s: %s", log_get_progname(), file);
+			fprinte(log_get_logfd(), "%s: open(\"%s\")", log_get_progname(), file);
 		}
 		return 0;
 	}
@@ -114,7 +114,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 	len = (ssize_t) strlen (buf) + 1;
 	if (write_full(fd, buf, len) == -1) {
 		if (log) {
-			fprinte(log_get_logfd(), "%s: %s file write error",
+			fprinte(log_get_logfd(), "%s: write(\"%s\")",
 			        log_get_progname(), file);
 		}
 		(void) close (fd);
@@ -123,7 +123,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 	}
 	if (fdatasync (fd) == -1) {
 		if (log) {
-			fprinte(log_get_logfd(), "%s: %s file sync error",
+			fprinte(log_get_logfd(), "%s: fdatasync(\"%s\")",
 			        log_get_progname(), file);
 		}
 		(void) close (fd);
@@ -141,7 +141,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 	fd = open (lock, O_RDWR);
 	if (-1 == fd) {
 		if (log) {
-			fprinte(log_get_logfd(), "%s: %s", log_get_progname(), lock);
+			fprinte(log_get_logfd(), "%s: open(\"%s\")", log_get_progname(), lock);
 		}
 		unlink (file);
 		errno = EINVAL;
diff --git a/lib/copydir.c b/lib/copydir.c
@@ -106,7 +106,7 @@ error_acl(MAYBE_UNUSED struct error_context *_1, const char *fmt, ...)
 	}
 
 	va_start (ap, fmt);
-	(void) fprintf (log_get_logfd(), _("%s: "), log_get_progname());
+	fprintf(log_get_logfd(), "%s: ", log_get_progname());
 	vfprintec(log_get_logfd(), e, fmt, ap);
 	va_end (ap);
 
diff --git a/lib/find_new_gid.c b/lib/find_new_gid.c
@@ -240,8 +240,7 @@ int find_new_gid (bool sys_group,
 	/* Create an array to hold all of the discovered GIDs */
 	used_gids = calloc_T(gid_max + 1, bool);
 	if (NULL == used_gids) {
-		fprinte(log_get_logfd(), _("%s: failed to allocate memory"),
-			log_get_progname());
+		fprinte(log_get_logfd(), "%s: calloc", log_get_progname());
 		return -1;
 	}
 
diff --git a/lib/find_new_uid.c b/lib/find_new_uid.c
@@ -239,8 +239,7 @@ int find_new_uid(bool sys_user,
 	/* Create an array to hold all of the discovered UIDs */
 	used_uids = calloc_T(uid_max + 1, bool);
 	if (NULL == used_uids) {
-		fprinte(log_get_logfd(), _("%s: failed to allocate memory"),
-			log_get_progname());
+		fprinte(log_get_logfd(), "%s: calloc", log_get_progname());
 		return -1;
 	}
 
diff --git a/lib/get_pid.c b/lib/get_pid.c
@@ -60,13 +60,13 @@ int open_pidfd(const char *pidstr)
 		return -ENOENT;
 
 	if (stprintf_a(proc_dir_name, "/proc/%d/", target) == -1) {
-		eprinte("snprintf of proc path failed for %d", target);
+		eprinte("snprintf");
 		return -EINVAL;
 	}
 
 	proc_dir_fd = open(proc_dir_name, O_DIRECTORY);
-	if (proc_dir_fd < 0) {
-		eprinte(_("Could not open proc directory for target %d"), target);
+	if (proc_dir_fd == -1) {
+		eprinte("open(\"%s\")", proc_dir_name);
 		return -EINVAL;
 	}
 	return proc_dir_fd;
diff --git a/lib/gettime.c b/lib/gettime.c
@@ -38,8 +38,7 @@ gettime(void)
 		return fallback;
 
 	if (a2i(time_t, &epoch, source_date_epoch, NULL, 10, 0, fallback) == -1) {
-		fprinte(log_get_logfd(),
-		        _("Environment variable $SOURCE_DATE_EPOCH: a2i(\"%s\")"),
+		fprinte(log_get_logfd(), "a2i(SOURCE_DATE_EPOCH=\"%s\")",
 		        source_date_epoch);
 		return fallback;
 	}
diff --git a/lib/idmapping.c b/lib/idmapping.c
@@ -49,8 +49,7 @@ get_map_ranges(int ranges, int argc, char **argv)
 
 	mappings = calloc_T(ranges, struct map_range);
 	if (!mappings) {
-		fprintf(log_get_logfd(), _( "%s: Memory allocation failure\n"),
-			log_get_progname());
+		fprinte(log_get_logfd(), "%s: calloc:", log_get_progname());
 		return NULL;
 	}
 
@@ -150,12 +149,12 @@ void write_mapping(int proc_dir_fd, int ranges, const struct map_range *mappings
 	/* Align setuid- and fscaps-based new{g,u}idmap behavior. */
 	if (geteuid() == 0 && geteuid() != ruid) {
 		if (prctl(PR_SET_KEEPCAPS, 1L) == -1) {
-			fprintf(log_get_logfd(), _("%s: Could not prctl(PR_SET_KEEPCAPS)\n"), log_get_progname());
+			fprinte(log_get_logfd(), "%s: prctl(PR_SET_KEEPCAPS)", log_get_progname());
 			exit(EXIT_FAILURE);
 		}
 
-		if (seteuid(ruid) < 0) {
-			fprintf(log_get_logfd(), _("%s: Could not seteuid to %d\n"), log_get_progname(), ruid);
+		if (seteuid(ruid) == -1) {
+			fprinte(log_get_logfd(), "%s: seteuid(%d)", log_get_progname(), ruid);
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -170,8 +169,8 @@ void write_mapping(int proc_dir_fd, int ranges, const struct map_range *mappings
 	if (maps_lower_root(cap, ranges, mappings))
 		data[0].effective |= CAP_TO_MASK(CAP_SETFCAP);
 	data[0].permitted = data[0].effective;
-	if (capset(&hdr, data) < 0) {
-		fprintf(log_get_logfd(), _("%s: Could not set caps\n"), log_get_progname());
+	if (capset(&hdr, data) == -1) {
+		fprinte(log_get_logfd(), "%s: capset", log_get_progname());
 		exit(EXIT_FAILURE);
 	}
 #endif
@@ -190,24 +189,24 @@ void write_mapping(int proc_dir_fd, int ranges, const struct map_range *mappings
 		                 mapping->count);
 	}
 	if (pos == end || pos == NULL) {
-		fprintf(log_get_logfd(), _("%s: seprintf failed!\n"), log_get_progname());
+		fprinte(log_get_logfd(), "%s: seprintf", log_get_progname());
 		exit(EXIT_FAILURE);
 	}
 
 	/* Write the mapping to the mapping file */
 	fd = openat(proc_dir_fd, map_file, O_WRONLY);
-	if (fd < 0) {
-		fprinte(log_get_logfd(), _("%s: open of %s failed"),
+	if (fd == -1) {
+		fprinte(log_get_logfd(), "%s: openat(%s)",
 			log_get_progname(), map_file);
 		exit(EXIT_FAILURE);
 	}
 	if (write_full(fd, buf, pos - buf) == -1) {
-		fprinte(log_get_logfd(), _("%s: write to %s failed"),
+		fprinte(log_get_logfd(), "%s: write(\"%s\")",
 			log_get_progname(), map_file);
 		exit(EXIT_FAILURE);
 	}
-	if (close(fd) != 0 && errno != EINTR) {
-		fprinte(log_get_logfd(), _("%s: closing %s failed"),
+	if (close(fd) == -1 && errno != EINTR) {
+		fprinte(log_get_logfd(), "%s: close(\"%s\")",
 			log_get_progname(), map_file);
 		exit(EXIT_FAILURE);
 	}
diff --git a/lib/nss.c b/lib/nss.c
@@ -10,8 +10,8 @@
 #include <stdatomic.h>
 
 #include "alloc/malloc.h"
+#include "io/fprintf/fprinte.h"
 #include "prototypes.h"
-#include "../libsubid/subid.h"
 #include "shadowlog.h"
 #include "string/sprintf/stprintf.h"
 #include "string/strcmp/strcaseprefix.h"
@@ -20,6 +20,8 @@
 #include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 
+#include "../libsubid/subid.h"
+
 
 #define NSSWITCH "/etc/nsswitch.conf"
 
@@ -70,9 +72,9 @@ nss_init(const char *nsswitch_path) {
 	// read nsswitch.conf to check for a line like:
 	//   subid:	files
 	nssfp = fopen(nsswitch_path, "r");
-	if (!nssfp) {
+	if (nssfp == NULL) {
 		if (errno != ENOENT)
-			fprintf(log_get_logfd(), "Failed opening %s: %m\n", nsswitch_path);
+			fprinte(log_get_logfd(), "fopen(\"%s\")", nsswitch_path);
 
 		atomic_store(&nss_init_completed, true);
 		return;
diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c
@@ -89,10 +89,12 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
 
 	if (prefix != NULL) {
 		/* Drop privileges */
-		if (   (setregid (getgid (), getgid ()) != 0)
-		    || (setreuid (getuid (), getuid ()) != 0)) {
-			fprinte(log_get_logfd(), _("%s: failed to drop privileges"),
-			        log_get_progname());
+		if (setregid(getgid(), getgid()) == -1) {
+			fprinte(log_get_logfd(), "%s: setregid", log_get_progname());
+			exit (EXIT_FAILURE);
+		}
+		if (setreuid(getuid(), getuid()) == -1) {
+			fprinte(log_get_logfd(), "%s: setreuid", log_get_progname());
 			exit (EXIT_FAILURE);
 		}
 
diff --git a/lib/root_flag.c b/lib/root_flag.c
@@ -73,10 +73,12 @@ extern void process_root_flag (const char* short_opt, int argc, char **argv)
 static void change_root (const char* newroot)
 {
 	/* Drop privileges */
-	if (   (setregid (getgid (), getgid ()) != 0)
-	    || (setreuid (getuid (), getuid ()) != 0)) {
-		fprinte(log_get_logfd(), _("%s: failed to drop privileges"),
-		        log_get_progname());
+	if (setregid(getgid(), getgid()) == -1) {
+		fprinte(log_get_logfd(), "%s: setregid", log_get_progname());
+		exit (EXIT_FAILURE);
+	}
+	if (setreuid(getuid(), getuid()) == -1) {
+		fprinte(log_get_logfd(), "%s: setreuid", log_get_progname());
 		exit (EXIT_FAILURE);
 	}
 
@@ -87,20 +89,20 @@ static void change_root (const char* newroot)
 		exit (E_BAD_ARG);
 	}
 
-	if (access (newroot, F_OK) != 0) {
-		fprinte(log_get_logfd(), _("%s: cannot access chroot directory %s"),
+	if (access(newroot, F_OK) == -1) {
+		fprinte(log_get_logfd(), "%s: access(\"%s\", F_OK)",
 		        log_get_progname(), newroot);
 		exit (E_BAD_ARG);
 	}
 
-	if (chroot (newroot) != 0) {
-		fprinte(log_get_logfd(), _("%s: unable to chroot to directory %s"),
+	if (chroot(newroot) == -1) {
+		fprinte(log_get_logfd(), "%s: chroot(\"%s\")",
 		        log_get_progname(), newroot);
 		exit (E_BAD_ARG);
 	}
 
-	if (chdir ("/") != 0) {
-		fprinte(log_get_logfd(), _("%s: cannot chdir in chroot directory %s"),
+	if (chdir("/") == -1) {
+		fprinte(log_get_logfd(), "%s: chdir(\"%s\")",
 		        log_get_progname(), newroot);
 		exit (E_BAD_ARG);
 	}
diff --git a/lib/salt.c b/lib/salt.c
@@ -21,6 +21,7 @@
 
 #include "defines.h"
 #include "getdef.h"
+#include "io/fprintf/fprinte.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 #include "string/sprintf/stprintf.h"
@@ -413,13 +414,8 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
 
 	/* Should not happen, but... */
 	if (NULL == retval) {
-		fprintf (log_get_logfd(),
-			 _("Unable to generate a salt from setting "
-			   "\"%s\", check your settings in "
-			   "ENCRYPT_METHOD and the corresponding "
-			   "configuration for your selected hash "
-			   "method.\n"), result);
-
+		fprinte(log_get_logfd(), "crypt_gensalt(\"%s\", %lu)",
+		        result, rounds);
 		exit (1);
 	}
 
diff --git a/lib/semanage.c b/lib/semanage.c
@@ -44,7 +44,7 @@ static void semanage_error_callback(MAYBE_UNUSED void *_1,
 	switch (semanage_msg_get_level (handle)) {
 	case SEMANAGE_MSG_ERR:
 	case SEMANAGE_MSG_WARN:
-		fprintf (log_get_logfd(), _("[libsemanage]: %s\n"), message);
+		fprintf(log_get_logfd(), "[libsemanage]: %s\n", message);
 		break;
 	case SEMANAGE_MSG_INFO:
 		/* nop */
diff --git a/lib/setupenv.c b/lib/setupenv.c
@@ -24,6 +24,7 @@
 #include "defines.h"
 #include "getdef.h"
 #include "io/fgets/fgets.h"
+#include "io/fprintf/fprinte.h"
 #include "shadowlog.h"
 #include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
@@ -109,10 +110,9 @@ void setup_env (struct passwd *info)
 	 * this a configurable option.  --marekm
 	 */
 
-	if (chdir (info->pw_dir) == -1) {
+	if (chdir(info->pw_dir) == -1) {
 		if (!getdef_bool ("DEFAULT_HOME") || chdir ("/") == -1) {
-			fprintf (log_get_logfd(), _("Unable to cd to '%s'\n"),
-				 info->pw_dir);
+			fprinte(log_get_logfd(), "chdir(\"%s\")", info->pw_dir);
 			SYSLOG(LOG_WARN,
 				"unable to cd to `%s' for user `%s'\n",
 				info->pw_dir, info->pw_name);
diff --git a/lib/spawn.c b/lib/spawn.c
@@ -39,12 +39,10 @@ run_command(const char *cmd, const char *argv[],
 		if (ENOENT == errno) {
 			_exit (E_CMD_NOTFOUND);
 		}
-		fprinte(log_get_logfd(), "%s: cannot execute %s",
-		        log_get_progname(), cmd);
+		fprinte(log_get_logfd(), "%s: execve(\"%s\")", log_get_progname(), cmd);
 		_exit (E_CMD_NOEXEC);
 	} else if ((pid_t)-1 == pid) {
-		fprinte(log_get_logfd(), "%s: cannot execute %s",
-		        log_get_progname(), cmd);
+		fprinte(log_get_logfd(), "%s: fork(\"%s\")", log_get_progname(), cmd);
 		return -1;
 	}
 
@@ -56,7 +54,7 @@ run_command(const char *cmd, const char *argv[],
 	         || ((pid_t)-1 != wpid && wpid != pid));
 
 	if ((pid_t)-1 == wpid) {
-		fprinte(log_get_logfd(), "%s: waitpid (status: %d)",
+		fprinte(log_get_logfd(), "%s: waitpid(status: %d)",
 		        log_get_progname(), *status);
 		return -1;
 	}
diff --git a/lib/tcbfuncs.c b/lib/tcbfuncs.c
diff --git a/lib/xgetXXbyYY.c b/lib/xgetXXbyYY.c

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ static int check_link_count (const char *file, bool log)`
`72`	`72`	`{`
`73`	`73`	`struct stat sb;`
`74`	`74`
`75`		`- if (stat (file, &sb) != 0) {`
	`75`	`+ if (stat(file, &sb) == -1) {`
`76`	`76`	`if (log) {`
`77`		`- fprinte(log_get_logfd(), "%s: %s file stat error",`
	`77`	`+ fprinte(log_get_logfd(), "%s: stat(\"%s\")",`
`78`	`78`	`log_get_progname(), file);`
`79`	`79`	`}`
`80`	`80`	`return 0;`
`@@ -104,7 +104,7 @@ static int do_lock_file (const char file, const char lock, bool log)`
`104`	`104`	`fd = open (file, O_CREAT \| O_TRUNC \| O_WRONLY, 0600);`
`105`	`105`	`if (-1 == fd) {`
`106`	`106`	`if (log) {`
`107`		`- fprinte(log_get_logfd(), "%s: %s", log_get_progname(), file);`
	`107`	`+ fprinte(log_get_logfd(), "%s: open(\"%s\")", log_get_progname(), file);`
`108`	`108`	`}`
`109`	`109`	`return 0;`
`110`	`110`	`}`
`@@ -114,7 +114,7 @@ static int do_lock_file (const char file, const char lock, bool log)`
`114`	`114`	`len = (ssize_t) strlen (buf) + 1;`
`115`	`115`	`if (write_full(fd, buf, len) == -1) {`
`116`	`116`	`if (log) {`
`117`		`- fprinte(log_get_logfd(), "%s: %s file write error",`
	`117`	`+ fprinte(log_get_logfd(), "%s: write(\"%s\")",`
`118`	`118`	`log_get_progname(), file);`
`119`	`119`	`}`
`120`	`120`	`(void) close (fd);`
`@@ -123,7 +123,7 @@ static int do_lock_file (const char file, const char lock, bool log)`
`123`	`123`	`}`
`124`	`124`	`if (fdatasync (fd) == -1) {`
`125`	`125`	`if (log) {`
`126`		`- fprinte(log_get_logfd(), "%s: %s file sync error",`
	`126`	`+ fprinte(log_get_logfd(), "%s: fdatasync(\"%s\")",`
`127`	`127`	`log_get_progname(), file);`
`128`	`128`	`}`
`129`	`129`	`(void) close (fd);`
`@@ -141,7 +141,7 @@ static int do_lock_file (const char file, const char lock, bool log)`
`141`	`141`	`fd = open (lock, O_RDWR);`
`142`	`142`	`if (-1 == fd) {`
`143`	`143`	`if (log) {`
`144`		`- fprinte(log_get_logfd(), "%s: %s", log_get_progname(), lock);`
	`144`	`+ fprinte(log_get_logfd(), "%s: open(\"%s\")", log_get_progname(), lock);`
`145`	`145`	`}`
`146`	`146`	`unlink (file);`
`147`	`147`	`errno = EINVAL;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ error_acl(MAYBE_UNUSED struct error_context _1, const char fmt, ...)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`va_start (ap, fmt);`
`109`		`- (void) fprintf (log_get_logfd(), _("%s: "), log_get_progname());`
	`109`	`+ fprintf(log_get_logfd(), "%s: ", log_get_progname());`
`110`	`110`	`vfprintec(log_get_logfd(), e, fmt, ap);`
`111`	`111`	`va_end (ap);`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,7 @@ int find_new_gid (bool sys_group,`
`240`	`240`	`/* Create an array to hold all of the discovered GIDs */`
`241`	`241`	`used_gids = calloc_T(gid_max + 1, bool);`
`242`	`242`	`if (NULL == used_gids) {`
`243`		`- fprinte(log_get_logfd(), _("%s: failed to allocate memory"),`
`244`		`- log_get_progname());`
	`243`	`+ fprinte(log_get_logfd(), "%s: calloc", log_get_progname());`
`245`	`244`	`return -1;`
`246`	`245`	`}`
`247`	`246`
Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,7 @@ int find_new_uid(bool sys_user,`
`239`	`239`	`/* Create an array to hold all of the discovered UIDs */`
`240`	`240`	`used_uids = calloc_T(uid_max + 1, bool);`
`241`	`241`	`if (NULL == used_uids) {`
`242`		`- fprinte(log_get_logfd(), _("%s: failed to allocate memory"),`
`243`		`- log_get_progname());`
	`242`	`+ fprinte(log_get_logfd(), "%s: calloc", log_get_progname());`
`244`	`243`	`return -1;`
`245`	`244`	`}`
`246`	`245`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ gettime(void)`
`38`	`38`	`return fallback;`
`39`	`39`
`40`	`40`	`if (a2i(time_t, &epoch, source_date_epoch, NULL, 10, 0, fallback) == -1) {`
`41`		`- fprinte(log_get_logfd(),`
`42`		`- _("Environment variable $SOURCE_DATE_EPOCH: a2i(\"%s\")"),`
	`41`	`+ fprinte(log_get_logfd(), "a2i(SOURCE_DATE_EPOCH=\"%s\")",`
`43`	`42`	`source_date_epoch);`
`44`	`43`	`return fallback;`
`45`	`44`	`}`