Subject: tcsh ar compile problem, wrong ar&ranlib manpages get installed (#215)
Index:	new/tcsh/sh.types.h, bin/ar/strmode.c, man/man{1,5}/Makefile 2.11BSD

Description:
	'ar' and 'tcsh' elicit compiler errors when being compiled.

	If either a toplevel system generation (cd /usr/src; make) or
	a reinstallation of the formatted manpages (cd /usr/src/man; make)
	is performed the wrong (obsolete) versions of the following manpages
	will be installed:
		
			ar(1),
			ranlib(1) and
			ar(5)

Repeat-By:
	Attempt to recompile 'ar': cd /usr/src/bin/ar; make

	Attempt to recompile 'tcsh': cd /usr/src/new/tcsh; make

	In both cases note the "type clash" and "Misplaced unsigned" errors
	from the compiler.

Fix:
	The changes are very small.  An earlier update (#202) added a
	couple new typedefs (for mode_t and pid_t) to the system but
	the 'ar' and 'tcsh' sources were not updated to remove their
	local definitions of those data types.  

	The new versions of 'ar' and 'ranlib' (updates #158 thru #176 - Feb 
	1994) follow the 4.3/4.4 manpage rule of keeping the manpage source
	with the program source.   The old 'ar' and 'ranlib' manpages 
	should have been removed from /usr/src/man/man{1,5} at that time.

	To apply this update:

		rm -f /usr/src/man/man1/ar.1
		rm -f /usr/src/man/man1/ranlib.1
		rm -f /usr/src/man/man5/ar.5

	Then save the patch below to a file (/tmp/foo) and:

		patch -p0 < /tmp/foo

	As always the complete collection of 2.11BSD patches is available
	via anonymous FTP to "ftp.iipo.gtegsc.com" (192.26.147.1) in
	the directory /pub/2.11BSD.

==================cut here
*** /VERSION.old	Tue Dec 27 15:58:35 1994
--- /VERSION	Thu Jan  5 20:09:47 1995
***************
*** 1,4 ****
! Current Patch Level: 214
  
  2.11 BSD
  ============
--- 1,4 ----
! Current Patch Level: 215
  
  2.11 BSD
  ============
*** /usr/src/bin/ar/strmode.c.old	Fri Sep 24 21:06:29 1993
--- /usr/src/bin/ar/strmode.c	Thu Jan  5 20:00:31 1995
***************
*** 32,38 ****
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)strmode.c	5.3 (Berkeley) 5/18/90";
  #endif /* LIBC_SCCS and not lint */
  
  #include <sys/types.h>
--- 32,38 ----
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)strmode.c	5.3.1 (2.11BSD GTE) 1/5/95";
  #endif /* LIBC_SCCS and not lint */
  
  #include <sys/types.h>
***************
*** 47,53 ****
  #define	S_IROTH	(S_IREAD >> 6)
  #define	S_IWOTH	(S_IWRITE >> 6)
  #define	S_IXOTH	(S_IEXEC >> 6)
- typedef	unsigned short mode_t;
  
  void
  strmode(mode, p)
--- 47,52 ----
*** /usr/src/man/man1/Makefile.old	Wed Jan 26 21:15:39 1994
--- /usr/src/man/man1/Makefile	Thu Jan  5 20:08:57 1995
***************
*** 16,22 ****
  #
  #
  MDIR=	/usr/man/cat1
! SRCS=	adb.1 addbib.1 apply.1 apropos.1 ar.1 as.1 at.1 atq.1 atrm.1 \
  	awk.1 basename.1 bc.1 biff.1 binmail.1 cal.1 calendar.1 cat.1 \
  	cb.1 cc.1 cd.1 checknr.1 chgrp.1 chmod.1 clear.1 cmp.1 col.1 \
  	colcrt.1 colrm.1 comm.1 compress.1 cp.1 csh.1 ctags.1 date.1 dc.1 \
--- 16,22 ----
  #
  #
  MDIR=	/usr/man/cat1
! SRCS=	adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \
  	awk.1 basename.1 bc.1 biff.1 binmail.1 cal.1 calendar.1 cat.1 \
  	cb.1 cc.1 cd.1 checknr.1 chgrp.1 chmod.1 clear.1 cmp.1 col.1 \
  	colcrt.1 colrm.1 comm.1 compress.1 cp.1 csh.1 ctags.1 date.1 dc.1 \
***************
*** 31,37 ****
  	more.1 mset.1 msgs.1 mt.1 mv.1 netstat.1 newaliases.1 nice.1 nm.1 
  SRCS1=	nroff.1 nslookup.1 od.1 pagesize.1 pc.1 pdx.1 pi.1 pix.1 \
  	plot.1 pmerge.1 pr.1 printenv.1 prof.1 ps.1 ptx.1 pwd.1 px.1 pxp.1 \
! 	pxref.1 quota.1 ranlib.1 ratfor.1 rcp.1 rdist.1 refer.1 rev.1 \
  	rlogin.1 rm.1 rmail.1 rmdir.1 roffbib.1 rsh.1 ruptime.1 rwho.1 \
  	sccs.1 script.1 sed.1 sendbug.1 sh.1 size.1 sleep.1 soelim.1 \
  	sort.1 sortbib.1 spell.1 spline.1 split.1 strcompact.1 strings.1 \
--- 31,37 ----
  	more.1 mset.1 msgs.1 mt.1 mv.1 netstat.1 newaliases.1 nice.1 nm.1 
  SRCS1=	nroff.1 nslookup.1 od.1 pagesize.1 pc.1 pdx.1 pi.1 pix.1 \
  	plot.1 pmerge.1 pr.1 printenv.1 prof.1 ps.1 ptx.1 pwd.1 px.1 pxp.1 \
! 	pxref.1 quota.1 ratfor.1 rcp.1 rdist.1 refer.1 rev.1 \
  	rlogin.1 rm.1 rmail.1 rmdir.1 roffbib.1 rsh.1 ruptime.1 rwho.1 \
  	sccs.1 script.1 sed.1 sendbug.1 sh.1 size.1 sleep.1 soelim.1 \
  	sort.1 sortbib.1 spell.1 spline.1 split.1 strcompact.1 strings.1 \
***************
*** 44,50 ****
  	vacation.1 vgrind.1 vi.1 vmstat.1 vwidth.1 w.1 wait.1 wall.1 wc.1 \
  	what.1 whatis.1 whereis.1 which.1 who.1 whoami.1 whois.1 window.1 \
  	write.1 xstr.1 yacc.1 yes.1
! OBJS1=	adb.0 addbib.0 apply.0 apropos.0 ar.0 as.0 at.0 atq.0 atrm.0 \
  	awk.0 basename.0 bc.0 biff.0 binmail.0 cal.0 calendar.0 cat.0 \
  	cb.0 cc.0 cd.0 checknr.0 chgrp.0 chmod.0 clear.0 cmp.0 col.0 \
  	colcrt.0 colrm.0 comm.0 compress.0 cp.0 csh.0 ctags.0 date.0 dc.0 \
--- 44,50 ----
  	vacation.1 vgrind.1 vi.1 vmstat.1 vwidth.1 w.1 wait.1 wall.1 wc.1 \
  	what.1 whatis.1 whereis.1 which.1 who.1 whoami.1 whois.1 window.1 \
  	write.1 xstr.1 yacc.1 yes.1
! OBJS1=	adb.0 addbib.0 apply.0 apropos.0 as.0 at.0 atq.0 atrm.0 \
  	awk.0 basename.0 bc.0 biff.0 binmail.0 cal.0 calendar.0 cat.0 \
  	cb.0 cc.0 cd.0 checknr.0 chgrp.0 chmod.0 clear.0 cmp.0 col.0 \
  	colcrt.0 colrm.0 comm.0 compress.0 cp.0 csh.0 ctags.0 date.0 dc.0 \
***************
*** 59,65 ****
  	more.0 mset.0 msgs.0 mt.0 mv.0 netstat.0 newaliases.0 nice.0 nm.0
  OBJS2=	nroff.0 nslookup.0 od.0 pagesize.0 pc.0 pdx.0 pi.0 pix.0 \
  	plot.0 pmerge.0 pr.0 printenv.0 prof.0 ps.0 ptx.0 pwd.0 px.0 pxp.0 \
! 	pxref.0 quota.0 ranlib.0 ratfor.0 rcp.0 rdist.0 refer.0 rev.0 \
  	rlogin.0 rm.0 rmail.0 rmdir.0 roffbib.0 rsh.0 ruptime.0 rwho.0 \
  	sccs.0 script.0 sed.0 sendbug.0 sh.0 size.0 sleep.0 soelim.0 \
  	sort.0 sortbib.0 spell.0 spline.0 split.0 strcompact.0 strings.0 \
--- 59,65 ----
  	more.0 mset.0 msgs.0 mt.0 mv.0 netstat.0 newaliases.0 nice.0 nm.0
  OBJS2=	nroff.0 nslookup.0 od.0 pagesize.0 pc.0 pdx.0 pi.0 pix.0 \
  	plot.0 pmerge.0 pr.0 printenv.0 prof.0 ps.0 ptx.0 pwd.0 px.0 pxp.0 \
! 	pxref.0 quota.0 ratfor.0 rcp.0 rdist.0 refer.0 rev.0 \
  	rlogin.0 rm.0 rmail.0 rmdir.0 roffbib.0 rsh.0 ruptime.0 rwho.0 \
  	sccs.0 script.0 sed.0 sendbug.0 sh.0 size.0 sleep.0 soelim.0 \
  	sort.0 sortbib.0 spell.0 spline.0 split.0 strcompact.0 strings.0 \
*** /usr/src/man/man5/Makefile.old	Thu Feb  4 21:00:15 1993
--- /usr/src/man/man5/Makefile	Thu Jan  5 20:10:57 1995
***************
*** 14,24 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4 (Berkeley) 7/9/88
  #
  MDIR=	/usr/man/cat5
  SRCS=	L-devices.5 L-dialcodes.5 L.aliases.5 L.cmds.5 L.sys.5 \
! 	USERFILE.5 a.out.5 acct.5 aliases.5 ar.5 core.5 dbx.5 \
  	dir.5 disktab.5 dtab.5 dump.5 fs.5 fstab.5 gettytab.5 \
  	group.5 hosts.5 map3270.5 mtab.5 networks.5 passwd.5 \
  	phones.5 plot.5 printcap.5 protocols.5 remote.5 resolver.5 \
--- 14,24 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4.1 (2.11BSD GTE) 1/5/95
  #
  MDIR=	/usr/man/cat5
  SRCS=	L-devices.5 L-dialcodes.5 L.aliases.5 L.cmds.5 L.sys.5 \
! 	USERFILE.5 a.out.5 acct.5 aliases.5 core.5 dbx.5 \
  	dir.5 disktab.5 dtab.5 dump.5 fs.5 fstab.5 gettytab.5 \
  	group.5 hosts.5 map3270.5 mtab.5 networks.5 passwd.5 \
  	phones.5 plot.5 printcap.5 protocols.5 remote.5 resolver.5 \
***************
*** 25,31 ****
  	services.5 shells.5 stack.5 tar.5 termcap.5 tp.5 ttys.5 types.5 \
  	tzfile.5 utmp.5 uuencode.5 vfont.5 vgrindefs.5
  OBJS=	L-devices.0 L-dialcodes.0 L.aliases.0 L.cmds.0 L.sys.0 \
! 	USERFILE.0 a.out.0 acct.0 aliases.0 ar.0 core.0 dbx.0 \
  	dir.0 disktab.0 dtab.0 dump.0 fs.0 fstab.0 gettytab.0 \
  	group.0 hosts.0 map3270.0 mtab.0 networks.0 passwd.0 \
  	phones.0 plot.0 printcap.0 protocols.0 remote.0 resolver.0 \
--- 25,31 ----
  	services.5 shells.5 stack.5 tar.5 termcap.5 tp.5 ttys.5 types.5 \
  	tzfile.5 utmp.5 uuencode.5 vfont.5 vgrindefs.5
  OBJS=	L-devices.0 L-dialcodes.0 L.aliases.0 L.cmds.0 L.sys.0 \
! 	USERFILE.0 a.out.0 acct.0 aliases.0 core.0 dbx.0 \
  	dir.0 disktab.0 dtab.0 dump.0 fs.0 fstab.0 gettytab.0 \
  	group.0 hosts.0 map3270.0 mtab.0 networks.0 passwd.0 \
  	phones.0 plot.0 printcap.0 protocols.0 remote.0 resolver.0 \
*** /usr/src/new/tcsh/sh.types.h.old	Tue Aug 20 12:13:08 1991
--- /usr/src/new/tcsh/sh.types.h	Thu Jan  5 18:28:48 1995
***************
*** 299,304 ****
--- 299,305 ----
   *** I am open to suggestions on how to do this correctly!
   ***/
  #ifndef POSIX
+ #ifndef	pdp11
  # ifndef _SIZE_T
  #  define _SIZE_T
     typedef int size_t;		/* As sun comments ??? : meaning I take it */
***************
*** 308,313 ****
--- 309,315 ----
  #  define _PID_T
     typedef int pid_t;
  # endif /* _PID_T */
+ #endif /* !pdp11 */
  
  # ifndef _SPEED_T
  #  define _SPEED_T
