Patch from Denis Vlasenko to add xstat() and use it.

12 files changed, 26 insertions, 25 deletions

diff --git a/archival/gunzip.c b/archival/gunzip.c
index 4fb77044a..7b939290b 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -103,9 +103,7 @@ int gunzip_main(int argc, char **argv)
 			src_fd = bb_xopen(old_path, O_RDONLY);
 
 			/* Get the time stamp on the input file. */
-			if (stat(old_path, &stat_buf) < 0) {
-				bb_error_msg_and_die("Couldn't stat file %s", old_path);
-			}
+			xstat(old_path, &stat_buf);
 		}
 
 		/* Check that the input is sane.  */
diff --git a/coreutils/date.c b/coreutils/date.c
index c111b6161..401d2ffb7 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -165,8 +165,7 @@ int date_main(int argc, char **argv)
 
 	if(filename) {
 		struct stat statbuf;
-		if(stat(filename,&statbuf))
-			bb_perror_msg_and_die("File '%s' not found.", filename);
+		xstat(filename,&statbuf);
 		tm=statbuf.st_mtime;
 	} else time(&tm);
 	memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
diff --git a/coreutils/ls.c b/coreutils/ls.c
index a575a02cb..964e7c964 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -230,7 +230,7 @@ static struct dnode *my_stat(char *fullname, char *name)
 		  rc = getfilecon(fullname,&sid);
 		}
 #endif
-		  rc = stat(fullname, &dstat);
+		rc = stat(fullname, &dstat);
 		if(rc) {
 			bb_perror_msg("%s", fullname);
 			status = EXIT_FAILURE;
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index d45565c6e..6a82a4b43 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -105,9 +105,7 @@ int uuencode_main(int argc, char **argv)
 	switch (argc - optind) {
 		case 2:
 			src_stream = bb_xfopen(argv[optind], "r");
-			if (stat(argv[optind], &stat_buf) < 0) {
-				bb_perror_msg_and_die("stat");
-			}
+			xstat(argv[optind], &stat_buf);
 			mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
 			if (src_stream == stdout) {
 				puts("NULL");
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index aa1b3c7a0..1dd2231dc 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -53,8 +53,8 @@ pid_is_exec(pid_t pid, const char *name)
 	char buf[32];
 	struct stat sb, exec_stat;
 
-	if (name && stat(name, &exec_stat))
-		bb_perror_msg_and_die("stat %s", name);
+	if (name)
+		xstat(name, &exec_stat);
 
 	sprintf(buf, "/proc/%d/exe", pid);
 	if (stat(buf, &sb) != 0)
diff --git a/findutils/find.c b/findutils/find.c
index 0f2f2144c..c6aaf7aab 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -274,15 +274,13 @@ int find_main(int argc, char **argv)
 			xdev_dev = xmalloc ( xdev_count * sizeof( dev_t ));
 
 			if ( firstopt == 1 ) {
-				if ( stat ( ".", &stbuf ) < 0 )
-					bb_error_msg_and_die("could not stat '.'" );
+				xstat ( ".", &stbuf );
 				xdev_dev [0] = stbuf. st_dev;
 			}
 			else {
 
 				for (i = 1; i < firstopt; i++) {
-					if ( stat ( argv [i], &stbuf ) < 0 )
-						bb_error_msg_and_die("could not stat '%s'", argv [i] );
+					xstat ( argv [i], &stbuf );
 					xdev_dev [i-1] = stbuf. st_dev;
 				}
 			}
@@ -292,8 +290,7 @@ int find_main(int argc, char **argv)
 			struct stat stat_newer;
 			if (++i == argc)
 				bb_error_msg_and_die(msg_req_arg, "-newer");
-		    if (stat (argv[i], &stat_newer) != 0)
-				bb_error_msg_and_die("file %s not found", argv[i]);
+			xstat (argv[i], &stat_newer);
 			newer_mtime = stat_newer.st_mtime;
 #endif
 #ifdef CONFIG_FEATURE_FIND_INUM
diff --git a/include/libbb.h b/include/libbb.h
index bc3fa5990..0ec332b30 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -122,6 +122,8 @@ extern FILE *bb_xfopen(const char *path, const char *mode);
 extern int   bb_fclose_nonstdin(FILE *f);
 extern void  bb_fflush_stdout_and_exit(int retval) ATTRIBUTE_NORETURN;
 
+extern void xstat(const char *filename, struct stat *buf);
+
 #define BB_GETOPT_ERROR 0x80000000UL
 extern const char *bb_opt_complementally;
 extern const struct option *bb_applet_long_options;
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index b4ee3f501..159957aa4 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -26,7 +26,7 @@ LIBBB-y:= \
 	restricted_shell.c run_parts.c run_shell.c safe_read.c safe_write.c \
 	safe_strncpy.c setup_environment.c sha1.c simplify_path.c \
 	trim.c u_signal_names.c vdprintf.c verror_msg.c \
-	vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c \
+	vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xstat.c \
 	xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c \
 	get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
 	getopt_ulflags.c default_error_retval.c wfopen_input.c speed_table.c \
diff --git a/libbb/run_parts.c b/libbb/run_parts.c
index 7f5fe459b..864460d0d 100644
--- a/libbb/run_parts.c
+++ b/libbb/run_parts.c
@@ -76,9 +76,7 @@ int run_parts(char **args, const unsigned char test_mode, char **env)
 
 		filename = concat_path_file(arg0, namelist[i]->d_name);
 
-		if (stat(filename, &st) < 0) {
-			bb_perror_msg_and_die("failed to stat component %s", filename);
-		}
+		xstat(filename, &st);
 		if (S_ISREG(st.st_mode) && !access(filename, X_OK)) {
 			if (test_mode) {
 				puts(filename);
diff --git a/libbb/xstat.c b/libbb/xstat.c
new file mode 100644
index 000000000..ca6686403
--- /dev/null
+++ b/libbb/xstat.c
@@ -0,0 +1,11 @@
+/*
+ * xstat.c - a stat() which dies on failure with meaningful error message
+ */
+#include <unistd.h>
+#include "libbb.h"
+
+void xstat(const char *name, struct stat *stat_buf)
+{
+	if (stat(name, stat_buf))
+		bb_perror_msg_and_die("Can't stat '%s'", name);
+}
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index bd3065d7e..ca60dcf37 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1871,8 +1871,7 @@ static void process_dev (char *devname)
 #ifndef HDIO_DRIVE_CMD
 	int force_operation = 0;
 #endif
-	if (stat(devname,&stat_buf))
-		bb_perror_msg_and_die(devname);
+	xstat(devname,&stat_buf);
 
 	switch(major(stat_buf.st_rdev))
 	{
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index ce55a132a..473325d0c 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -23,8 +23,7 @@ static int swap_enable_disable(const char *device)
 	int status;
 	struct stat st;
 
-	if (stat(device, &st) < 0)
-		bb_perror_msg_and_die("cannot stat %s", device);
+	xstat(device, &st);
 
 	/* test for holes */
 	if (S_ISREG(st.st_mode))