Subject: /usr/src/include out of sync... (#155) Index: include/OLD, 2.11BSD Description: Several of the include files in /usr/src/include have not been updated in previous changes to files in /usr/include. If cd /usr/src/include make install had ever been done then incorrect files would be installed in the system. Repeat-By: Observation. I ran across this while adding the 'vmf.h' file from update number 154. Fix: Save this article to /tmp/foo and run patch (patch -p0 < /tmp/foo). =======================cut here=================== *** /usr/src/include/OLD/psout.h.old Sun May 27 21:50:13 1990 --- /usr/src/include/OLD/psout.h Sun Jan 3 02:02:06 1993 *************** *** 3,15 **** * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)psout.h 5.1 (Berkeley) 12/13/86 */ /* ! * psout: structure output by 'ps -r'. ! * Most fields are copies of the proc (p_...) or user (u_...) ! * structures for the given process, see & */ #ifndef makedev --- 3,14 ---- * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)psout.h 5.2 (2.11BSD GTE) 1/3/93 */ /* ! * psout: structure output by 'ps -U'. ! * Mostly the pre-processed /dev directory. */ #ifndef makedev *************** *** 20,26 **** dev_t o_ttyd; /* u_ttyd */ int o_flag; /* p_flag */ short o_pid; /* p_pid */ ! char o_tty[9]; /* 1st few chars of tty name with 'tty' stripped, if present */ char o_stat; /* p_stat */ short o_uid; /* p_uid */ char o_uname[UT_NAMESIZE]; /* login name of process owner */ --- 19,25 ---- dev_t o_ttyd; /* u_ttyd */ int o_flag; /* p_flag */ short o_pid; /* p_pid */ ! char o_tty[3]; /* 1st 2 chars of tty after 'tty' */ char o_stat; /* p_stat */ short o_uid; /* p_uid */ char o_uname[UT_NAMESIZE]; /* login name of process owner */ *** /usr/src/include/syscall.h.old Tue Jan 6 01:36:18 1987 --- /usr/src/include/syscall.h Mon Mar 15 18:20:43 1993 *************** *** 12,18 **** #define SYS_write 4 #define SYS_open 5 #define SYS_close 6 ! /* 7 is old: wait */ #define SYS_creat 8 #define SYS_link 9 #define SYS_unlink 10 --- 12,18 ---- #define SYS_write 4 #define SYS_open 5 #define SYS_close 6 ! #define SYS_wait4 7 #define SYS_creat 8 #define SYS_link 9 #define SYS_unlink 10 *************** *** 89,95 **** #define SYS_getpgrp 81 #define SYS_setpgrp 82 #define SYS_setitimer 83 ! #define SYS_wait 84 #define SYS_swapon 85 #define SYS_getitimer 86 #define SYS_gethostname 87 --- 89,95 ---- #define SYS_getpgrp 81 #define SYS_setpgrp 82 #define SYS_setitimer 83 ! /* 84 is old; wait,wait3 */ #define SYS_swapon 85 #define SYS_getitimer 86 #define SYS_gethostname 87 *************** *** 158,166 **** #define SYS_getsockname 150 /* ! * BSD2.10 special calls */ ! #define SYS_rtp 151 #define SYS_nostk 152 #define SYS_fetchi 153 #define SYS_ucall 154 --- 158,166 ---- #define SYS_getsockname 150 /* ! * BSD2.11 special calls */ ! /* 151 is unused */ #define SYS_nostk 152 #define SYS_fetchi 153 #define SYS_ucall 154 *** /usr/src/include/paths.h.old Sun May 9 16:25:07 1993 --- /usr/src/include/paths.h Tue May 11 21:47:18 1993 *************** *** 26,28 **** --- 26,29 ---- #define _PATH_LASTLOG "/usr/adm/lastlog" #define _PATH_TMP "/tmp/" #define _PATH_VARTMP "/usr/tmp/" + #define _PATH_SENDMAIL "/usr/lib/sendmail" *** /usr/src/include/Makefile.old Sun May 27 00:45:47 1990 --- /usr/src/include/Makefile Thu Oct 21 21:08:59 1993 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.15 (Berkeley) 86/10/13 # # Doing a make install builds /usr/include # --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.16 (2.11BSD GTE) 10/21/93 # # Doing a make install builds /usr/include # *************** *** 24,30 **** netdb.h nlist.h pcc.h pwd.h ranlib.h resolv.h setjmp.h \ sgtty.h short_names.h stab.h stdio.h string.h strings.h \ struct.h syscall.h sysexits.h time.h ttyent.h tzfile.h utmp.h \ ! varargs.h vfont.h LINKS= errno.h signal.h syslog.h MACHINE=pdp MACHDEP=${MACHINE} pdpif pdpuba pdpmba vaxuba --- 24,30 ---- netdb.h nlist.h pcc.h pwd.h ranlib.h resolv.h setjmp.h \ sgtty.h short_names.h stab.h stdio.h string.h strings.h \ struct.h syscall.h sysexits.h time.h ttyent.h tzfile.h utmp.h \ ! varargs.h vfont.h vmf.h LINKS= errno.h signal.h syslog.h MACHINE=pdp MACHDEP=${MACHINE} pdpif pdpuba pdpmba vaxuba