svn commit: trunk/busybox: include libbb procps

[vda at busybox.net]

Author: vda
Date: 2007-09-30 09:32:01 -0700 (Sun, 30 Sep 2007)
New Revision: 20146

Log:
print_signames_and_exit -> print_signames (because of "ash calls kill_main")



Modified:
   trunk/busybox/include/libbb.h
   trunk/busybox/libbb/u_signal_names.c
   trunk/busybox/procps/kill.c
   trunk/busybox/procps/pgrep.c


Changeset:
Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2007-09-30 16:22:36 UTC (rev 20145)
+++ trunk/busybox/include/libbb.h	2007-09-30 16:32:01 UTC (rev 20146)
@@ -787,7 +787,7 @@
 
 int get_signum(const char *name);
 const char *get_signame(int number);
-void print_signames_and_exit(void) ATTRIBUTE_NORETURN;
+void print_signames(void);
 
 char *bb_simplify_path(const char *path);
 

Modified: trunk/busybox/libbb/u_signal_names.c
===================================================================
--- trunk/busybox/libbb/u_signal_names.c	2007-09-30 16:22:36 UTC (rev 20145)
+++ trunk/busybox/libbb/u_signal_names.c	2007-09-30 16:32:01 UTC (rev 20146)
@@ -163,7 +163,7 @@
 
 // Print the whole signal list
 
-void print_signames_and_exit(void)
+void print_signames(void)
 {
 	int signo;
 
@@ -172,5 +172,4 @@
 		if (name[0])
 			puts(name);
 	}
-	exit(EXIT_SUCCESS);
 }

Modified: trunk/busybox/procps/kill.c
===================================================================
--- trunk/busybox/procps/kill.c	2007-09-30 16:22:36 UTC (rev 20145)
+++ trunk/busybox/procps/kill.c	2007-09-30 16:32:01 UTC (rev 20146)
@@ -58,7 +58,8 @@
 	if (arg[1] == 'l' && arg[2] == '\0') {
 		if (argc == 1) {
 			/* Print the whole signal list */
-			print_signames_and_exit();
+			print_signames();
+			return 0;
 		}
 		/* -l <sig list> */
 		while ((arg = *++argv)) {

Modified: trunk/busybox/procps/pgrep.c
===================================================================
--- trunk/busybox/procps/pgrep.c	2007-09-30 16:22:36 UTC (rev 20145)
+++ trunk/busybox/procps/pgrep.c	2007-09-30 16:32:01 UTC (rev 20146)
@@ -87,8 +87,10 @@
 		scan_mask |= PSSCAN_ARGVN;
 
 	if (pkill) {
-		if (OPT_LIST) /* -l: print the whole signal list */
-			print_signames_and_exit();
+		if (OPT_LIST) { /* -l: print the whole signal list */
+			print_signames();
+			return 0;
+		}
 		if (first_arg && first_arg[0] == '-') {
 			signo = get_signum(&first_arg[1]);
 			if (signo < 0) /* || signo > MAX_SIGNUM ? */