[git commit] scripts/kconfig/mconf: work on systems w/o SIGWINCH

Denys Vlasenko vda.linux at googlemail.com
Thu Sep 27 13:26:40 UTC 2012


commit: http://git.busybox.net/busybox/commit/?id=225cc1327a9a3786d0c5317ea1a8342f8c04f0d8
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 scripts/kconfig/mconf.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 1b0b6ab..006d037 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -445,6 +445,7 @@ static struct gstr get_relations_str(struct symbol **sym_arr)
 
 pid_t pid;
 
+#ifdef SIGWINCH
 static void winch_handler(int sig)
 {
 	if (!do_resize) {
@@ -452,11 +453,11 @@ static void winch_handler(int sig)
 		do_resize = 1;
 	}
 }
+#endif
 
 static int exec_conf(void)
 {
 	int pipefd[2], stat, size;
-	struct sigaction sa;
 	sigset_t sset, osset;
 
 	sigemptyset(&sset);
@@ -465,10 +466,15 @@ static int exec_conf(void)
 
 	signal(SIGINT, SIG_DFL);
 
-	sa.sa_handler = winch_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction(SIGWINCH, &sa, NULL);
+#ifdef SIGWINCH
+	{
+		struct sigaction sa;
+		sa.sa_handler = winch_handler;
+		sigemptyset(&sa.sa_mask);
+		sa.sa_flags = SA_RESTART;
+		sigaction(SIGWINCH, &sa, NULL);
+	}
+#endif
 
 	*argptr++ = NULL;
 


More information about the busybox-cvs mailing list