Subject: Additional _PATH... definitions (#137) Index: include/{paths,utmp}.h, src/include/ 2.11BSD Description: Several missing _PATH defines were added to the paths.h and utmp.h files. Repeat-By: Observation. I was porting a software package from 2.11BSD to another system (BSD/386) and noticed that some pathnames needed to be defined differently and that the definitions were missing from 2.11BSD. Adding _PATH_WTMP, _PATH_SENDMAIL, _PATH_TMP, and _PATH_VARTMP were useful enough that they became part of the standard system. Fix: Unshar the file below into /tmp and then: patch -p0 < /tmp/3 patch -p0 < /tmp/4 patch -p0 < /tmp/17 patch -p0 < /tmp/18 -------------------------cut here-------------------------- #! /bin/sh # This is a shell archive, meaning: # 1. Remove everything above the #! /bin/sh line. # 2. Save the resulting text in a file. # 3. Execute the file with /bin/sh (not csh) to create: # 3 # 4 # 17 # 18 # This archive created: Fri Jul 2 20:20:19 1993 export PATH; PATH=/bin:/usr/bin:$PATH if test -f '3' then echo shar: "will not over-write existing file '3'" else sed 's/^X//' << \SHAR_EOF > '3' X*** /usr/include/paths.h.old Wed Apr 11 10:56:25 1990 X--- /usr/include/paths.h Tue May 11 21:47:18 1993 X*************** X*** 14,20 **** X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)pathnames.h 5.2 (Berkeley) 5/10/89 X */ X X #define _PATH_BSHELL "/bin/sh" X--- 14,20 ---- X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)pathnames.h 5.3 (2.11BSD) 5/10/93 X */ X X #define _PATH_BSHELL "/bin/sh" X*************** X*** 24,26 **** X--- 24,29 ---- X #define _PATH_TTY "/dev/tty" X #define _PATH_DEV "/dev" X #define _PATH_LASTLOG "/usr/adm/lastlog" X+ #define _PATH_TMP "/tmp/" X+ #define _PATH_VARTMP "/usr/tmp/" X+ #define _PATH_SENDMAIL "/usr/lib/sendmail" SHAR_EOF fi if test -f '4' then echo shar: "will not over-write existing file '4'" else sed 's/^X//' << \SHAR_EOF > '4' X*** /usr/include/utmp.h.old Mon May 15 10:08:00 1989 X--- /usr/include/utmp.h Sun May 9 16:24:46 1993 X*************** X*** 14,23 **** X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)utmp.h 5.5 (Berkeley) 3/7/89 X */ X X #define _PATH_UTMP "/etc/utmp" X X #define UT_NAMESIZE 15 X #define UT_LINESIZE 8 X--- 14,24 ---- X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)utmp.h 5.6 (2.11BSD) 5/9/93 X */ X X #define _PATH_UTMP "/etc/utmp" X+ #define _PATH_WTMP "/usr/adm/wtmp" X X #define UT_NAMESIZE 15 X #define UT_LINESIZE 8 SHAR_EOF fi if test -f '17' then echo shar: "will not over-write existing file '17'" else sed 's/^X//' << \SHAR_EOF > '17' X*** /usr/src/include/paths.h.old Wed Apr 11 10:56:25 1990 X--- /usr/src/include/paths.h Sun May 9 16:25:07 1993 X*************** X*** 14,20 **** X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)pathnames.h 5.2 (Berkeley) 5/10/89 X */ X X #define _PATH_BSHELL "/bin/sh" X--- 14,20 ---- X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)pathnames.h 5.3 (2.11BSD) 5/10/93 X */ X X #define _PATH_BSHELL "/bin/sh" X*************** X*** 24,26 **** X--- 24,28 ---- X #define _PATH_TTY "/dev/tty" X #define _PATH_DEV "/dev" X #define _PATH_LASTLOG "/usr/adm/lastlog" X+ #define _PATH_TMP "/tmp/" X+ #define _PATH_VARTMP "/usr/tmp/" SHAR_EOF fi if test -f '18' then echo shar: "will not over-write existing file '18'" else sed 's/^X//' << \SHAR_EOF > '18' X*** /usr/src/include/utmp.h.old Mon May 15 10:08:00 1989 X--- /usr/src/include/utmp.h Sun May 9 16:24:46 1993 X*************** X*** 14,23 **** X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)utmp.h 5.5 (Berkeley) 3/7/89 X */ X X #define _PATH_UTMP "/etc/utmp" X X #define UT_NAMESIZE 15 X #define UT_LINESIZE 8 X--- 14,24 ---- X * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED X * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. X * X! * @(#)utmp.h 5.6 (2.11BSD) 5/9/93 X */ X X #define _PATH_UTMP "/etc/utmp" X+ #define _PATH_WTMP "/usr/adm/wtmp" X X #define UT_NAMESIZE 15 X #define UT_LINESIZE 8 SHAR_EOF fi exit 0 # End of shell archive