Add AC_RETSIGTYPE to get proper return type for signal hanlders

Makefile.in: Don't specify an explicit pathname for sed.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4559 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 19 insertions, 7 deletions

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index b7ded22aa..a5ce5ab6c 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,14 @@
+Sat Oct 22 09:54:50 1994    (tytso@rsx-11)
+
+	* list_rqs.c (ss_list_requests): 
+	* listen.c (ss_listen): 
+	* configure.in: Add AC_RETSIGTYPE to get proper return type for
+		signal hanlders.
+
+Fri Oct 21 21:07:16 1994    (tytso@rsx-11)
+
+	* Makefile.in (SED): Don't specify an explicit pathname for sed.
+
 Tue Oct 11 12:41:40 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Don't rm the awk and sed scripts during a make clean!
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 0fece53a1..dd1b12dd1 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -1,6 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
-SED = /bin/sed
+SED = sed
 
 INSTALLLIB=cp
 INSTALLFILE=cp
diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in
index 8dbc1745b..9f6c9f6f9 100644
--- a/src/util/ss/configure.in
+++ b/src/util/ss/configure.in
@@ -15,6 +15,7 @@ CHECK_DIRENT
 CHECK_FCNTL
 CHECK_WAIT_TYPE
 CHECK_SIGPROCMASK
+AC_RETSIGTYPE
 CHECK_STDARG
 CopySrcHeader(ss.h,$(BUILDTOP)/include/ss)
 CopySrcHeader(mit-sipb-copyright.h,$(BUILDTOP)/include/ss)
diff --git a/src/util/ss/list_rqs.c b/src/util/ss/list_rqs.c
index b8aee87d2..c44ebeda8 100644
--- a/src/util/ss/list_rqs.c
+++ b/src/util/ss/list_rqs.c
@@ -34,7 +34,7 @@ ss_list_requests(argc, argv, sci_idx, info_ptr)
     FILE *output;
     int fd;
     int mask;
-    int (*func)();
+    RETSIGTYPE (*func)();
 #ifndef WAIT_USES_INT
     union wait waitb;
 #else
diff --git a/src/util/ss/listen.c b/src/util/ss/listen.c
index ccf3b6b83..dd4760198 100644
--- a/src/util/ss/listen.c
+++ b/src/util/ss/listen.c
@@ -21,7 +21,7 @@
 static ss_data *current_info;
 static jmp_buf listen_jmpb;
 
-static int print_prompt()
+static RETSIGTYPE print_prompt()
 {
 #ifdef BSD
     /* put input into a reasonable mode */
@@ -37,7 +37,7 @@ static int print_prompt()
     (void) fflush(stdout);
 }
 
-static int listen_int_handler()
+static RETSIGTYPE listen_int_handler()
 {
     putc('\n', stdout);
     longjmp(listen_jmpb, 1);
@@ -47,9 +47,9 @@ int ss_listen (sci_idx)
     int sci_idx;
 {
     register char *cp;
-    register int (*sig_cont)();
+    register RETSIGTYPE (*sig_cont)();
     register ss_data *info;
-    int (*sig_int)(), (*old_sig_cont)();
+    RETSIGTYPE (*sig_int)(), (*old_sig_cont)();
     char input[BUFSIZ];
     char buffer[BUFSIZ];
     char *end = buffer;
@@ -59,7 +59,7 @@ int ss_listen (sci_idx)
     ss_data *old_info = current_info;
     
     current_info = info = ss_info(sci_idx);
-    sig_cont = (int (*)())0;
+    sig_cont = (RETSIGTYPE (*)())0;
     info->abort = 0;
     mask = sigblock(sigmask(SIGINT));
     memcpy(old_jmpb, listen_jmpb, sizeof(jmp_buf));