[patch] evms-2.5.5-no_sys_siglist.patch

evms-2.5.5-no_sys_siglist.patch (text/plain), 3.53 KB, created by Aurélien Francillon on 2007-02-04 14:57:16 UTC

diff -ur evms-2.5.5.orig/engine/dm-targets.c evms-2.5.5/engine/dm-targets.c
--- evms-2.5.5.orig/engine/dm-targets.c	2007-02-04 14:27:27 +0000
+++ evms-2.5.5/engine/dm-targets.c	2007-02-04 14:29:06 +0000
@@ -398,7 +398,7 @@
 		if (WIFSIGNALED(status)) {
 			LOG_WARNING("\"%s %s\" was terminated by signal %s\n",
 				    argv[0], argv[1],
-				    sys_siglist[WTERMSIG(status)]);
+				    strsignal(WTERMSIG(status)));
 			rc = EINTR;
 		} else {
 			rc = WEXITSTATUS(status);
diff -ur evms-2.5.5.orig/engine/engine.c evms-2.5.5/engine/engine.c
--- evms-2.5.5.orig/engine/engine.c	2007-02-04 14:27:27 +0000
+++ evms-2.5.5/engine/engine.c	2007-02-04 14:29:06 +0000
@@ -618,7 +618,7 @@
 
 	if (rc == 0) {
 		if (WIFSIGNALED(status)) {
-			LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], sys_siglist[WTERMSIG(status)]);
+			LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], strsignal(WTERMSIG(status)));
 			rc = EINTR;
 
 		} else {
@@ -1606,7 +1606,7 @@
 static void sigusr1_handler(int sig_no) {
 
 	LOG_CRITICAL("***\n");
-	LOG_CRITICAL("*** Received shutdown signal: %s.\n", sys_siglist[sig_no]);
+	LOG_CRITICAL("*** Received shutdown signal: %s.\n", strsignal(sig_no));
 	LOG_CRITICAL("***\n");
 
 	sem_post(&shutdown_sem);
diff -ur evms-2.5.5.orig/engine/faulthdlr.c evms-2.5.5/engine/faulthdlr.c
--- evms-2.5.5.orig/engine/faulthdlr.c	2007-02-04 14:27:27 +0000
+++ evms-2.5.5/engine/faulthdlr.c	2007-02-04 14:29:06 +0000
@@ -65,7 +65,7 @@
 	strcpy(sig_msg + timestamp_len,"***\n");
 	write(log_file_fd, sig_msg, strlen(sig_msg));
 
-	sprintf(sig_msg + timestamp_len, "*** Signal: %s\n", sys_siglist[sig_no]);
+	sprintf(sig_msg + timestamp_len, "*** Signal: %s\n", strsignal(sig_no));
 	write(log_file_fd, sig_msg, strlen(sig_msg));
 
 	strcpy(sig_msg + timestamp_len,"***\n");
Files evms-2.5.5.orig/engine/libevms.a and evms-2.5.5/engine/libevms.a differ
diff -ur evms-2.5.5.orig/engine/volume.c evms-2.5.5/engine/volume.c
--- evms-2.5.5.orig/engine/volume.c	2007-02-04 14:27:27 +0000
+++ evms-2.5.5/engine/volume.c	2007-02-04 14:29:06 +0000
@@ -3087,7 +3087,7 @@
 
 				} else {
 					if (WIFSIGNALED(status)) {
-						LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), sys_siglist[WTERMSIG(status)]);
+						LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
 						rc = EINTR;
 
 					} else {
@@ -3259,7 +3259,7 @@
 
 				} else {
 					if (WIFSIGNALED(status)) {
-						LOG_SERIOUS("umount was terminated by signal %d: %s\n", WTERMSIG(status), sys_siglist[WTERMSIG(status)]);
+						LOG_SERIOUS("umount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
 						rc = EINTR;
 
 					} else {
@@ -3461,7 +3461,7 @@
 
 					} else {
 						if (WIFSIGNALED(status)) {
-							LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), sys_siglist[WTERMSIG(status)]);
+							LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
 							rc = EINTR;
 
 						} else {
diff -ur evms-2.5.5.orig/plugins/md/md_main.c evms-2.5.5/plugins/md/md_main.c
--- evms-2.5.5.orig/plugins/md/md_main.c	2006-02-23 01:12:25 +0000
+++ evms-2.5.5/plugins/md/md_main.c	2007-02-04 14:29:35 +0000
@@ -153,7 +153,7 @@
 
 	if (rc == 0) {
 		if (WIFSIGNALED(status)) {
-			LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], sys_siglist[WTERMSIG(status)]);
+			LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], strsignal(WTERMSIG(status)));
 			rc = EINTR;
 
 		} else {