Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a

merge of parallel duplicate work by Steve Price and myself. :-]

There are some changes to the build that are my fault...  mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do.  The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.

This closes a pile of /bin/sh PR's, but not all of them..

Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter

1 files changed, 10 insertions, 17 deletions

diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index a588432..f63af1a 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -33,24 +33,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)trap.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	@(#)trap.h	8.3 (Berkeley) 6/5/95
+ *	$Id: trap.h,v 1.2 1994/09/24 02:58:20 davidg Exp $
  */
 
 extern int pendingsigs;
 
-#ifdef __STDC__
-void clear_traps(void);
-int setsignal(int);
-void ignoresig(int);
-void dotrap(void);
-void setinteractive(int);
-void exitshell(int);
-#else
-void clear_traps();
-int setsignal();
-void ignoresig();
-void dotrap();
-void setinteractive();
-void exitshell();
-#endif
+int trapcmd __P((int, char **));
+void clear_traps __P((void)); 
+long setsignal __P((int)); 
+void ignoresig __P((int));
+void onsig __P((int));
+void dotrap __P((void));
+void setinteractive __P((int));
+void exitshell __P((int));