Fix incorrect assignment of nlist.c to nlist.h (should be a.out.h), fix ordering...

diff --git a/lib/libx_c/a.out.h b/lib/libx_c/a.out.h
index ba00e67..ad3166f 100644 (file)
--- a/lib/libx_c/a.out.h
+++ b/lib/libx_c/a.out.h
@@ -86,4 +86,17 @@ unsigned long        n_value;        /* value of this symbol (or sdb offset) */
  */
 #define        N_FORMAT        "%08x"
 
+#ifndef KERNEL
+#ifndef __P
+#ifdef __STDC__
+#define __P(args) args
+#else
+#define __P(args) ()
+#endif
+#endif
+
+/* gen/nlist.c */
+int nlist __P((char *name, struct nlist *list));
+#endif
+
 #endif

diff --git a/lib/libx_c/gen.h b/lib/libx_c/gen.h
index ecc807d..71f8c8f 100644 (file)
--- a/lib/libx_c/gen.h
+++ b/lib/libx_c/gen.h
@@ -1,19 +1,19 @@
 #ifndef _GEN_H_
 #define _GEN_H_
 
+#include <a.out.h>
 #include <ctype.h>
 #include <disktab.h>
 #include <fstab.h>
 #include <grp.h>
 #include <math.h>
 #include <ndbm.h>
-#include <nlist.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <strings.h>
 #include <sys/dir.h>
 #include <sys/errno.h>
-/*#include <sys/exec.h> nlist.h*/
+/*#include <sys/exec.h> a.out.h*/
 #include <sys/proc.h>
 #include <sys/signal.h>
 #include <sys/syslog.h>

diff --git a/lib/libx_c/gen/getwd.c b/lib/libx_c/gen/getwd.c
index d2b37ba..85a92dd 100644 (file)
--- a/lib/libx_c/gen/getwd.c
+++ b/lib/libx_c/gen/getwd.c
@@ -2,7 +2,7 @@
 #include <sys/dir.h>
 /*#include <sys/param.h> sys/dir.h*/
 #include <sys/stat.h>
-/*#include <sys/types.h> sys/param.h*/
+/*#include <sys/types.h> sys/dir.h*/
 
 /*
  * Copyright (c) 1980 Regents of the University of California.

diff --git a/lib/libx_c/gen/ttyname.c b/lib/libx_c/gen/ttyname.c
index f1150ea..73cb7be 100644 (file)
--- a/lib/libx_c/gen/ttyname.c
+++ b/lib/libx_c/gen/ttyname.c
@@ -15,7 +15,7 @@ static char sccsid[] = "@(#)ttyname.c 5.2 (Berkeley) 3/9/86";
  */
 
 #define        NULL    0
-/*#include <sys/param.h> sys/ioctl.h*/
+/*#include <sys/param.h> sys/dir.h*/
 /*#include <sys/dir.h>*/
 /*#include <sys/stat.h>*/
 

diff --git a/lib/libx_c/groups.txt b/lib/libx_c/groups.txt
index 502c90b..d91cf22 100644 (file)
--- a/lib/libx_c/groups.txt
+++ b/lib/libx_c/groups.txt
@@ -70,7 +70,7 @@ gen/mkstemp.c
 gen/mktemp.c
 gen/modf.c math.h
 gen/ndbm.c ndbm.h
-gen/nlist.c nlist.h
+gen/nlist.c a.out.h
 gen/opendir.c sys/dir.h
 gen/perror.c sys/errno.h
 gen/psignal.c sys/signal.h

diff --git a/lib/libx_c/net/named/gethostnamadr.c b/lib/libx_c/net/named/gethostnamadr.c
index 6064931..8653f11 100644 (file)
--- a/lib/libx_c/net/named/gethostnamadr.c
+++ b/lib/libx_c/net/named/gethostnamadr.c
@@ -1,5 +1,5 @@
 #include <arpa/inet.h>
-/*#include <arpa/nameser.h> resolv.h*/
+/*#include <arpa/nameser.h> net.h*/
 #include <ctype.h>
 #include <net.h>
 /*#include <netdb.h> net.h*/

diff --git a/lib/libx_c/net/res_init.c b/lib/libx_c/net/res_init.c
index 3e94900..feaf59b 100644 (file)
--- a/lib/libx_c/net/res_init.c
+++ b/lib/libx_c/net/res_init.c
@@ -1,5 +1,5 @@
 #include <arpa/inet.h>
-/*#include <arpa/nameser.h> resolv.h*/
+/*#include <arpa/nameser.h> net.h*/
 #include <gen.h>
 #include <net.h>
 /*#include <netinet/in.h> arpa/inet.h*/

diff --git a/lib/libx_c/net/res_mkquery.c b/lib/libx_c/net/res_mkquery.c
index 5bb6c36..a81e2cd 100644 (file)
--- a/lib/libx_c/net/res_mkquery.c
+++ b/lib/libx_c/net/res_mkquery.c
@@ -1,4 +1,4 @@
-/*#include <arpa/nameser.h> resolv.h*/
+/*#include <arpa/nameser.h> net.h*/
 #include <net.h>
 #include <resolv.h>
 /*#include <stdio.h> arpa/nameser.h*/

diff --git a/lib/libx_c/net/res_send.c b/lib/libx_c/net/res_send.c
index 395568d..8018393 100644 (file)
--- a/lib/libx_c/net/res_send.c
+++ b/lib/libx_c/net/res_send.c
@@ -1,14 +1,14 @@
 #include <arpa/inet.h>
-/*#include <arpa/nameser.h> resolv.h*/
+/*#include <arpa/nameser.h> net.h*/
 #include <net.h>
 #include <resolv.h>
 /*#include <stdio.h> arpa/nameser.h*/
 /*#include <sys/errno.h> sys/file.h*/
 #include <sys/file.h>
-/*#include <sys/param.h> sys/select.h*/
+/*#include <sys/param.h> sys/file.h*/
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/time.h>
+/*#include <sys/time.h> sys/select.h*/
 /*#include <sys/types.h> arpa/inet.h*/
 #include <sys/uio.h>
 

diff --git a/lib/libx_c/net/rexec.c b/lib/libx_c/net/rexec.c
index 194d233..4dea98e 100644 (file)
--- a/lib/libx_c/net/rexec.c
+++ b/lib/libx_c/net/rexec.c
@@ -7,7 +7,7 @@
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-/*#include <sys/types.h> stdio.h*/
+/*#include <sys/types.h> net.h*/
 
 /*
  * Copyright (c) 1980 Regents of the University of California.

diff --git a/lib/libx_c/netinet/if_ether.h b/lib/libx_c/netinet/if_ether.h
index db14bc8..401b72c 100644 (file)
--- a/lib/libx_c/netinet/if_ether.h
+++ b/lib/libx_c/netinet/if_ether.h
@@ -4,7 +4,7 @@
 #include <net/if.h>
 /*#include <net/if_arp.h> net/if.h*/
 #include <netinet/in.h>
-/*#include <sys/types.h> net/if_arp.h*/
+/*#include <sys/types.h> net/if.h*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

diff --git a/lib/libx_c/netinet/tcp.h b/lib/libx_c/netinet/tcp.h
index 6d732f0..f6fbd89 100644 (file)
--- a/lib/libx_c/netinet/tcp.h
+++ b/lib/libx_c/netinet/tcp.h
@@ -4,7 +4,7 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <sys/param.h>
-/*#include <sys/types.h> netinet/ip_var.h*/
+/*#include <sys/types.h> netinet/ip.h*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

diff --git a/lib/libx_c/netinet/tcp_debug.h b/lib/libx_c/netinet/tcp_debug.h
index 6385bb4..51c236a 100644 (file)
--- a/lib/libx_c/netinet/tcp_debug.h
+++ b/lib/libx_c/netinet/tcp_debug.h
@@ -1,10 +1,10 @@
 #ifndef _NETINET_TCP_DEBUG_H_
 #define _NETINET_TCP_DEBUG_H_
 
-/*#include <netinet/in_systm.h> netinet/tcpip.h*/
+/*#include <netinet/in_systm.h> netinet/tcp_var.h*/
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
-/*#include <sys/types.h> netinet/tcpip.h*/
+/*#include <sys/types.h> netinet/in_systm.h*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

diff --git a/lib/libx_c/netns/spp_var.h b/lib/libx_c/netns/spp_var.h
index 553ad76..30d1460 100644 (file)
--- a/lib/libx_c/netns/spp_var.h
+++ b/lib/libx_c/netns/spp_var.h
@@ -5,7 +5,7 @@
 #include <netns/ns_pcb.h>
 /*#include <netns/sp.h> netns/spidp.h*/
 #include <netns/spidp.h>
-/*#include <sys/types.h> netns/sp.h*/
+/*#include <sys/types.h> netns/ns_pcb.h*/
 
 /*
  * Copyright (c) 1984, 1985, 1986 Regents of the University of California.

diff --git a/lib/libx_c/ns/ns_addr.c b/lib/libx_c/ns/ns_addr.c
index 3c98891..2387daf 100644 (file)
--- a/lib/libx_c/ns/ns_addr.c
+++ b/lib/libx_c/ns/ns_addr.c
@@ -2,7 +2,7 @@
 #include <netns/ns.h>
 /*#include <stdio.h> net.h*/
 #include <strings.h>
-/*#include <sys/types.h> stdio.h*/
+/*#include <sys/types.h> net.h*/
 
 /*
  * Copyright (c) 1986 Regents of the University of California.

diff --git a/lib/libx_c/ns/ns_ntoa.c b/lib/libx_c/ns/ns_ntoa.c
index 5697dc2..d877876 100644 (file)
--- a/lib/libx_c/ns/ns_ntoa.c
+++ b/lib/libx_c/ns/ns_ntoa.c
@@ -1,7 +1,7 @@
 #include <net.h>
 #include <netns/ns.h>
 /*#include <stdio.h> net.h*/
-/*#include <sys/types.h> stdio.h*/
+/*#include <sys/types.h> net.h*/
 
 /*
  * Copyright (c) 1986 Regents of the University of California.

diff --git a/lib/libx_c/s.sh b/lib/libx_c/s.sh
index 5f740f9..7c672d3 100755 (executable)
--- a/lib/libx_c/s.sh
+++ b/lib/libx_c/s.sh
@@ -25,10 +25,11 @@ typedef char *va_list;
 EOF
 
 # removing useless extra header inclusions that are pulled in anyway
-all=`find . -name '*.[ch]' -print`
+all=`find . -type f -name '*.[ch]' -print`
 rm -f a
-find . -name '*.h' -print |\
+find . -type f -name '*.h' -print |\
 sed -e 's:\./::' |\
+LC_ALL=C sort |\
 while read i
 do
   echo "i=$i"

diff --git a/lib/libx_c/sys/fs.h b/lib/libx_c/sys/fs.h
index a75d8f5..1dfca04 100644 (file)
--- a/lib/libx_c/sys/fs.h
+++ b/lib/libx_c/sys/fs.h
@@ -3,7 +3,7 @@
 
 #include <sys/inode.h>
 /*#include <sys/param.h> sys/inode.h*/
-/*#include <sys/types.h> sys/param.h*/
+/*#include <sys/types.h> sys/inode.h*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

diff --git a/lib/libx_c/sys/ioctl.h b/lib/libx_c/sys/ioctl.h
index 9629bd4..cc087bf 100644 (file)
--- a/lib/libx_c/sys/ioctl.h
+++ b/lib/libx_c/sys/ioctl.h
@@ -4,7 +4,7 @@
 #include <net/if.h>
 /*#include <net/if_arp.h> net/if.h*/
 #include <net/route.h>
-/*#include <sys/types.h> net/if_arp.h*/
+/*#include <sys/types.h> net/if.h*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

diff --git a/lib/libx_c/sys/namei.h b/lib/libx_c/sys/namei.h
index 8930e95..33d9b51 100644 (file)
--- a/lib/libx_c/sys/namei.h
+++ b/lib/libx_c/sys/namei.h
@@ -2,7 +2,7 @@
 #define _SYS_NAMEI_H_
 
 #include <sys/dir.h>
-/*#include <sys/types.h> sys/uio.h*/
+/*#include <sys/types.h> sys/dir.h*/
 #include <sys/uio.h>
 
 /*

diff --git a/lib/libx_c/sys/select.c b/lib/libx_c/sys/select.c
index 0f39945..1d65bb8 100644 (file)
--- a/lib/libx_c/sys/select.c
+++ b/lib/libx_c/sys/select.c
@@ -3,10 +3,10 @@
 #include <sys/select.h>
 /*#include <sys/time.h> gen.h*/
 
+/*#include <sys/select.h>*/
 /*#include <sys/time.h>*/
-/*#include <sys/types.h>*/
 
-int select(n, r, w, e, t) fd_set *r, *w, *e; struct timeval *t; {
+int select(n, r, w, e, t) int n; fd_set *r; fd_set *w; fd_set *e; struct timeval *t; {
        write(2, "select()\n", 9);
        abort();
 }

diff --git a/lib/libx_c/sys/select.h b/lib/libx_c/sys/select.h
index bd4250d..d4424cd 100644 (file)
--- a/lib/libx_c/sys/select.h
+++ b/lib/libx_c/sys/select.h
@@ -3,6 +3,7 @@
 
 #include <strings.h>
 #include <sys/param.h>
+#include <sys/time.h>
 
 /*#include <sys/param.h>*/
 
@@ -33,4 +34,17 @@ typedef      struct fd_set {
 #define        FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
 #define FD_ZERO(p)     bzero((char *)(p), sizeof(*(p)))
 
+#ifndef KERNEL
+#ifndef __P
+#ifdef __STDC__
+#define __P(args) args
+#else
+#define __P(args) ()
+#endif
+#endif
+
+/* sys/select.c */
+int select __P((int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t));
+#endif
+
 #endif

diff --git a/lib/libx_c/sys/socketvar.h b/lib/libx_c/sys/socketvar.h
index c6585f3..c3e844b 100644 (file)
--- a/lib/libx_c/sys/socketvar.h
+++ b/lib/libx_c/sys/socketvar.h
@@ -5,7 +5,7 @@
 /*#include <sys/param.h> sys/mbuf.h*/
 #include <sys/protosw.h>
 #include <sys/time.h>
-/*#include <sys/types.h> sys/param.h*/
+/*#include <sys/types.h> sys/mbuf.h*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

diff --git a/lib/libx_c/sys/user.h b/lib/libx_c/sys/user.h
index 863ee7d..66ec4af 100644 (file)
--- a/lib/libx_c/sys/user.h
+++ b/lib/libx_c/sys/user.h
@@ -7,7 +7,7 @@
 #include <sys/resource.h>
 #include <sys/signal.h>
 /*#include <sys/time.h> sys/resource.h*/
-/*#include <sys/types.h> sys/param.h*/
+/*#include <sys/types.h> sys/dmap.h*/
 #include <vax/pcb.h>
 
 /*

diff --git a/lib/libx_c/sys/vmmac.h b/lib/libx_c/sys/vmmac.h
index d43f44d..01c5cf4 100644 (file)
--- a/lib/libx_c/sys/vmmac.h
+++ b/lib/libx_c/sys/vmmac.h
@@ -3,11 +3,11 @@
 
 /*#include <sys/param.h> vax/vmparam.h*/
 #include <sys/time.h>
-/*#include <sys/types.h> vax/vmparam.h*/
-/*#include <vax/machparam.h> vax/vmparam.h*/
+/*#include <sys/types.h> sys/param.h*/
+/*#include <vax/machparam.h> sys/param.h*/
 /*#include <vax/mtpr.h> vax/pcb.h*/
 #include <vax/pcb.h>
-/*#include <vax/pte.h> vax/vmparam.h*/
+/*#include <vax/pte.h> sys/param.h*/
 #include <vax/vmparam.h>
 
 /*