Merge pull request #5871 from kmk3/improve-errexit

modif: improve errExit error messages
netblue30 · Jul 1, 2023 · 33c75b8 · 33c75b8
2 parents fbd53a8 + b963fe4
commit 33c75b8
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 14 deletions.
diff --git a/config.mk.in b/config.mk.in
@@ -83,7 +83,7 @@ LDFLAGS=@LDFLAGS@
 # Project variables
 EXTRA_CFLAGS  =@EXTRA_CFLAGS@
 COMMON_CFLAGS = \
-	-ggdb -O2 -DVERSION='"$(VERSION)"' \
+	-ggdb -O2 -DVERSION='"$(VERSION)"' -DMOD_DIR='"$(MOD_DIR)"' \
 	-Wall -Wextra $(HAVE_FATAL_WARNINGS) \
 	-Wformat -Wformat-security \
 	-fstack-protector-all -D_FORTIFY_SOURCE=2 \

diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/etc-cleanup
 PROG = etc-cleanup
 TARGET = $(PROG)
 

diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fbuilder
 PROG = fbuilder
 TARGET = $(PROG)
 

diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c
@@ -34,10 +34,8 @@ int is_dir(const char *fname) {
 		rv = stat(fname, &s);
 	else {
 		char *tmp;
-		if (asprintf(&tmp, "%s/", fname) == -1) {
-			fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__);
+		if (asprintf(&tmp, "%s/", fname) == -1)
 			errExit("asprintf");
-		}
 		rv = stat(tmp, &s);
 		free(tmp);
 	}

diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fcopy
 PROG = fcopy
 TARGET = $(PROG)
 

diff --git a/src/fids/Makefile b/src/fids/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fids
 PROG = fids
 TARGET = $(PROG)
 

diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/firecfg
 PROG = firecfg
 TARGET = $(PROG)
 

diff --git a/src/firejail/Makefile b/src/firejail/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/firejail
 PROG = firejail
 TARGET = $(PROG)
 

diff --git a/src/firejail/util.c b/src/firejail/util.c
@@ -559,10 +559,8 @@ int is_dir(const char *fname) {
 		rv = stat_as_user(fname, &s);
 	else {
 		char *tmp;
-		if (asprintf(&tmp, "%s/", fname) == -1) {
-			fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__);
+		if (asprintf(&tmp, "%s/", fname) == -1)
 			errExit("asprintf");
-		}
 		rv = stat_as_user(tmp, &s);
 		free(tmp);
 	}

diff --git a/src/firemon/Makefile b/src/firemon/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/firemon
 PROG = firemon
 TARGET = $(PROG)
 

diff --git a/src/fldd/Makefile b/src/fldd/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fldd
 PROG = fldd
 TARGET = $(PROG)
 

diff --git a/src/fnet/Makefile b/src/fnet/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fnet
 PROG = fnet
 TARGET = $(PROG)
 

diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fnetfilter
 PROG = fnetfilter
 TARGET = $(PROG)
 

diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fnettrace-dns
 PROG = fnettrace-dns
 TARGET = $(PROG)
 

diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fnettrace-icmp
 PROG = fnettrace-icmp
 TARGET = $(PROG)
 

diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fnettrace-sni
 PROG = fnettrace-sni
 TARGET = $(PROG)
 

diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fnettrace
 PROG = fnettrace
 TARGET = $(PROG)
 

diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fsec-optimize
 PROG = fsec-optimize
 TARGET = $(PROG)
 

diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fsec-print
 PROG = fsec-print
 TARGET = $(PROG)
 

diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fseccomp
 PROG = fseccomp
 TARGET = $(PROG)
 

diff --git a/src/ftee/Makefile b/src/ftee/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/ftee
 PROG = ftee
 TARGET = $(PROG)
 

diff --git a/src/ftee/main.c b/src/ftee/main.c
@@ -148,10 +148,8 @@ static int is_dir(const char *fname) {
 		rv = stat(fname, &s);
 	else {
 		char *tmp;
-		if (asprintf(&tmp, "%s/", fname) == -1) {
-			fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__);
-			exit(1);
-		}
+		if (asprintf(&tmp, "%s/", fname) == -1)
+			errExit("asprintf");
 		rv = stat(tmp, &s);
 		free(tmp);
 	}

diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/fzenity
 PROG = fzenity
 TARGET = $(PROG)
 

diff --git a/src/include/common.h b/src/include/common.h
@@ -32,11 +32,20 @@
 #include <ctype.h>
 #include <assert.h>
 
+#if !defined(__func__) && defined(__FUNCTION__)
+#define __func__ __FUNCTION__
+#endif
+
 // dbus proxy path used by firejail and firemon
 #define XDG_DBUS_PROXY_PATH "/usr/bin/xdg-dbus-proxy"
 
-
-#define errExit(msg)    do { char msgout[500]; snprintf(msgout, 500, "Error %s: %s:%d %s", msg, __FILE__, __LINE__, __FUNCTION__); perror(msgout); exit(1);} while (0)
+#define errExit(msg) do { \
+	char msgout[500]; \
+	snprintf(msgout, 500, "Error %s/%s:%d %s(): %s", \
+	         MOD_DIR, __FILE__, __LINE__, __func__, msg); \
+	perror(msgout); \
+	exit(1); \
+} while (0)
 
 // macro to print ip addresses in a printf statement
 #define PRINT_IP(A) \

diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/jailcheck
 PROG = jailcheck
 TARGET = $(PROG)
 

diff --git a/src/lib/Makefile b/src/lib/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/lib
 TARGET = lib
 
 include $(ROOT)/src/prog.mk

diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/libpostexecseccomp
 SO = libpostexecseccomp.so
 TARGET = $(SO)
 

diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/libtrace
 SO = libtrace.so
 TARGET = $(SO)
 

diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/libtracelog
 SO = libtracelog.so
 TARGET = $(SO)
 

diff --git a/src/profstats/Makefile b/src/profstats/Makefile
@@ -2,6 +2,7 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_DIR = src/profstats
 PROG = profstats
 TARGET = $(PROG)
 

diff --git a/test/appimage/filename.exp b/test/appimage/filename.exp
@@ -24,7 +24,7 @@ after 100
 send -- "firejail --appimage appimage.sh\r"
 expect {
 	timeout {puts "TESTING ERROR 2\n";exit}
-	"Error mounting appimage"
+	-re "Error .*mounting appimage"
 }
 after 100