ANSI fixes; rename the files until I learn to type

SCCS-vsn: usr.bin/error/filter.c 5.7
SCCS-vsn: usr.bin/error/input.c 5.5
SCCS-vsn: usr.bin/error/main.c 5.6
SCCS-vsn: usr.bin/error/pi.c 5.5
SCCS-vsn: usr.bin/error/subr.c 5.5
SCCS-vsn: usr.bin/error/touch.c 5.7

diff --git a/usr/src/usr.bin/error/filter.c b/usr/src/usr.bin/error/filter.c
index 81a3d80..7f074f8 100644 (file)
--- a/usr/src/usr.bin/error/filter.c
+++ b/usr/src/usr.bin/error/filter.c
@@ -6,13 +6,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)filter.c   5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)filter.c   5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>

+#include <pwd.h>
+#include <unistd.h>

 #include <stdio.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <ctype.h>

-#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>

 #include "error.h"
 #include "pathnames.h"
 
 #include "error.h"
 #include "pathnames.h"
 

diff --git a/usr/src/usr.bin/error/input.c b/usr/src/usr.bin/error/input.c
index b73e947..01ea828 100644 (file)
--- a/usr/src/usr.bin/error/input.c
+++ b/usr/src/usr.bin/error/input.c
@@ -6,11 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)input.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)input.c    5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>
 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>

+#include <stdlib.h>
+#include <string.h>

 #include "error.h"
 
 int    wordc;          /* how long the current error message is */
 #include "error.h"
 
 int    wordc;          /* how long the current error message is */

diff --git a/usr/src/usr.bin/error/main.c b/usr/src/usr.bin/error/main.c
index 4c64457..292d1ff 100644 (file)
--- a/usr/src/usr.bin/error/main.c
+++ b/usr/src/usr.bin/error/main.c
@@ -12,12 +12,15 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.6 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#include <signal.h>
+#include <unistd.h>

 #include <stdio.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <ctype.h>

-#include <signal.h>
+#include <stdlib.h>
+#include <string.h>

 #include "error.h"
 #include "pathnames.h"
 
 #include "error.h"
 #include "pathnames.h"
 


@@ -41,7 +44,7 @@ boolean       terse   = FALSE;        /* Terse output */
 char   *suffixlist = ".*";     /* initially, can touch any file */
 
 int    errorsort();
 char   *suffixlist = ".*";     /* initially, can touch any file */
 
 int    errorsort();

-int    onintr();
+void   onintr();

 /*
  *     error [-I ignorename] [-n] [-q] [-t suffixlist] [-s] [-v] [infile]
  *     
 /*
  *     error [-I ignorename] [-n] [-q] [-t suffixlist] [-s] [-v] [infile]
  *     

diff --git a/usr/src/usr.bin/error/pi.c b/usr/src/usr.bin/error/pi.c
index 29e8e54..a221142 100644 (file)
--- a/usr/src/usr.bin/error/pi.c
+++ b/usr/src/usr.bin/error/pi.c
@@ -6,11 +6,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pi.c       5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)pi.c       5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>
 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>

+#include <string.h>

 #include "error.h"
 
 extern char    *currentfilename;
 #include "error.h"
 
 extern char    *currentfilename;

diff --git a/usr/src/usr.bin/error/subr.c b/usr/src/usr.bin/error/subr.c
index d4e80bc..dbc1b47 100644 (file)
--- a/usr/src/usr.bin/error/subr.c
+++ b/usr/src/usr.bin/error/subr.c
@@ -6,11 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)subr.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)subr.c     5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>
 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>

+#include <stdlib.h>
+#include <string.h>

 #include "error.h"
 /*
  *     Arrayify a list of rules
 #include "error.h"
 /*
  *     Arrayify a list of rules

diff --git a/usr/src/usr.bin/error/touch.c b/usr/src/usr.bin/error/touch.c
index 86a5fcd..c653834 100644 (file)
--- a/usr/src/usr.bin/error/touch.c
+++ b/usr/src/usr.bin/error/touch.c
@@ -6,14 +6,17 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)touch.c    5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)touch.c    5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <sys/signal.h>
+#include <signal.h>
+#include <unistd.h>

 #include <stdio.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <ctype.h>

+#include <stdlib.h>
+#include <string.h>

 #include "error.h"
 #include "pathnames.h"
 
 #include "error.h"
 #include "pathnames.h"
 


@@ -665,6 +668,7 @@ mustwrite(base, n, preciousfile)
        }
 }
 
        }
 }
 

+void

 onintr()
 {
        switch(inquire(terse
 onintr()
 {
        switch(inquire(terse