projects
/
unix-history
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4088382
)
file reorg, pathnames.h, paths.h
author
Keith Bostic
<bostic@ucbvax.Berkeley.EDU>
Fri, 12 May 1989 05:41:31 +0000
(21:41 -0800)
committer
Keith Bostic
<bostic@ucbvax.Berkeley.EDU>
Fri, 12 May 1989 05:41:31 +0000
(21:41 -0800)
SCCS-vsn: usr.bin/write/Makefile 5.2
SCCS-vsn: usr.bin/write/write.c 4.15
SCCS-vsn: games/atc/Makefile 5.3
SCCS-vsn: games/atc/input.c 5.3
SCCS-vsn: games/atc/tunable.c 5.2
SCCS-vsn: old/lisp/doctor/Makefile 4.9
SCCS-vsn: old/boggle/Makefile 5.11
SCCS-vsn: games/factor/Makefile 5.3
SCCS-vsn: old/compact/Makefile 4.7
SCCS-vsn: old/talk/Makefile 5.2
SCCS-vsn: old/more/Makefile 5.8
SCCS-vsn: old/more/more.c 5.21
SCCS-vsn: old/ar11/Makefile 5.2
SCCS-vsn: old/ar11/ar11.c 4.6
SCCS-vsn: old/tk/tk.c 4.3
SCCS-vsn: usr.bin/rev/Makefile 5.2
SCCS-vsn: old/hostid/Makefile 5.2
SCCS-vsn: old/tp/Makefile 4.5
SCCS-vsn: old/tp/tp0.c 4.2
SCCS-vsn: sbin/badsect/Makefile 5.2
SCCS-vsn: sbin/badsect/badsect.c 5.6
SCCS-vsn: usr.sbin/chown/Makefile 5.2
SCCS-vsn: sbin/clri/Makefile 5.2
SCCS-vsn: sbin/clri/clri.c 2.4
SCCS-vsn: old/dcheck/Makefile 5.2
SCCS-vsn: sbin/disklabel/Makefile 5.3
SCCS-vsn: sbin/disklabel/disklabel.c 5.16
SCCS-vsn: sbin/disklabel/pathnames.h 5.2
SCCS-vsn: sbin/dump/dumprmt.c 5.6
SCCS-vsn: sbin/dump/Makefile 5.9
SCCS-vsn: sbin/dump/main.c 5.8
SCCS-vsn: sbin/dump/dump.h 5.6
SCCS-vsn: sbin/dump/pathnames.h 5.2
SCCS-vsn: sbin/dumpfs/Makefile 5.2
SCCS-vsn: sbin/fastboot/Makefile 5.3
SCCS-vsn: sbin/fastboot/fastboot.sh 5.4
SCCS-vsn: sbin/fastboot/fasthalt.sh 5.2
SCCS-vsn: sbin/fsck/Makefile 5.11
SCCS-vsn: sbin/fsdb/Makefile 5.2
SCCS-vsn: sbin/reboot/halt.c 5.6
SCCS-vsn: sbin/icheck/Makefile 5.2
SCCS-vsn: sbin/ifconfig/Makefile 5.2
SCCS-vsn: old/init/Makefile 5.2
SCCS-vsn: sbin/init/Makefile 5.2
SCCS-vsn: old/init/pathnames.h 5.2
SCCS-vsn: sbin/init/pathnames.h 5.2
SCCS-vsn: sbin/mknod/Makefile 5.2
SCCS-vsn: sbin/mount/Makefile 5.2
SCCS-vsn: sbin/ncheck/Makefile 5.2
SCCS-vsn: sbin/newfs/Makefile 7.5
SCCS-vsn: sbin/newfs/newfs.c 6.17
SCCS-vsn: sbin/quotacheck/Makefile 5.2
SCCS-vsn: sbin/reboot/Makefile 5.2
SCCS-vsn: sbin/restore/Makefile 5.7
SCCS-vsn: sbin/restore/dirs.c 5.7
SCCS-vsn: sbin/restore/main.c 5.6
SCCS-vsn: sbin/restore/tape.c 5.16
SCCS-vsn: sbin/route/Makefile 5.2
SCCS-vsn: sbin/savecore/Makefile 5.2
SCCS-vsn: sbin/shutdown/Makefile 5.2
SCCS-vsn: sbin/swapon/Makefile 5.2
SCCS-vsn: sbin/tunefs/Makefile 5.2
SCCS-vsn: sbin/umount/Makefile 5.2
SCCS-vsn: usr.sbin/vipw/Makefile 5.2
SCCS-vsn: old/mkpasswd/Makefile 5.2
SCCS-vsn: sbin/savecore/savecore.c 5.16
SCCS-vsn: sbin/shutdown/pathnames.h 5.2
SCCS-vsn: sbin/tunefs/tunefs.c 5.8
SCCS-vsn: sbin/XNSrouted/Makefile 5.10
SCCS-vsn: sbin/XNSrouted/main.c 5.7
SCCS-vsn: usr.sbin/ac/Makefile 5.2
SCCS-vsn: usr.sbin/accton/Makefile 5.2
SCCS-vsn: usr.sbin/arp/Makefile 5.2
SCCS-vsn: usr.sbin/arp/arp.c 5.10
SCCS-vsn: usr.bin/at/at/Makefile 5.8
SCCS-vsn: usr.bin/at/at/at.c 5.9
SCCS-vsn: usr.bin/at/atq/atq.c 5.6
SCCS-vsn: usr.bin/at/atrm/atrm.c 5.5
SCCS-vsn: usr.bin/at/atrun/atrun.c 5.7
SCCS-vsn: usr.sbin/chroot/chroot.c 5.5
SCCS-vsn: usr.sbin/cron/Makefile 5.3
SCCS-vsn: usr.sbin/cron/pathnames.h 5.2
SCCS-vsn: usr.sbin/config/Makefile 5.9
SCCS-vsn: usr.sbin/diskpart/Makefile 5.2
SCCS-vsn: sbin/dmesg/Makefile 5.2
SCCS-vsn: sbin/dmesg/pathnames.h 5.2
SCCS-vsn: old/gettable/Makefile 5.2
SCCS-vsn: old/htable/Makefile 5.8
SCCS-vsn: old/implog/Makefile 5.8
SCCS-vsn: old/implogd/implogd.c 5.8
SCCS-vsn: old/implog/pathnames.h 5.2
SCCS-vsn: usr.sbin/inetd/Makefile 5.3
SCCS-vsn: usr.sbin/inetd/inetd.c 5.16
SCCS-vsn: usr.sbin/inetd/pathnames.h 5.2
SCCS-vsn: usr.sbin/iostat/Makefile 5.2
SCCS-vsn: usr.sbin/iostat/iostat.c 4.16
SCCS-vsn: usr.sbin/kgmon/Makefile 5.2
SCCS-vsn: usr.sbin/kgmon/kgmon.c 5.9
SCCS-vsn: usr.sbin/lpr/Makefile 5.11
SCCS-vsn: usr.sbin/lpr/lpc/cmds.c 5.5
SCCS-vsn: usr.sbin/lpr/common_source/displayq.c 5.9
SCCS-vsn: usr.sbin/lpr/common_source/lp.local.h 5.4
SCCS-vsn: usr.sbin/lpr/lpd/lpd.c 5.7
SCCS-vsn: usr.sbin/lpr/lpr/lpr.c 5.6
SCCS-vsn: usr.sbin/lpr/common_source/printcap.c 5.4
SCCS-vsn: usr.sbin/lpr/lpd/printjob.c 5.7
SCCS-vsn: usr.sbin/lpr/lpd/recvjob.c 5.8
SCCS-vsn: usr.sbin/lpr/common_source/rmjob.c 5.5
SCCS-vsn: usr.sbin/lpr/common_source/startdaemon.c 5.4
SCCS-vsn: old/vfilters/Makefile 6.7
SCCS-vsn: usr.sbin/mkproto/Makefile 5.2
SCCS-vsn: old/symorder/Makefile 5.2
SCCS-vsn: sbin/routed/Makefile 5.9
SCCS-vsn: sbin/routed/main.c 5.18
SCCS-vsn: sbin/routed/trace.c 5.9
SCCS-vsn: sbin/routed/pathnames.h 5.2
SCCS-vsn: usr.sbin/rwhod/Makefile 5.2
SCCS-vsn: usr.sbin/rwhod/rwhod.c 5.13
SCCS-vsn: usr.sbin/sendmail/src/Makefile 5.14
SCCS-vsn: usr.sbin/sendmail/src/conf.c 5.19
SCCS-vsn: libexec/mail.local/mail.local.8 6.2
SCCS-vsn: usr.sbin/sendmail/mailstats/mailstats.c 5.6
SCCS-vsn: bin/rmail/rmail.c 4.13
SCCS-vsn: usr.sbin/syslogd/Makefile 5.2
SCCS-vsn: usr.sbin/syslogd/pathnames.h 5.2
SCCS-vsn: usr.sbin/syslogd/syslogd.c 5.32
SCCS-vsn: usr.sbin/timed/timed/Makefile 5.8
SCCS-vsn: usr.sbin/timed/timed/pathnames.h 5.2
SCCS-vsn: usr.sbin/timed/timed/timed.c 2.16
SCCS-vsn: usr.sbin/edquota/Makefile 5.2
SCCS-vsn: usr.sbin/edquota/edquota.c 5.9
SCCS-vsn: usr.sbin/edquota/pathnames.h 5.2
SCCS-vsn: old/enpload/Makefile 5.3
SCCS-vsn: old/dlmpcc/Makefile 5.5
SCCS-vsn: old/dlmpcc/dlmpcc.c 5.4
SCCS-vsn: old/arff/Makefile 5.2
SCCS-vsn: old/arff/arff.c 5.7
SCCS-vsn: old/flcopy/flcopy.c 5.2
SCCS-vsn: usr.sbin/bad144/Makefile 5.2
SCCS-vsn: usr.sbin/bad144/bad144.c 5.16
SCCS-vsn: old/rxformat/Makefile 5.2
SCCS-vsn: old/rxformat/rxformat.c 5.3
SCCS-vsn: old/mkhosts/Makefile 5.3
SCCS-vsn: usr.sbin/repquota/Makefile 5.2
SCCS-vsn: usr.sbin/quotaon/Makefile 5.2
SCCS-vsn: usr.sbin/quotaon/quotaon.c 5.5
SCCS-vsn: usr.sbin/trpt/Makefile 5.2
SCCS-vsn: usr.sbin/trpt/trpt.c 5.8
SCCS-vsn: usr.sbin/trsp/Makefile 5.2
SCCS-vsn: usr.sbin/trsp/trsp.c 6.5
SCCS-vsn: libexec/comsat/Makefile 5.2
SCCS-vsn: libexec/comsat/comsat.c 5.15
SCCS-vsn: libexec/comsat/pathnames.h 5.2
SCCS-vsn: libexec/fingerd/Makefile 5.2
SCCS-vsn: libexec/fingerd/pathnames.h 5.2
SCCS-vsn: libexec/tftpd/Makefile 5.9
SCCS-vsn: libexec/getty/Makefile 5.5
SCCS-vsn: libexec/getty/pathnames.h 5.2
SCCS-vsn: libexec/rexecd/Makefile 5.2
SCCS-vsn: libexec/rexecd/pathnames.h 5.2
SCCS-vsn: libexec/rexecd/rexecd.c 5.9
SCCS-vsn: usr.sbin/rmt/Makefile 5.2
SCCS-vsn: libexec/talkd/Makefile 5.9
SCCS-vsn: libexec/talkd/announce.c 5.7
SCCS-vsn: libexec/talkd/process.c 5.8
SCCS-vsn: libexec/talkd/talkd.c 5.5
SCCS-vsn: libexec/telnetd/Makefile 5.4
SCCS-vsn: libexec/telnetd/pathnames.h 5.2
SCCS-vsn: libexec/telnetd/telnetd.c 5.37
SCCS-vsn: usr.sbin/update/Makefile 5.2
SCCS-vsn: usr.sbin/update/update.c 4.4
SCCS-vsn: libexec/makekey/Makefile 5.2
SCCS-vsn: libexec/getNAME/Makefile 5.2
SCCS-vsn: old/pcc/c2.vax/Makefile 4.8
SCCS-vsn: old/pcc/c2.tahoe/Makefile 1.5
SCCS-vsn: old/pcc/ccom.vax/Makefile 1.20
SCCS-vsn: old/pcc/ccom.tahoe/Makefile 1.12
SCCS-vsn: old/athena/Makefile 5.2
SCCS-vsn: old/sh/pathnames.h 5.1
SCCS-vsn: old/tar/pathnames.h 5.1
SCCS-vsn: games/atc/pathnames.h 5.1
SCCS-vsn: games/dm/pathnames.h 5.1
SCCS-vsn: lib/libterm/pathnames.h 5.1
SCCS-vsn: libexec/ftpd/pathnames.h 5.1
SCCS-vsn: usr.sbin/update/pathnames.h 5.1
SCCS-vsn: old/ar11/pathnames.h 5.1
SCCS-vsn: old/more/pathnames.h 5.1
SCCS-vsn: old/tp/pathnames.h 5.1
SCCS-vsn: usr.bin/ar/pathnames.h 5.1
SCCS-vsn: old/dbx/pathnames.h 5.1
SCCS-vsn: usr.bin/error/pathnames.h 5.1
SCCS-vsn: usr.bin/gprof/pathnames.h 5.1
SCCS-vsn: old/lex/pathnames.h 5.1
SCCS-vsn: usr.bin/m4/pathnames.h 5.1
SCCS-vsn: usr.bin/xstr/pathnames.h 5.1
SCCS-vsn: old/yacc/pathnames.h 5.1
SCCS-vsn: sbin/restore/pathnames.h 5.1
SCCS-vsn: usr.bin/bc/pathnames.h 5.1
SCCS-vsn: old/crypt/pathnames.h 5.1
SCCS-vsn: usr.bin/diction/diction/pathnames.h 5.1
SCCS-vsn: usr.bin/diff/diff/pathnames.h 5.1
SCCS-vsn: usr.bin/ex/pathnames.h 5.1
SCCS-vsn: usr.bin/locate/locate/pathnames.h 5.1
SCCS-vsn: usr.bin/finger/pathnames.h 5.1
SCCS-vsn: usr.bin/ftp/pathnames.h 5.1
SCCS-vsn: usr.bin/grep/egrep/pathnames.h 5.1
SCCS-vsn: usr.bin/lastcomm/pathnames.h 5.1
SCCS-vsn: usr.bin/learn/learn/pathnames.h 5.1
SCCS-vsn: usr.bin/look/pathnames.h 5.1
SCCS-vsn: usr.bin/man/pathnames.h 5.1
SCCS-vsn: usr.bin/more/pathnames.h 5.1
SCCS-vsn: usr.bin/ptx/pathnames.h 5.1
SCCS-vsn: usr.bin/rdist/pathnames.h 5.1
SCCS-vsn: old/refer/refer/pathnames.h 5.1
SCCS-vsn: usr.bin/rsh/pathnames.h 5.1
SCCS-vsn: usr.bin/sccs/pathnames.h 5.1
SCCS-vsn: libexec/bugfiler/pathnames.h 5.1
SCCS-vsn: usr.bin/sort/pathnames.h 5.1
SCCS-vsn: old/sysline/pathnames.h 5.1
SCCS-vsn: old/tbl/pathnames.h 5.1
SCCS-vsn: usr.bin/tcopy/pathnames.h 5.1
SCCS-vsn: usr.bin/tip/pathnames.h 5.1
SCCS-vsn: usr.bin/units/pathnames.h 5.1
SCCS-vsn: usr.bin/uucp/includes/pathnames.h 5.1
SCCS-vsn: usr.bin/xsend/common_source/pathnames.h 5.1
SCCS-vsn: old/arff/pathnames.h 5.1
SCCS-vsn: usr.bin/at/at/pathnames.h 5.1
SCCS-vsn: old/dlmpcc/pathnames.h 5.1
SCCS-vsn: usr.sbin/lpr/common_source/pathnames.h 5.1
SCCS-vsn: usr.sbin/quotaon/pathnames.h 5.1
SCCS-vsn: old/rxformat/pathnames.h 5.1
SCCS-vsn: old/adb/common_source/pathnames.h 5.1
SCCS-vsn: old/roff/nroff/pathnames.h 5.1
SCCS-vsn: old/roff/troff/pathnames.h 5.1
SCCS-vsn: usr.bin/f77/pass1.vax/pathnames.h 5.1
235 files changed:
usr/src/bin/rmail/rmail.c
patch
|
blob
|
blame
|
history
usr/src/games/atc/Makefile
patch
|
blob
|
blame
|
history
usr/src/games/atc/input.c
patch
|
blob
|
blame
|
history
usr/src/games/atc/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/games/atc/tunable.c
patch
|
blob
|
blame
|
history
usr/src/games/dm/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/games/factor/Makefile
patch
|
blob
|
blame
|
history
usr/src/lib/libterm/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/libexec/bugfiler/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/libexec/comsat/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/comsat/comsat.c
patch
|
blob
|
blame
|
history
usr/src/libexec/comsat/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/libexec/fingerd/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/fingerd/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/libexec/ftpd/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/libexec/getNAME/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/getty/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/getty/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/libexec/mail.local/mail.local.8
patch
|
blob
|
blame
|
history
usr/src/libexec/makekey/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/rexecd/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/rexecd/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/libexec/rexecd/rexecd.c
patch
|
blob
|
blame
|
history
usr/src/libexec/talkd/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/talkd/announce.c
patch
|
blob
|
blame
|
history
usr/src/libexec/talkd/process.c
patch
|
blob
|
blame
|
history
usr/src/libexec/talkd/talkd.c
patch
|
blob
|
blame
|
history
usr/src/libexec/telnetd/Makefile
patch
|
blob
|
blame
|
history
usr/src/libexec/telnetd/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/libexec/telnetd/telnetd.c
patch
|
blob
|
blame
|
history
usr/src/libexec/tftpd/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/adb/common_source/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/ar11/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/ar11/ar11.c
patch
|
blob
|
blame
|
history
usr/src/old/ar11/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/arff/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/arff/arff.c
patch
|
blob
|
blame
|
history
usr/src/old/arff/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/athena/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/boggle/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/compact/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/crypt/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/dbx/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/dcheck/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/dlmpcc/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/dlmpcc/dlmpcc.c
patch
|
blob
|
blame
|
history
usr/src/old/dlmpcc/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/enpload/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/flcopy/flcopy.c
patch
|
blob
|
blame
|
history
usr/src/old/gettable/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/hostid/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/htable/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/implog/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/implog/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/old/implogd/implogd.c
patch
|
blob
|
blame
|
history
usr/src/old/init/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/init/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/old/lex/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/lisp/doctor/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/mkhosts/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/mkpasswd/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/more/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/more/more.c
patch
|
blob
|
blame
|
history
usr/src/old/more/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/pcc/c2.tahoe/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/pcc/c2.vax/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/pcc/ccom.tahoe/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/pcc/ccom.vax/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/refer/refer/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/roff/nroff/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/roff/troff/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/rxformat/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/rxformat/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/rxformat/rxformat.c
patch
|
blob
|
blame
|
history
usr/src/old/sh/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/symorder/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/sysline/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/talk/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/tar/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/tbl/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/tk/tk.c
patch
|
blob
|
blame
|
history
usr/src/old/tp/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/tp/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/old/tp/tp0.c
patch
|
blob
|
blame
|
history
usr/src/old/vfilters/Makefile
patch
|
blob
|
blame
|
history
usr/src/old/yacc/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/sbin/XNSrouted/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/XNSrouted/main.c
patch
|
blob
|
blame
|
history
usr/src/sbin/badsect/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/badsect/badsect.c
patch
|
blob
|
blame
|
history
usr/src/sbin/clri/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/clri/clri.c
patch
|
blob
|
blame
|
history
usr/src/sbin/disklabel/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/disklabel/disklabel.c
patch
|
blob
|
blame
|
history
usr/src/sbin/disklabel/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/sbin/dmesg/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/dmesg/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/sbin/dump/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/dump/dump.h
patch
|
blob
|
blame
|
history
usr/src/sbin/dump/dumprmt.c
patch
|
blob
|
blame
|
history
usr/src/sbin/dump/main.c
patch
|
blob
|
blame
|
history
usr/src/sbin/dump/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/sbin/dumpfs/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/fastboot/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/fastboot/fastboot.sh
patch
|
blob
|
blame
|
history
usr/src/sbin/fastboot/fasthalt.sh
patch
|
blob
|
blame
|
history
usr/src/sbin/fsck/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/fsdb/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/icheck/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/ifconfig/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/init/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/init/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/sbin/mknod/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/mount/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/ncheck/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/newfs/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/newfs/newfs.c
patch
|
blob
|
blame
|
history
usr/src/sbin/quotacheck/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/reboot/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/reboot/halt.c
patch
|
blob
|
blame
|
history
usr/src/sbin/restore/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/restore/dirs.c
patch
|
blob
|
blame
|
history
usr/src/sbin/restore/main.c
patch
|
blob
|
blame
|
history
usr/src/sbin/restore/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/sbin/restore/tape.c
patch
|
blob
|
blame
|
history
usr/src/sbin/route/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/routed/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/routed/main.c
patch
|
blob
|
blame
|
history
usr/src/sbin/routed/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/sbin/routed/trace.c
patch
|
blob
|
blame
|
history
usr/src/sbin/savecore/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/savecore/savecore.c
patch
|
blob
|
blame
|
history
usr/src/sbin/shutdown/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/shutdown/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/sbin/swapon/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/tunefs/Makefile
patch
|
blob
|
blame
|
history
usr/src/sbin/tunefs/tunefs.c
patch
|
blob
|
blame
|
history
usr/src/sbin/umount/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.bin/ar/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/at/at/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.bin/at/at/at.c
patch
|
blob
|
blame
|
history
usr/src/usr.bin/at/at/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/at/atq/atq.c
patch
|
blob
|
blame
|
history
usr/src/usr.bin/at/atrm/atrm.c
patch
|
blob
|
blame
|
history
usr/src/usr.bin/at/atrun/atrun.c
patch
|
blob
|
blame
|
history
usr/src/usr.bin/bc/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/diction/diction/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/diff/diff/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/error/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/ex/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/f77/pass1.vax/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/finger/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/ftp/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/gprof/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/grep/egrep/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/lastcomm/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/learn/learn/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/locate/locate/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/look/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/m4/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/man/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/more/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/ptx/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/rdist/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/rev/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.bin/rsh/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/sccs/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/sort/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/tcopy/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/tip/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/units/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/uucp/includes/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/write/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.bin/write/write.c
patch
|
blob
|
blame
|
history
usr/src/usr.bin/xsend/common_source/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.bin/xstr/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.sbin/ac/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/accton/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/arp/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/arp/arp.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/bad144/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/bad144/bad144.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/chown/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/chroot/chroot.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/config/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/cron/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/cron/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/diskpart/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/edquota/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/edquota/edquota.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/edquota/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/inetd/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/inetd/inetd.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/inetd/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/iostat/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/iostat/iostat.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/kgmon/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/kgmon/kgmon.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/common_source/displayq.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/common_source/lp.local.h
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/common_source/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.sbin/lpr/common_source/printcap.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/common_source/rmjob.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/common_source/startdaemon.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/lpc/cmds.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/lpd/lpd.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/lpd/printjob.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/lpd/recvjob.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/lpr/lpr/lpr.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/mkproto/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/quotaon/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/quotaon/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.sbin/quotaon/quotaon.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/repquota/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/rmt/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/rwhod/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/rwhod/rwhod.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/sendmail/mailstats/mailstats.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/sendmail/src/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/sendmail/src/conf.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/syslogd/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/syslogd/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/syslogd/syslogd.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/timed/timed/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/timed/timed/pathnames.h
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/timed/timed/timed.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/trpt/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/trpt/trpt.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/trsp/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/trsp/trsp.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/update/Makefile
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/update/pathnames.h
[new file with mode: 0644]
patch
|
blob
usr/src/usr.sbin/update/update.c
patch
|
blob
|
blame
|
history
usr/src/usr.sbin/vipw/Makefile
patch
|
blob
|
blame
|
history
diff --git
a/usr/src/bin/rmail/rmail.c
b/usr/src/bin/rmail/rmail.c
index
6a575ad
..
7b8513d
100644
(file)
--- a/
usr/src/bin/rmail/rmail.c
+++ b/
usr/src/bin/rmail/rmail.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)rmail.c 4.1
2
(Berkeley) %G%";
+static char sccsid[] = "@(#)rmail.c 4.1
3
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-33,11
+33,12
@@
static char sccsid[] = "@(#)rmail.c 4.12 (Berkeley) %G%";
* It calls sendmail giving it a -f option built from these lines.
*/
* It calls sendmail giving it a -f option built from these lines.
*/
-#include <stdio.h>
#include <sysexits.h>
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sysexits.h>
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#include <stdio.h>
+#include <paths.h>
# include "conf.h"
typedef char bool;
# include "conf.h"
typedef char bool;
@@
-49,8
+50,6
@@
extern char *rindex();
char *Domain = "UUCP"; /* Default "Domain" */
char *Domain = "UUCP"; /* Default "Domain" */
-#define MAILER "/usr/lib/sendmail"
-
main(argc, argv)
int argc;
char **argv;
main(argc, argv)
int argc;
char **argv;
@@
-88,7
+87,7
@@
main(argc, argv)
}
from[0] = '\0';
fsys[0] = '\0';
}
from[0] = '\0';
fsys[0] = '\0';
- (void) strcpy(ufrom,
"/dev/null"
);
+ (void) strcpy(ufrom,
_PATH_DEVNULL
);
for (position = 0;; position = ftell(stdin)) {
(void) fgets(lbuf, sizeof lbuf, stdin);
for (position = 0;; position = ftell(stdin)) {
(void) fgets(lbuf, sizeof lbuf, stdin);
@@
-146,7
+145,7
@@
main(argc, argv)
* that case below.
*/
i = 0;
* that case below.
*/
i = 0;
- args[i++] =
MAILER
;
+ args[i++] =
_PATH_SENDMAIL
;
args[i++] = "-oee"; /* no errors, just status */
args[i++] = "-odq"; /* queue it, don't try to deliver */
args[i++] = "-oi"; /* ignore '.' on a line by itself */
args[i++] = "-oee"; /* no errors, just status */
args[i++] = "-odq"; /* queue it, don't try to deliver */
args[i++] = "-oi"; /* ignore '.' on a line by itself */
@@
-221,7
+220,7
@@
main(argc, argv)
close(pipefd[1]);
dup2(pipefd[0], 0);
}
close(pipefd[1]);
dup2(pipefd[0], 0);
}
- execv(
MAILER
, args);
- fprintf(stderr, "Exec of %s failed!\n",
MAILER
);
+ execv(
_PATH_SENDMAIL
, args);
+ fprintf(stderr, "Exec of %s failed!\n",
_PATH_SENDMAIL
);
exit(EX_OSERR);
}
exit(EX_OSERR);
}
diff --git
a/usr/src/games/atc/Makefile
b/usr/src/games/atc/Makefile
index
7c9a2d6
..
ca676c8
100644
(file)
--- a/
usr/src/games/atc/Makefile
+++ b/
usr/src/games/atc/Makefile
@@
-14,9
+14,9
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
#
-CFLAGS= -O -DBSD
-DDEST=\"${DESTDIR}/usr/games/lib/atc/\"
+CFLAGS= -O -DBSD
YFLAGS= -d
LIBC= /lib/libc.a
LIBS= -ll -lm -lcurses -ltermcap
YFLAGS= -d
LIBC= /lib/libc.a
LIBS= -ll -lm -lcurses -ltermcap
diff --git
a/usr/src/games/atc/input.c
b/usr/src/games/atc/input.c
index
ddf7062
..
e60ead9
100644
(file)
--- a/
usr/src/games/atc/input.c
+++ b/
usr/src/games/atc/input.c
@@
-8,10
+8,11
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)input.c 5.
2
(Berkeley) %G%";
+static char sccsid[] = "@(#)input.c 5.
3
(Berkeley) %G%";
#endif not lint
#include "include.h"
#endif not lint
#include "include.h"
+#include "pathnames.h"
#define MAXRULES 6
#define MAXDEPTH 15
#define MAXRULES 6
#define MAXDEPTH 15
@@
-298,7
+299,7
@@
gettoken()
execl(shell, base, 0);
}
else
execl(shell, base, 0);
}
else
- execl(
"/bin/sh"
, "sh", 0);
+ execl(
_PATH_BSHELL
, "sh", 0);
exit(0); /* oops */
}
exit(0); /* oops */
}
diff --git a/usr/src/games/atc/pathnames.h
b/usr/src/games/atc/pathnames.h
new file mode 100644
(file)
index 0000000..
7e4b0b4
--- /dev/null
+++ b/
usr/src/games/atc/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_SPECIAL_DIR "/usr/games/lib/atc/"
diff --git
a/usr/src/games/atc/tunable.c
b/usr/src/games/atc/tunable.c
index
52241f7
..
c723fce
100644
(file)
--- a/
usr/src/games/atc/tunable.c
+++ b/
usr/src/games/atc/tunable.c
@@
-7,13
+7,15
@@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
+#include "pathnames.h"
+
/*
* SPECIAL_DIR - Where the special files are kept.
* Change this to whatever you want. Be sure to have to path end
* with a '/', like "/usr/games/lib/atc/".
*/
/*
* SPECIAL_DIR - Where the special files are kept.
* Change this to whatever you want. Be sure to have to path end
* with a '/', like "/usr/games/lib/atc/".
*/
-char SPECIAL_DIR[] =
DEST
;
+char SPECIAL_DIR[] =
_PATH_SPECIAL_DIR
;
/*
* NUM_SCORES - Number of scores that are kept track of.
/*
* NUM_SCORES - Number of scores that are kept track of.
diff --git a/usr/src/games/dm/pathnames.h
b/usr/src/games/dm/pathnames.h
new file mode 100644
(file)
index 0000000..
af8a9e8
--- /dev/null
+++ b/
usr/src/games/dm/pathnames.h
@@ -0,0
+1,23
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_HIDE "/usr/games/hide/"
+#define _PATH_CONFIG "/etc/dm.config"
+#define _PATH_NOGAMES "/usr/games/nogames"
+#define _PATH_LOG "/var/log/dm.log"
diff --git
a/usr/src/games/factor/Makefile
b/usr/src/games/factor/Makefile
index
84c1464
..
620572b
100644
(file)
--- a/
usr/src/games/factor/Makefile
+++ b/
usr/src/games/factor/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-43,6
+43,8
@@
depend: ${SRCS}
install: ${MAN}
install -s -o bin -g bin -m 755 factor primes ${DESTDIR}/usr/games
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
install: ${MAN}
install -s -o bin -g bin -m 755 factor primes ${DESTDIR}/usr/games
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+ rm -f ${DESTDIR}/usr/man/cat6/primes.0
+ ln ${DESTDIR}/usr/man/cat6/${MAN} ${DESTDIR}/usr/man/cat6/primes.0
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git a/usr/src/lib/libterm/pathnames.h
b/usr/src/lib/libterm/pathnames.h
new file mode 100644
(file)
index 0000000..
96b96cd
--- /dev/null
+++ b/
usr/src/lib/libterm/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_DEF ".termcap /usr/share/misc/termcap"
diff --git a/usr/src/libexec/bugfiler/pathnames.h
b/usr/src/libexec/bugfiler/pathnames.h
new file mode 100644
(file)
index 0000000..
1282dcd
--- /dev/null
+++ b/
usr/src/libexec/bugfiler/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define MAIL_CMD "/usr/lib/sendmail -i -t -F \"Bugs Bunny\" -f owner-bugs"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/BUG_XXXXXX";
diff --git
a/usr/src/libexec/comsat/Makefile
b/usr/src/libexec/comsat/Makefile
index
acf3180
..
6a1ae10
100644
(file)
--- a/
usr/src/libexec/comsat/Makefile
+++ b/
usr/src/libexec/comsat/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 comsat ${DESTDIR}/
etc/comsat
+ install -s -o bin -g bin -m 755 comsat ${DESTDIR}/
usr/libexec
install -c -o bin -g bin -m 444 comsat.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 comsat.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/libexec/comsat/comsat.c
b/usr/src/libexec/comsat/comsat.c
index
8074c4c
..
9cf79a8
100644
(file)
--- a/
usr/src/libexec/comsat/comsat.c
+++ b/
usr/src/libexec/comsat/comsat.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)comsat.c 5.1
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)comsat.c 5.1
5
(Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
#endif /* not lint */
#include <sys/param.h>
@@
-165,7
+165,7
@@
notify(utp, offset)
register struct utmp *utp;
off_t offset;
{
register struct utmp *utp;
off_t offset;
{
- static char tty[20] =
"/dev/"
;
+ static char tty[20] =
_PATH_DEV
;
struct sgttyb gttybuf;
FILE *tp;
char name[sizeof (utmp[0].ut_name) + 1];
struct sgttyb gttybuf;
FILE *tp;
char name[sizeof (utmp[0].ut_name) + 1];
diff --git
a/usr/src/libexec/comsat/pathnames.h
b/usr/src/libexec/comsat/pathnames.h
index
f17764b
..
ab2c322
100644
(file)
--- a/
usr/src/libexec/comsat/pathnames.h
+++ b/
usr/src/libexec/comsat/pathnames.h
@@
-14,7
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_MAIL "/usr/spool/mail"
+#include <paths.h>
+
+#define _PATH_MAIL "/var/spool/mail"
diff --git
a/usr/src/libexec/fingerd/Makefile
b/usr/src/libexec/fingerd/Makefile
index
51776f5
..
3c2a9e8
100644
(file)
--- a/
usr/src/libexec/fingerd/Makefile
+++ b/
usr/src/libexec/fingerd/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 fingerd ${DESTDIR}/
etc/fingerd
+ install -s -o bin -g bin -m 755 fingerd ${DESTDIR}/
usr/libexec
install -c -o bin -g bin -m 444 fingerd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 fingerd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/libexec/fingerd/pathnames.h
b/usr/src/libexec/fingerd/pathnames.h
index
092ce70
..
c73923f
100644
(file)
--- a/
usr/src/libexec/fingerd/pathnames.h
+++ b/
usr/src/libexec/fingerd/pathnames.h
@@
-14,7
+14,7
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_FINGER "/usr/
ucb
/finger"
+#define _PATH_FINGER "/usr/
bin
/finger"
diff --git a/usr/src/libexec/ftpd/pathnames.h
b/usr/src/libexec/ftpd/pathnames.h
new file mode 100644
(file)
index 0000000..
704a229
--- /dev/null
+++ b/
usr/src/libexec/ftpd/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_FTPUSERS "/etc/ftpusers"
diff --git
a/usr/src/libexec/getNAME/Makefile
b/usr/src/libexec/getNAME/Makefile
index
38abc5a
..
617f55a
100644
(file)
--- a/
usr/src/libexec/getNAME/Makefile
+++ b/
usr/src/libexec/getNAME/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 getNAME ${DESTDIR}/usr/lib
/getNAME
+ install -s -o bin -g bin -m 755 getNAME ${DESTDIR}/usr/lib
exec
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git
a/usr/src/libexec/getty/Makefile
b/usr/src/libexec/getty/Makefile
index
8344147
..
2dab0cd
100644
(file)
--- a/
usr/src/libexec/getty/Makefile
+++ b/
usr/src/libexec/getty/Makefile
@@
-14,13
+14,13
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
4
(Berkeley) %G%
+# @(#)Makefile 5.
5
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= main.c init.c subr.c gettytab.c get_date.c
OBJS= main.o init.o subr.o gettytab.o get_date.o
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= main.c init.c subr.c gettytab.c get_date.c
OBJS= main.o init.o subr.o gettytab.o get_date.o
-MAN= getty.0
+MAN= getty.0
gettytab.0
all: getty
all: getty
@@
-37,9
+37,10
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 getty ${DESTDIR}/
etc/getty
+ install -s -o bin -g bin -m 755 getty ${DESTDIR}/
usr/libexec
install -c -o bin -g bin -m 444 gettytab ${DESTDIR}/etc/gettytab
install -c -o bin -g bin -m 444 gettytab ${DESTDIR}/etc/gettytab
- install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
+ install -c -o bin -g bin -m 444 gettytab.0 ${DESTDIR}/usr/man/cat5
+ install -c -o bin -g bin -m 444 getty.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git
a/usr/src/libexec/getty/pathnames.h
b/usr/src/libexec/getty/pathnames.h
index
525fdf9
..
b383570
100644
(file)
--- a/
usr/src/libexec/getty/pathnames.h
+++ b/
usr/src/libexec/getty/pathnames.h
@@
-14,9
+14,10
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_CONSOLE "/dev/console"
+#include <paths.h>
+
#define _PATH_GETTYTAB "/etc/gettytab"
#define _PATH_GETTYTAB "/etc/gettytab"
-#define _PATH_LOGIN "/bin/login"
+#define _PATH_LOGIN "/
usr/
bin/login"
diff --git
a/usr/src/libexec/mail.local/mail.local.8
b/usr/src/libexec/mail.local/mail.local.8
index
d98c51b
..
097fa90
100644
(file)
--- a/
usr/src/libexec/mail.local/mail.local.8
+++ b/
usr/src/libexec/mail.local/mail.local.8
@@
-1,18
+1,18
@@
-.\" @(#)mail.local.8 6.
1
(Berkeley) %G%
+.\" @(#)mail.local.8 6.
2
(Berkeley) %G%
.\"
.\"
-.TH
BIN
MAIL 1 ""
+.TH
DELIVER
MAIL 1 ""
.AT 3
.SH NAME
.AT 3
.SH NAME
-
bin
mail \- send or receive mail among users
+
deliver
mail \- send or receive mail among users
.SH SYNOPSIS
.SH SYNOPSIS
-.B
/bin/
mail
+.B
deliver
mail
[
.B +
] [
.B \-i
] [ person ] ...
.br
[
.B +
] [
.B \-i
] [ person ] ...
.br
-.B
/bin/
mail
+.B
deliver
mail
.B "[ + ]"
[
.B \-i
.B "[ + ]"
[
.B \-i
@@
-24,9
+24,7
@@
file
Note: This is the old version 7 UNIX system mail program. The default
.I mail
command is described in
Note: This is the old version 7 UNIX system mail program. The default
.I mail
command is described in
-.IR Mail (1),
-and its binary is in the directory
-.IR /usr/ucb .
+.IR Mail (1).
.PP
.I mail
with no argument prints a user's mail, message-by-message,
.PP
.I mail
with no argument prints a user's mail, message-by-message,
@@
-99,7
+97,7
@@
is usually a user name recognized by
To denote a recipient on a remote system, prefix
.I person
by the system name and exclamation mark (see
To denote a recipient on a remote system, prefix
.I person
by the system name and exclamation mark (see
-.IR uucp (1
C
)).
+.IR uucp (1)).
.PP
The
.B \-f
.PP
The
.B \-f
@@
-123,7
+121,7
@@
mbox saved mail
dead.letter unmailable text
.br
.SH "SEE ALSO"
dead.letter unmailable text
.br
.SH "SEE ALSO"
-Mail(1), write(1), uucp(1
C), uux(1C
), xsend(1), sendmail(8)
+Mail(1), write(1), uucp(1
), uux(1
), xsend(1), sendmail(8)
.SH BUGS
Race conditions sometimes result in a failure to remove a lock file.
.PP
.SH BUGS
Race conditions sometimes result in a failure to remove a lock file.
.PP
diff --git
a/usr/src/libexec/makekey/Makefile
b/usr/src/libexec/makekey/Makefile
index
32d530e
..
0ea14fa
100644
(file)
--- a/
usr/src/libexec/makekey/Makefile
+++ b/
usr/src/libexec/makekey/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 makekey ${DESTDIR}/usr/lib
/makekey
+ install -s -o bin -g bin -m 755 makekey ${DESTDIR}/usr/lib
exec
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/libexec/rexecd/Makefile
b/usr/src/libexec/rexecd/Makefile
index
ddec41d
..
dbe9503
100644
(file)
--- a/
usr/src/libexec/rexecd/Makefile
+++ b/
usr/src/libexec/rexecd/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 rexecd ${DESTDIR}/
etc/rexecd
+ install -s -o bin -g bin -m 755 rexecd ${DESTDIR}/
usr/libexec
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/libexec/rexecd/pathnames.h
b/usr/src/libexec/rexecd/pathnames.h
index
a5d1a2e
..
f5fcba9
100644
(file)
--- a/
usr/src/libexec/rexecd/pathnames.h
+++ b/
usr/src/libexec/rexecd/pathnames.h
@@
-14,8
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_BSHELL "/bin/sh"
-#define _PATH_DEFPATH "PATH=:/usr/ucb:/bin:/usr/bin"
+#include <paths.h>
+
+#define _PATH_DEFPATH "PATH=:/bin:/usr/bin"
diff --git
a/usr/src/libexec/rexecd/rexecd.c
b/usr/src/libexec/rexecd/rexecd.c
index
cc270cd
..
062f979
100644
(file)
--- a/
usr/src/libexec/rexecd/rexecd.c
+++ b/
usr/src/libexec/rexecd/rexecd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)rexecd.c 5.
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)rexecd.c 5.
9
(Berkeley) %G%";
#endif /* not lint */
#include <sys/ioctl.h>
#endif /* not lint */
#include <sys/ioctl.h>
@@
-95,7
+95,7
@@
doit(f, fromp)
(void) signal(SIGQUIT, SIG_DFL);
(void) signal(SIGTERM, SIG_DFL);
#ifdef DEBUG
(void) signal(SIGQUIT, SIG_DFL);
(void) signal(SIGTERM, SIG_DFL);
#ifdef DEBUG
- { int t = open(
"/dev/tty"
, 2);
+ { int t = open(
_PATH_TTY
, 2);
if (t >= 0) {
ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
if (t >= 0) {
ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
diff --git
a/usr/src/libexec/talkd/Makefile
b/usr/src/libexec/talkd/Makefile
index
3e8459a
..
715b1ab
100644
(file)
--- a/
usr/src/libexec/talkd/Makefile
+++ b/
usr/src/libexec/talkd/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
8
(Berkeley) %G%
+# @(#)Makefile 5.
9
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-37,7
+37,7
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 talkd ${DESTDIR}/
et
c/ntalkd
+ install -s -o bin -g bin -m 755 talkd ${DESTDIR}/
usr/libexe
c/ntalkd
install -c -o bin -g bin -m 444 talkd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 talkd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/libexec/talkd/announce.c
b/usr/src/libexec/talkd/announce.c
index
2fca711
..
c54904b
100644
(file)
--- a/
usr/src/libexec/talkd/announce.c
+++ b/
usr/src/libexec/talkd/announce.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)announce.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)announce.c 5.
7
(Berkeley) %G%";
#endif /* not lint */
#include <sys/types.h>
#endif /* not lint */
#include <sys/types.h>
@@
-30,6
+30,7
@@
static char sccsid[] = "@(#)announce.c 5.6 (Berkeley) %G%";
#include <syslog.h>
#include <protocols/talkd.h>
#include <syslog.h>
#include <protocols/talkd.h>
+#include <paths.h>
extern int errno;
extern char hostname[];
extern int errno;
extern char hostname[];
@@
-83,7
+84,7
@@
announce_proc(request, remote_machine)
FILE *tf;
struct stat stbuf;
FILE *tf;
struct stat stbuf;
- (void)sprintf(full_tty, "
/dev/%s"
, request->r_tty);
+ (void)sprintf(full_tty, "
%s/%s", _PATH_DEV
, request->r_tty);
if (access(full_tty, 0) != 0)
return (FAILED);
if ((tf = fopen(full_tty, "w")) == NULL)
if (access(full_tty, 0) != 0)
return (FAILED);
if ((tf = fopen(full_tty, "w")) == NULL)
diff --git
a/usr/src/libexec/talkd/process.c
b/usr/src/libexec/talkd/process.c
index
69616ba
..
ae73218
100644
(file)
--- a/
usr/src/libexec/talkd/process.c
+++ b/
usr/src/libexec/talkd/process.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)process.c 5.
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)process.c 5.
8
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-35,6
+35,7
@@
static char sccsid[] = "@(#)process.c 5.7 (Berkeley) %G%";
#include <netinet/in.h>
#include <protocols/talkd.h>
#include <netinet/in.h>
#include <protocols/talkd.h>
+#include <paths.h>
char *strcpy();
CTL_MSG *find_request();
char *strcpy();
CTL_MSG *find_request();
@@
-173,7
+174,7
@@
find_user(name, tty)
}
#define SCMPN(a, b) strncmp(a, b, sizeof (a))
status = NOT_HERE;
}
#define SCMPN(a, b) strncmp(a, b, sizeof (a))
status = NOT_HERE;
- (void) strcpy(ftty,
"/dev/"
);
+ (void) strcpy(ftty,
_PATH_DEV
);
while (fread((char *) &ubuf, sizeof ubuf, 1, fd) == 1)
if (SCMPN(ubuf.ut_name, name) == 0) {
if (*tty == '\0') {
while (fread((char *) &ubuf, sizeof ubuf, 1, fd) == 1)
if (SCMPN(ubuf.ut_name, name) == 0) {
if (*tty == '\0') {
diff --git
a/usr/src/libexec/talkd/talkd.c
b/usr/src/libexec/talkd/talkd.c
index
a24cd41
..
7bac47e
100644
(file)
--- a/
usr/src/libexec/talkd/talkd.c
+++ b/
usr/src/libexec/talkd/talkd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)talkd.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)talkd.c 5.
5
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-37,6
+37,7
@@
static char sccsid[] = "@(#)talkd.c 5.4 (Berkeley) %G%";
#include <syslog.h>
#include <protocols/talkd.h>
#include <syslog.h>
#include <protocols/talkd.h>
+#include <paths.h>
CTL_MSG request;
CTL_RESPONSE response;
CTL_MSG request;
CTL_RESPONSE response;
@@
-67,8
+68,8
@@
main(argc, argv)
syslog(LOG_ERR, "gethostname: %m");
_exit(1);
}
syslog(LOG_ERR, "gethostname: %m");
_exit(1);
}
- if (chdir(
"/dev"
) < 0) {
- syslog(LOG_ERR, "chdir:
/dev: %m"
);
+ if (chdir(
_PATH_DEV
) < 0) {
+ syslog(LOG_ERR, "chdir:
%s: %m", _PATH_DEV
);
_exit(1);
}
if (argc > 1 && strcmp(argv[1], "-d") == 0)
_exit(1);
}
if (argc > 1 && strcmp(argv[1], "-d") == 0)
diff --git
a/usr/src/libexec/telnetd/Makefile
b/usr/src/libexec/telnetd/Makefile
index
4990215
..
1f43888
100644
(file)
--- a/
usr/src/libexec/telnetd/Makefile
+++ b/
usr/src/libexec/telnetd/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
3
(Berkeley) %G%
+# @(#)Makefile 5.
4
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 telnetd ${DESTDIR}/usr/libexec
/telnetd
+ install -s -o bin -g bin -m 755 telnetd ${DESTDIR}/usr/libexec
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/libexec/telnetd/pathnames.h
b/usr/src/libexec/telnetd/pathnames.h
index
cbe5531
..
ebad627
100644
(file)
--- a/
usr/src/libexec/telnetd/pathnames.h
+++ b/
usr/src/libexec/telnetd/pathnames.h
@@
-14,7
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_LOGIN "/bin/login"
+#include <paths.h>
+
+#define _PATH_LOGIN "/usr/bin/login"
diff --git
a/usr/src/libexec/telnetd/telnetd.c
b/usr/src/libexec/telnetd/telnetd.c
index
09f0eb4
..
b08a95d
100644
(file)
--- a/
usr/src/libexec/telnetd/telnetd.c
+++ b/
usr/src/libexec/telnetd/telnetd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)telnetd.c 5.3
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)telnetd.c 5.3
7
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-291,7
+291,7
@@
doit(f, who)
gotpty:
dup2(f, 0);
line[strlen("/dev/")] = 't';
gotpty:
dup2(f, 0);
line[strlen("/dev/")] = 't';
- t = open(
"/dev/tty"
, O_RDWR);
+ t = open(
_PATH_TTY
, O_RDWR);
if (t >= 0) {
ioctl(t, TIOCNOTTY, 0);
close(t);
if (t >= 0) {
ioctl(t, TIOCNOTTY, 0);
close(t);
diff --git
a/usr/src/libexec/tftpd/Makefile
b/usr/src/libexec/tftpd/Makefile
index
40e0607
..
fdf3c89
100644
(file)
--- a/
usr/src/libexec/tftpd/Makefile
+++ b/
usr/src/libexec/tftpd/Makefile
@@
-14,9
+14,9
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
8
(Berkeley) %G%
+# @(#)Makefile 5.
9
(Berkeley) %G%
#
#
-VPATH= ../../u
cb
/tftp
+VPATH= ../../u
sr.bin
/tftp
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= tftpd.c tftpsubs.c
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= tftpd.c tftpsubs.c
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 tftpd ${DESTDIR}/
etc/tftpd
+ install -s -o bin -g bin -m 755 tftpd ${DESTDIR}/
usr/libexec
install -c -o bin -g bin -m 444 tftpd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 tftpd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git a/usr/src/old/adb/common_source/pathnames.h
b/usr/src/old/adb/common_source/pathnames.h
new file mode 100644
(file)
index 0000000..
4deb4df
--- /dev/null
+++ b/
usr/src/old/adb/common_source/pathnames.h
@@ -0,0
+1,21
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_SCRIPTS "/usr/libdata/adb"
+#define _PATH_BSHELL "/bin/sh"
diff --git
a/usr/src/old/ar11/Makefile
b/usr/src/old/ar11/Makefile
index
5458f4c
..
5a757a2
100644
(file)
--- a/
usr/src/old/ar11/Makefile
+++ b/
usr/src/old/ar11/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 ar11 ${DESTDIR}/usr/
bin
+ install -s -o bin -g bin -m 755 ar11 ${DESTDIR}/usr/
ucb
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
diff --git
a/usr/src/old/ar11/ar11.c
b/usr/src/old/ar11/ar11.c
index
e70a7c7
..
9e86632
100644
(file)
--- a/
usr/src/old/ar11/ar11.c
+++ b/
usr/src/old/ar11/ar11.c
@@
-1,10
+1,12
@@
-static char *sccsid = "@(#)ar11.c 4.
5
(Berkeley) %G%";
+static char *sccsid = "@(#)ar11.c 4.
6
(Berkeley) %G%";
/* ar11 - archiver for PDP-11 formatted archives */
/* ar11 - archiver for PDP-11 formatted archives */
-#include <signal.h>
-#include <stdio.h>
#include <sys/types.h>
#include <sys/types.h>
+#include <sys/signal.h>
#include <sys/stat.h>
#include <sys/stat.h>
+#include <stdio.h>
+#include "pathnames.h"
+
#define ARMAG ((short)0177545)
struct ar_hdr {
char ar_name[14];
#define ARMAG ((short)0177545)
struct ar_hdr {
char ar_name[14];
@@
-256,7
+258,7
@@
pcmd()
mcmd()
{
mcmd()
{
- static char name2[] =
"/tmp/v2XXXXX"
;
+ static char name2[] =
_PATH_TMP2
;
init();
if(getaf())
init();
if(getaf())
@@
-298,7
+300,7
@@
tcmd()
init()
{
init()
{
- static char name0[] =
"/tmp/vXXXXX"
;
+ static char name0[] =
_PATH_TMP0
;
static short mbuf = fixshort(ARMAG);
tfnam = mktemp(name0);
static short mbuf = fixshort(ARMAG);
tfnam = mktemp(name0);
@@
-537,7
+539,7
@@
match()
bamatch()
{
bamatch()
{
- static char name1[] =
"/tmp/v1XXXXX"
;
+ static char name1[] =
_PATH_TMP1
;
register f;
switch(bastate) {
register f;
switch(bastate) {
diff --git a/usr/src/old/ar11/pathnames.h
b/usr/src/old/ar11/pathnames.h
new file mode 100644
(file)
index 0000000..
4571548
--- /dev/null
+++ b/
usr/src/old/ar11/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_TMP0 "/tmp/vXXXXX"
+#define _PATH_TMP1 "/tmp/v1XXXXX"
+#define _PATH_TMP2 "/tmp/v2XXXXX"
diff --git
a/usr/src/old/arff/Makefile
b/usr/src/old/arff/Makefile
index
713ec41
..
63ddd99
100644
(file)
--- a/
usr/src/old/arff/Makefile
+++ b/
usr/src/old/arff/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-41,8
+41,8
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 arff ${DESTDIR}/
etc/arff
- install -s -o bin -g bin -m 755
arff ${DESTDIR}/etc/flcopy
+ install -s -o bin -g bin -m 755 arff ${DESTDIR}/
usr/sbin
+ install -s -o bin -g bin -m 755
flcopy ${DESTDIR}/usr/sbin
install -c -o bin -g bin -m 444 arff.0 ${DESTDIR}/usr/man/cat8/vax
rm -f ${DESTDIR}/usr/man/cat8/vax/flcopy.0
ln ${DESTDIR}/usr/man/cat8/vax/arff.0 ${DESTDIR}/usr/man/cat8/vax/flcopy.0
install -c -o bin -g bin -m 444 arff.0 ${DESTDIR}/usr/man/cat8/vax
rm -f ${DESTDIR}/usr/man/cat8/vax/flcopy.0
ln ${DESTDIR}/usr/man/cat8/vax/arff.0 ${DESTDIR}/usr/man/cat8/vax/flcopy.0
diff --git
a/usr/src/old/arff/arff.c
b/usr/src/old/arff/arff.c
index
3aca7a5
..
98533f2
100644
(file)
--- a/
usr/src/old/arff/arff.c
+++ b/
usr/src/old/arff/arff.c
@@
-11,15
+11,16
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)arff.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)arff.c 5.
7
(Berkeley) %G%";
#endif not lint
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
#endif not lint
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
-#include <signal.h>
-#include <stdio.h>
+#include <sys/signal.h>
#include <sys/file.h>
#include <sys/file.h>
+#include <stdio.h>
+#include "pathnames.h"
#define dbprintf printf
#define dbprintf printf
@@
-110,7
+111,7
@@
struct rt_ent *rt_curend[RT_DIRSIZE];
int floppydes;
int dirdirty;
char *rt_last;
int floppydes;
int dirdirty;
char *rt_last;
-char *defdev =
"/dev/floppy"
;
+char *defdev =
_PATH_FLOPPY
;
char *opt = "vfbcm";
char *opt = "vfbcm";
@@
-374,7
+375,7
@@
rt_init()
if (stat(defdev, &sb) >= 0 && (sb.st_mode & S_IFMT) == S_IFREG)
goto ignore;
if (stat(defdev, &sb) >= 0 && (sb.st_mode & S_IFMT) == S_IFREG)
goto ignore;
- tty = open(
"/dev/tty"
, O_RDWR);
+ tty = open(
_PATH_TTY
, O_RDWR);
#define SURE "Are you sure you want to clobber the floppy? "
(void) write(tty, SURE, sizeof (SURE));
(void) read(tty, response, sizeof (response));
#define SURE "Are you sure you want to clobber the floppy? "
(void) write(tty, SURE, sizeof (SURE));
(void) read(tty, response, sizeof (response));
diff --git a/usr/src/old/arff/pathnames.h
b/usr/src/old/arff/pathnames.h
new file mode 100644
(file)
index 0000000..
f77debc
--- /dev/null
+++ b/
usr/src/old/arff/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_FLOPPY "/dev/floppy"
diff --git
a/usr/src/old/athena/Makefile
b/usr/src/old/athena/Makefile
index
ebfac5c
..
e551dfa
100644
(file)
--- a/
usr/src/old/athena/Makefile
+++ b/
usr/src/old/athena/Makefile
@@
-14,15
+14,16
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
DESTDIR=
SUBDIR= kdestroy kinit klist ksrvtgt ksu
all clean cleandir depend install lint tags: FRC
#
DESTDIR=
SUBDIR= kdestroy kinit klist ksrvtgt ksu
all clean cleandir depend install lint tags: FRC
- -for i in ${SUBDIR}; do \
- (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} $@); done
+ @-for i in ${SUBDIR}; do \
+ (echo "==> $$i"; \
+ cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} $@); done
${SUBDIR}: FRC
cd $@; make ${MFLAGS} DESTDIR=${DESTDIR}
${SUBDIR}: FRC
cd $@; make ${MFLAGS} DESTDIR=${DESTDIR}
diff --git
a/usr/src/old/boggle/Makefile
b/usr/src/old/boggle/Makefile
index
9fcf800
..
62446a3
100644
(file)
--- a/
usr/src/old/boggle/Makefile
+++ b/
usr/src/old/boggle/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.1
0
(Berkeley) %G%
+# @(#)Makefile 5.1
1
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-24,7
+24,7
@@
MAN= boggle.0
all: boggle bogdict
bogdict: comp sfile
all: boggle bogdict
bogdict: comp sfile
- sed -f sfile /usr/dict/words | uniq | ./comp >bogdict
+ sed -f sfile /usr/
share/
dict/words | uniq | ./comp >bogdict
boggle comp: ${LIBC}
${CC} -o $@ ${CFLAGS} $@.c
boggle comp: ${LIBC}
${CC} -o $@ ${CFLAGS} $@.c
diff --git
a/usr/src/old/compact/Makefile
b/usr/src/old/compact/Makefile
index
bb92c3e
..
dcdd26a
100644
(file)
--- a/
usr/src/old/compact/Makefile
+++ b/
usr/src/old/compact/Makefile
@@
-3,7
+3,7
@@
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
-# @(#)Makefile 4.
6
(Berkeley) %G%
+# @(#)Makefile 4.
7
(Berkeley) %G%
#
DESTDIR=
CFLAGS=-O
#
DESTDIR=
CFLAGS=-O
@@
-12,11
+12,6
@@
OBJS= compact.o tree.o uncompact.o
MDIR= /usr/man/cat.old
LINKS=
MDIR= /usr/man/cat.old
LINKS=
-.SUFFIXES: .1 .0
-
-.1.0:
- /usr/man/manroff $*.1 > $*.0
-
all: compact uncompact
compact: compact.o tree.o
all: compact uncompact
compact: compact.o tree.o
@@
-37,27
+32,11
@@
install: compact.0
clean:
rm -f compact uncompact ${OBJS}
clean:
rm -f compact uncompact ${OBJS}
+cleandir: clean
+ rm -f ${MAN} tags .depend
+
depend:
mkdep ${SRCS}
tags:
ctags ${SRCS}
depend:
mkdep ${SRCS}
tags:
ctags ${SRCS}
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-compact.o: compact.c /usr/include/strings.h compact.h /usr/include/sys/param.h
-compact.o: /usr/include/sys/types.h /usr/include/signal.h
-compact.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
-compact.o: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/stdio.h
-tree.o: tree.c compact.h /usr/include/sys/param.h /usr/include/sys/types.h
-tree.o: /usr/include/signal.h /usr/include/machine/trap.h
-tree.o: /usr/include/machine/machparam.h /usr/include/sys/stat.h
-tree.o: /usr/include/sys/dir.h /usr/include/stdio.h
-uncompact.o: uncompact.c compact.h /usr/include/sys/param.h
-uncompact.o: /usr/include/sys/types.h /usr/include/signal.h
-uncompact.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
-uncompact.o: /usr/include/sys/stat.h /usr/include/sys/dir.h
-uncompact.o: /usr/include/stdio.h /usr/include/strings.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/usr/src/old/crypt/pathnames.h
b/usr/src/old/crypt/pathnames.h
new file mode 100644
(file)
index 0000000..
f90189b
--- /dev/null
+++ b/
usr/src/old/crypt/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_MAKEKEY "/usr/libexec/makekey"
diff --git a/usr/src/old/dbx/pathnames.h
b/usr/src/old/dbx/pathnames.h
new file mode 100644
(file)
index 0000000..
008283a
--- /dev/null
+++ b/
usr/src/old/dbx/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/dbxXXXXXX"
+
diff --git
a/usr/src/old/dcheck/Makefile
b/usr/src/old/dcheck/Makefile
index
eafbcb6
..
c3c326d
100644
(file)
--- a/
usr/src/old/dcheck/Makefile
+++ b/
usr/src/old/dcheck/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 dcheck ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 dcheck ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/old/dlmpcc/Makefile
b/usr/src/old/dlmpcc/Makefile
index
3561c87
..
c9317d1
100644
(file)
--- a/
usr/src/old/dlmpcc/Makefile
+++ b/
usr/src/old/dlmpcc/Makefile
@@
-14,12
+14,13
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
4
(Berkeley) %G%
+# @(#)Makefile 5.
5
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= dlmpcc.c
MAN= dlmpcc.0 mpcc.0 mpcctab.0
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= dlmpcc.c
MAN= dlmpcc.0 mpcc.0 mpcctab.0
+FILES= mpcc32 mpccdl mpcctab
all: dlmpcc
all: dlmpcc
@@
-36,8
+37,8
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} dlmpcc.c
install: ${MAN}
mkdep -p ${CFLAGS} dlmpcc.c
install: ${MAN}
- install -s -o bin -g bin -m 755 dlmpcc ${DESTDIR}/
etc/dlmpcc
- install -c -o bin -g bin -m 444 firmware/* ${DESTDIR}/etc
+ install -s -o bin -g bin -m 755 dlmpcc ${DESTDIR}/
usr/sbin
+ (cd firmware; install -c -o bin -g bin -m 444 ${FILES} ${DESTDIR}/usr/libdata)
install -c -o bin -g bin -m 444 dlmpcc.0 ${DESTDIR}/usr/man/cat8/tahoe
install -c -o bin -g bin -m 444 mpcc.0 ${DESTDIR}/usr/man/cat4/tahoe
install -c -o bin -g bin -m 444 mpcctab.0 ${DESTDIR}/usr/man/cat4/tahoe
install -c -o bin -g bin -m 444 dlmpcc.0 ${DESTDIR}/usr/man/cat8/tahoe
install -c -o bin -g bin -m 444 mpcc.0 ${DESTDIR}/usr/man/cat4/tahoe
install -c -o bin -g bin -m 444 mpcctab.0 ${DESTDIR}/usr/man/cat4/tahoe
diff --git
a/usr/src/old/dlmpcc/dlmpcc.c
b/usr/src/old/dlmpcc/dlmpcc.c
index
0b25191
..
0360aeb
100644
(file)
--- a/
usr/src/old/dlmpcc/dlmpcc.c
+++ b/
usr/src/old/dlmpcc/dlmpcc.c
@@
-25,27
+25,25
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)dlmpcc.c 5.
3
(Berkeley) %G%";
+static char sccsid[] = "@(#)dlmpcc.c 5.
4
(Berkeley) %G%";
#endif /* not lint */
/*
* MPCC Download and Configuration Program.
*/
#endif /* not lint */
/*
* MPCC Download and Configuration Program.
*/
-#include <stdio.h>
-#include <ctype.h>
-#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/ioctl.h>
-#include <errno.h>
-
#include <sys/types.h>
#include <tahoevba/mpreg.h>
#include <sys/types.h>
#include <tahoevba/mpreg.h>
+#include <fcntl.h>
+#include <errno.h>
#include <stdio.h>
#include <stdio.h>
-
+#include <ctype.h>
#include "scnhdr.h"
#include "scnhdr.h"
+#include "pathnames.h"
#define MAXMPCC 16
#define MAXMPCC 16
-char *MPCCTAB =
"/etc/mpcctab"
;
+char *MPCCTAB =
_PATH_MPCCTAB
;
int resetflg = 0;
main(argc, argv)
int resetflg = 0;
main(argc, argv)
@@
-442,11
+440,11
@@
download(mpccnum)
char hilo[2];
long realsize;
char hilo[2];
long realsize;
- sprintf(dlname, "
/dev/mpcc%d"
, mpccnum);
+ sprintf(dlname, "
%s/mpcc%d", _PATH_DEV
, mpccnum);
if (*cf.loadname == '3')
if (*cf.loadname == '3')
- sprintf(fullname,
"/etc/mpcc32"
);
+ sprintf(fullname,
_PATH_MPCC32
);
else
else
- sprintf(fullname,
"/etc/mpccdl"
);
+ sprintf(fullname,
_PATH_MPCCDL
);
if ((cf.loadname[0]) == '\0')
return (-1);
if ((dlfd = open(dlname, O_RDWR)) == MP_DLERROR) {
if ((cf.loadname[0]) == '\0')
return (-1);
if ((dlfd = open(dlname, O_RDWR)) == MP_DLERROR) {
diff --git a/usr/src/old/dlmpcc/pathnames.h
b/usr/src/old/dlmpcc/pathnames.h
new file mode 100644
(file)
index 0000000..
eb84c85
--- /dev/null
+++ b/
usr/src/old/dlmpcc/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_MPCC32 "/usr/libdata/mpcc32"
+#define _PATH_MPCCDL "/usr/libdata/mpccdl"
+#define _PATH_MPCCTAB "/usr/libdata/mpcctab"
diff --git
a/usr/src/old/enpload/Makefile
b/usr/src/old/enpload/Makefile
index
60553cc
..
3b1b7e9
100644
(file)
--- a/
usr/src/old/enpload/Makefile
+++ b/
usr/src/old/enpload/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-37,9
+37,9
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 enpload ${DESTDIR}/
etc/enpload
+ install -s -o bin -g bin -m 755 enpload ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8/tahoe
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8/tahoe
- install -c -o bin -g bin -m 444 enpcode ${DESTDIR}/
etc/enpcode
+ install -c -o bin -g bin -m 444 enpcode ${DESTDIR}/
usr/libdata
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git
a/usr/src/old/flcopy/flcopy.c
b/usr/src/old/flcopy/flcopy.c
index
a95a610
..
a55df61
100644
(file)
--- a/
usr/src/old/flcopy/flcopy.c
+++ b/
usr/src/old/flcopy/flcopy.c
@@
-1,23
+1,35
@@
/*
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved. The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
#ifndef lint
char copyright[] =
*/
#ifndef lint
char copyright[] =
-"@(#) Copyright (c) 198
0
Regents of the University of California.\n\
+"@(#) Copyright (c) 198
9 The
Regents of the University of California.\n\
All rights reserved.\n";
All rights reserved.\n";
-#endif
not lint
+#endif
/* not lint */
#ifndef lint
static char sccsid[] = "@(#)flcopy.c 5.2 (Berkeley) %G%";
#ifndef lint
static char sccsid[] = "@(#)flcopy.c 5.2 (Berkeley) %G%";
-#endif
not lint
+#endif
/* not lint */
#include <sys/file.h>
#include <sys/file.h>
+#include "pathnames.h"
int floppydes;
int floppydes;
-char *flopname =
"/dev/floppy"
;
+char *flopname =
_PATH_FLOPPY
;
long dsize = 77 * 26 * 128;
int hflag;
int rflag;
long dsize = 77 * 26 * 128;
int hflag;
int rflag;
diff --git
a/usr/src/old/gettable/Makefile
b/usr/src/old/gettable/Makefile
index
c8e7e54
..
76e4097
100644
(file)
--- a/
usr/src/old/gettable/Makefile
+++ b/
usr/src/old/gettable/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 gettable ${DESTDIR}/
etc/gettable
+ install -s -o bin -g bin -m 755 gettable ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 gettable.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 gettable.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/old/hostid/Makefile
b/usr/src/old/hostid/Makefile
index
9578145
..
b466f66
100644
(file)
--- a/
usr/src/old/hostid/Makefile
+++ b/
usr/src/old/hostid/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 hostid ${DESTDIR}/bin
/hostid
+ install -s -o bin -g bin -m 755 hostid ${DESTDIR}/bin
install -c -o bin -g bin -m 444 hostid.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
install -c -o bin -g bin -m 444 hostid.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
diff --git
a/usr/src/old/htable/Makefile
b/usr/src/old/htable/Makefile
index
03324d5
..
fc1cd3c
100644
(file)
--- a/
usr/src/old/htable/Makefile
+++ b/
usr/src/old/htable/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
7
(Berkeley) %G%
+# @(#)Makefile 5.
8
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-41,7
+41,7
@@
depend: ${SRCS} y.tab.h
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 htable ${DESTDIR}/
etc/htable
+ install -s -o bin -g bin -m 755 htable ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 htable.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 htable.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/old/implog/Makefile
b/usr/src/old/implog/Makefile
index
c484251
..
c9eda7f
100644
(file)
--- a/
usr/src/old/implog/Makefile
+++ b/
usr/src/old/implog/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
7
(Berkeley) %G%
+# @(#)Makefile 5.
8
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-40,8
+40,8
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 implog ${DESTDIR}/
etc/implog
- install -s -o bin -g bin -m 755 implogd ${DESTDIR}/
etc/implogd
+ install -s -o bin -g bin -m 755 implog ${DESTDIR}/
usr/sbin
+ install -s -o bin -g bin -m 755 implogd ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 implog.0 implogd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 implog.0 implogd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/old/implog/pathnames.h
b/usr/src/old/implog/pathnames.h
index
cd94060
..
cdfcf2f
100644
(file)
--- a/
usr/src/old/implog/pathnames.h
+++ b/
usr/src/old/implog/pathnames.h
@@
-14,7
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
+#include <paths.h>
+
#define _PATH_IMPLOG "/usr/adm/implog"
#define _PATH_IMPLOG "/usr/adm/implog"
diff --git
a/usr/src/old/implogd/implogd.c
b/usr/src/old/implogd/implogd.c
index
71ece75
..
38d6051
100644
(file)
--- a/
usr/src/old/implogd/implogd.c
+++ b/
usr/src/old/implogd/implogd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)implogd.c 5.
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)implogd.c 5.
8
(Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
#endif /* not lint */
#include <sys/param.h>
@@
-85,7
+85,7
@@
main()
(void) open("/", O_RDONLY, 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
(void) open("/", O_RDONLY, 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
- tt = open(
"/dev/tty"
, O_RDWR, 0);
+ tt = open(
_PATH_TTY
, O_RDWR, 0);
if (tt > 0) {
ioctl(tt, TIOCNOTTY, 0);
(void)close(tt);
if (tt > 0) {
ioctl(tt, TIOCNOTTY, 0);
(void)close(tt);
diff --git
a/usr/src/old/init/Makefile
b/usr/src/old/init/Makefile
index
4ab8365
..
acf2a97
100644
(file)
--- a/
usr/src/old/init/Makefile
+++ b/
usr/src/old/init/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 700 init ${DESTDIR}/
etc
/init
+ install -s -o bin -g bin -m 700 init ${DESTDIR}/
sbin
/init
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}${MAN8}${MAN}
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}${MAN8}${MAN}
lint: ${SRCS}
diff --git
a/usr/src/old/init/pathnames.h
b/usr/src/old/init/pathnames.h
index
62ad49c
..
a047314
100644
(file)
--- a/
usr/src/old/init/pathnames.h
+++ b/
usr/src/old/init/pathnames.h
@@
-14,10
+14,10
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#
define _PATH_BSHELL "/bin/sh"
-#define _PATH_CONSOLE "/dev/console"
+#
include <paths.h>
+
#define _PATH_RC "/etc/rc"
#define _PATH_RCDOWN "/etc/rc.shutdown"
#define _PATH_RC "/etc/rc"
#define _PATH_RCDOWN "/etc/rc.shutdown"
diff --git a/usr/src/old/lex/pathnames.h
b/usr/src/old/lex/pathnames.h
new file mode 100644
(file)
index 0000000..
bf23d9c
--- /dev/null
+++ b/
usr/src/old/lex/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_EBCFORM "/usr/share/misc/ebcform"
+#define _PATH_NCFORM "/usr/share/misc/ncform"
+#define _PATH_NRFORM "/usr/share/misc/nrform"
diff --git
a/usr/src/old/lisp/doctor/Makefile
b/usr/src/old/lisp/doctor/Makefile
index
abfc054
..
88b96cd
100644
(file)
--- a/
usr/src/old/lisp/doctor/Makefile
+++ b/
usr/src/old/lisp/doctor/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 4.
8
(Berkeley) %G%
+# @(#)Makefile 4.
9
(Berkeley) %G%
#
MAN= doctor.0
#
MAN= doctor.0
@@
-28,7
+28,7
@@
install: ${MAN}
rm -f ${DESTDIR}/usr/games/doctor
ln -s ${DESTDIR}/usr/games/dm ${DESTDIR}/usr/games/doctor
chown games.bin ${DESTDIR}/usr/games/doctor
rm -f ${DESTDIR}/usr/games/doctor
ln -s ${DESTDIR}/usr/games/dm ${DESTDIR}/usr/games/doctor
chown games.bin ${DESTDIR}/usr/games/doctor
- install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/
games
/cat6
+ install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/
man
/cat6
clean:
rm -f doctor
clean:
rm -f doctor
diff --git
a/usr/src/old/mkhosts/Makefile
b/usr/src/old/mkhosts/Makefile
index
3d0c716
..
787e640
100644
(file)
--- a/
usr/src/old/mkhosts/Makefile
+++ b/
usr/src/old/mkhosts/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-42,7
+42,7
@@
depend: ${SRCS}
install: ${MAN}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8;
-if [ -f mkhosts ]; then \
install: ${MAN}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8;
-if [ -f mkhosts ]; then \
- install -s -o bin -g bin -m 755 mkhosts ${DESTDIR}/
etc
; fi
+ install -s -o bin -g bin -m 755 mkhosts ${DESTDIR}/
usr/sbin
; fi
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git
a/usr/src/old/mkpasswd/Makefile
b/usr/src/old/mkpasswd/Makefile
index
b578baa
..
905dbd9
100644
(file)
--- a/
usr/src/old/mkpasswd/Makefile
+++ b/
usr/src/old/mkpasswd/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 mkpasswd ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 mkpasswd ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/old/more/Makefile
b/usr/src/old/more/Makefile
index
dd1e078
..
2f8aeec
100644
(file)
--- a/
usr/src/old/more/Makefile
+++ b/
usr/src/old/more/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
7
(Berkeley) %G%
+# @(#)Makefile 5.
8
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-40,7
+40,7
@@
install: ${MAN}
install -s -o bin -g bin -m 755 more ${DESTDIR}/usr/old
rm -f ${DESTDIR}/usr/old/page
ln ${DESTDIR}/usr/old/more ${DESTDIR}/usr/old/page
install -s -o bin -g bin -m 755 more ${DESTDIR}/usr/old
rm -f ${DESTDIR}/usr/old/page
ln ${DESTDIR}/usr/old/more ${DESTDIR}/usr/old/page
- install -c -o bin -g bin -m 644 more.help ${DESTDIR}/usr/
lib/omore.help
+ install -c -o bin -g bin -m 644 more.help ${DESTDIR}/usr/
share/misc
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat.old
rm -f ${DESTDIR}/usr/man/cat.old/page.0
ln ${DESTDIR}/usr/man/cat.old/more.0 ${DESTDIR}/usr/man/cat.old/page.0
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat.old
rm -f ${DESTDIR}/usr/man/cat.old/page.0
ln ${DESTDIR}/usr/man/cat.old/more.0 ${DESTDIR}/usr/man/cat.old/page.0
diff --git
a/usr/src/old/more/more.c
b/usr/src/old/more/more.c
index
41a5a89
..
49a40b2
100644
(file)
--- a/
usr/src/old/more/more.c
+++ b/
usr/src/old/more/more.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)more.c 5.2
0
(Berkeley) %G%";
+static char sccsid[] = "@(#)more.c 5.2
1
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-45,9
+45,7
@@
static char sccsid[] = "@(#)more.c 5.20 (Berkeley) %G%";
#include <sys/file.h>
#include <a.out.h>
#include <varargs.h>
#include <sys/file.h>
#include <a.out.h>
#include <varargs.h>
-
-#define HELPFILE "/usr/lib/omore.help"
-#define VI "/usr/ucb/vi"
+#include "pathnames.h"
#define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m))
#define Ftell(f) file_pos
#define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m))
#define Ftell(f) file_pos
diff --git a/usr/src/old/more/pathnames.h
b/usr/src/old/more/pathnames.h
new file mode 100644
(file)
index 0000000..
48a5721
--- /dev/null
+++ b/
usr/src/old/more/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define HELPFILE "/usr/share/misc/omore.help"
diff --git
a/usr/src/old/pcc/c2.tahoe/Makefile
b/usr/src/old/pcc/c2.tahoe/Makefile
index
f6e8650
..
ed3b38a
100644
(file)
--- a/
usr/src/old/pcc/c2.tahoe/Makefile
+++ b/
usr/src/old/pcc/c2.tahoe/Makefile
@@
-3,7
+3,7
@@
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
-# @(#)Makefile 1.
4
(Berkeley) %G%
+# @(#)Makefile 1.
5
(Berkeley) %G%
#
DESTDIR=
CFLAGS= -O
#
DESTDIR=
CFLAGS= -O
@@
-35,7
+35,7
@@
cleandir: clean
rm -f ${MAN} tags .depend
install: ${MAN}
rm -f ${MAN} tags .depend
install: ${MAN}
- install -s -o bin -g bin -m 755 c2 ${DESTDIR}/
lib
/c2
+ install -s -o bin -g bin -m 755 c2 ${DESTDIR}/
usr/libexec
/c2
tags: ${SRCS}
ctags ${SRCS}
tags: ${SRCS}
ctags ${SRCS}
diff --git
a/usr/src/old/pcc/c2.vax/Makefile
b/usr/src/old/pcc/c2.vax/Makefile
index
ba3c174
..
97ec4c9
100644
(file)
--- a/
usr/src/old/pcc/c2.vax/Makefile
+++ b/
usr/src/old/pcc/c2.vax/Makefile
@@
-3,10
+3,10
@@
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
-# @(#)Makefile 4.
7
(Berkeley) %G%
+# @(#)Makefile 4.
8
(Berkeley) %G%
#
CFLAGS= -DCOPYCODE -DC2 -O
#
CFLAGS= -DCOPYCODE -DC2 -O
-ASDIR= ../../../bin/as/as.${MACHINE}
+ASDIR= ../../../
usr.
bin/as/as.${MACHINE}
SRCS= c20.c c21.c c22.c
OBJS= c20.o c21.o c22.o
SRCS= c20.c c21.c c22.c
OBJS= c20.o c21.o c22.o
@@
-28,7
+28,7
@@
cleandir: clean
rm -f ${MAN} tags .depend
install: ${MAN}
rm -f ${MAN} tags .depend
install: ${MAN}
- install -o bin -g bin -m 755 -s c2 ${DESTDIR}/
lib
/c2
+ install -o bin -g bin -m 755 -s c2 ${DESTDIR}/
usr/libexec
/c2
tags: ${SRCS}
ctags ${SRCS}
tags: ${SRCS}
ctags ${SRCS}
diff --git
a/usr/src/old/pcc/ccom.tahoe/Makefile
b/usr/src/old/pcc/ccom.tahoe/Makefile
index
4ed095b
..
d660c87
100644
(file)
--- a/
usr/src/old/pcc/ccom.tahoe/Makefile
+++ b/
usr/src/old/pcc/ccom.tahoe/Makefile
@@
-1,5
+1,5
@@
#
#
-# Makefile 1.1
1 89/03/06
+# Makefile 1.1
2 89/05/11
#
# Makefile for tahoe pcc
#
#
# Makefile for tahoe pcc
#
@@
-121,8
+121,8
@@
fcomm2.o: ${MIP}/common.c
${RM} fcomm2.c
install:
${RM} fcomm2.c
install:
- install -s -o bin -g bin -m 755 ${TESTDIR}/ccom ${DESTDIR}/
lib/ccom
- install -s -o bin -g bin -m 755 ${TESTDIR}/f1 ${DESTDIR}/
lib/f1
+ install -s -o bin -g bin -m 755 ${TESTDIR}/ccom ${DESTDIR}/
usr/libexec
+ install -s -o bin -g bin -m 755 ${TESTDIR}/f1 ${DESTDIR}/
usr/libexec
pcclocal.h: ../localdefs.h /usr/include/pcc.h
${RM} pcclocal.h
pcclocal.h: ../localdefs.h /usr/include/pcc.h
${RM} pcclocal.h
diff --git
a/usr/src/old/pcc/ccom.vax/Makefile
b/usr/src/old/pcc/ccom.vax/Makefile
index
1d5600c
..
a81298b
100644
(file)
--- a/
usr/src/old/pcc/ccom.vax/Makefile
+++ b/
usr/src/old/pcc/ccom.vax/Makefile
@@
-1,5
+1,5
@@
#
#
-# Makefile 1.
19 89/03/06
+# Makefile 1.
20 89/05/11
#
# Makefile for PCC
#
#
# Makefile for PCC
#
@@
-157,9
+157,9
@@
fcomm2.o: $(P2INCS) $M/common.c
$(RM) fcomm2.c
install: all
$(RM) fcomm2.c
install: all
- install -s -o bin -g bin -m 755 ${TESTDIR}/ccom ${DESTDIR}/
lib/ccom
- install -s -o bin -g bin -m 755 ${TESTDIR}/sccom ${DESTDIR}/
lib/sccom
- install -s -o bin -g bin -m 755 ${TESTDIR}/f1 ${DESTDIR}/
lib/f1
+ install -s -o bin -g bin -m 755 ${TESTDIR}/ccom ${DESTDIR}/
usr/libexec
+ install -s -o bin -g bin -m 755 ${TESTDIR}/sccom ${DESTDIR}/
usr/libexec
+ install -s -o bin -g bin -m 755 ${TESTDIR}/f1 ${DESTDIR}/
usr/libexec
GREP= egrep
GREP= egrep
diff --git a/usr/src/old/refer/refer/pathnames.h
b/usr/src/old/refer/refer/pathnames.h
new file mode 100644
(file)
index 0000000..
5843af3
--- /dev/null
+++ b/
usr/src/old/refer/refer/pathnames.h
@@ -0,0
+1,31
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_ALL "/usr/dict/lookall/All"
+#define _PATH_EIGN "/usr/lib/eign"
+#define _PATH_HUNT "/usr/libexec/hunt"
+#define _PATH_IND "/usr/share/dict/papers/Ind"
+#define _PATH_LIB "/usr/libexec"
+#define _PATH_MKEY "/usr/libexec/mkey"
+#define _PATH_PWD "/bin/pwd"
+#define _PATH_SORT "/usr/bin/sort"
+#define _PATH_TMPS "/tmp/SbibXXXXXX"
+#define _PATH_USRTMP "/usr/tmp"
diff --git a/usr/src/old/roff/nroff/pathnames.h
b/usr/src/old/roff/nroff/pathnames.h
new file mode 100644
(file)
index 0000000..
c8072aa
--- /dev/null
+++ b/
usr/src/old/roff/nroff/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_TERM "/usr/libdata/term/tablpr"
diff --git a/usr/src/old/roff/troff/pathnames.h
b/usr/src/old/roff/troff/pathnames.h
new file mode 100644
(file)
index 0000000..
38d2a78
--- /dev/null
+++ b/
usr/src/old/roff/troff/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_FONTS "/usr/libdata/troff_font/ftXX"
diff --git
a/usr/src/old/rxformat/Makefile
b/usr/src/old/rxformat/Makefile
index
5bca80a
..
06d5b5a
100644
(file)
--- a/
usr/src/old/rxformat/Makefile
+++ b/
usr/src/old/rxformat/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 rxformat ${DESTDIR}/
etc/rxformat
+ install -s -o bin -g bin -m 755 rxformat ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 rxformat.0 ${DESTDIR}/usr/man/cat8/vax
lint: ${SRCS}
install -c -o bin -g bin -m 444 rxformat.0 ${DESTDIR}/usr/man/cat8/vax
lint: ${SRCS}
diff --git a/usr/src/old/rxformat/pathnames.h
b/usr/src/old/rxformat/pathnames.h
new file mode 100644
(file)
index 0000000..
dd5570b
--- /dev/null
+++ b/
usr/src/old/rxformat/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_DEVNAME "/dev/rrx?a"
diff --git
a/usr/src/old/rxformat/rxformat.c
b/usr/src/old/rxformat/rxformat.c
index
08a572f
..
157908e
100644
(file)
--- a/
usr/src/old/rxformat/rxformat.c
+++ b/
usr/src/old/rxformat/rxformat.c
@@
-11,15
+11,16
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)rxformat.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)rxformat.c 5.
3
(Berkeley) %G%";
#endif not lint
#endif not lint
-#include <stdio.h>
#include <sys/file.h>
#include <sys/file.h>
-#include <errno.h>
#include <vaxuba/rxreg.h>
#include <vaxuba/rxreg.h>
+#include "pathnames.h"
+#include <stdio.h>
+#include <errno.h>
-char devname[] =
"/dev/rrx?a"
;
+char devname[] =
_PATH_DEVNAME
;
/*
* Format RX02 floppy disks.
/*
* Format RX02 floppy disks.
diff --git a/usr/src/old/sh/pathnames.h
b/usr/src/old/sh/pathnames.h
new file mode 100644
(file)
index 0000000..
a16cf5f
--- /dev/null
+++ b/
usr/src/old/sh/pathnames.h
@@ -0,0
+1,23
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_DEFPATH ":/bin:/usr/bin"
+#define _PATH_TMPOUT "/tmp/sh-"
diff --git
a/usr/src/old/symorder/Makefile
b/usr/src/old/symorder/Makefile
index
d383719
..
34451b1
100644
(file)
--- a/
usr/src/old/symorder/Makefile
+++ b/
usr/src/old/symorder/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 symorder ${DESTDIR}/usr/
ucb
+ install -s -o bin -g bin -m 755 symorder ${DESTDIR}/usr/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
diff --git a/usr/src/old/sysline/pathnames.h
b/usr/src/old/sysline/pathnames.h
new file mode 100644
(file)
index 0000000..
32e84d3
--- /dev/null
+++ b/
usr/src/old/sysline/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_MBOX "/var/spool/mail"
+#define _PATH_RWHO "/var/spool/rwho/whod."
+#define _PATH_SYSLINE "/usr/src/ucb/sysline"
diff --git
a/usr/src/old/talk/Makefile
b/usr/src/old/talk/Makefile
index
519b393
..
f89e065
100644
(file)
--- a/
usr/src/old/talk/Makefile
+++ b/
usr/src/old/talk/Makefile
@@
-16,7
+16,7
@@
INCLUDE=talk.h ctl.h talk_ctl.h
SOURCE= ${DSOURCE} ${TSOURCE}
CFLAGS= -O
SOURCE= ${DSOURCE} ${TSOURCE}
CFLAGS= -O
-all:
talk talkd
+all: talk talkd
talkd: ${DOBJECT}
cc ${CFLAGS} -o talkd ${DOBJECT}
talkd: ${DOBJECT}
cc ${CFLAGS} -o talkd ${DOBJECT}
@@
-29,7
+29,7
@@
${TOBJECT}: talk.h ctl.h talk_ctl.h
install: talk talkd
install -g tty -m 2755 -s talk ${DESTDIR}/usr/old/talk
install: talk talkd
install -g tty -m 2755 -s talk ${DESTDIR}/usr/old/talk
- install -s talkd ${DESTDIR}/
et
c/talkd
+ install -s talkd ${DESTDIR}/
usr/libexe
c/talkd
lint:
lint ${DSOURCE}
lint:
lint ${DSOURCE}
@@
-37,5
+37,11
@@
lint:
clean:
rm -f *.o talk talkd
clean:
rm -f *.o talk talkd
+cleandir: clean
+ rm -f ${MAN} tags .depend
+
+depend: ${SOURCE}
+ mkdep ${SOURCE}
+
tags: ${SOURCE} ${INCLUDE}
ctags ${SOURCE} ${INCLUDE}
tags: ${SOURCE} ${INCLUDE}
ctags ${SOURCE} ${INCLUDE}
diff --git a/usr/src/old/tar/pathnames.h
b/usr/src/old/tar/pathnames.h
new file mode 100644
(file)
index 0000000..
77b481d
--- /dev/null
+++ b/
usr/src/old/tar/pathnames.h
@@ -0,0
+1,21
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_MAGTAPE "/dev/rmt8"
+#define _PATH_TMP "/tmp/tarXXXXXX"
diff --git a/usr/src/old/tbl/pathnames.h
b/usr/src/old/tbl/pathnames.h
new file mode 100644
(file)
index 0000000..
3b6c059
--- /dev/null
+++ b/
usr/src/old/tbl/pathnames.h
@@ -0,0
+1,21
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_MACROS "/usr/lib/tmac/tmac.s"
+#define _PATH_PYMACS "/usr/lib/tmac/tmac.m"
diff --git
a/usr/src/old/tk/tk.c
b/usr/src/old/tk/tk.c
index
29b24e8
..
ecd8d39
100644
(file)
--- a/
usr/src/old/tk/tk.c
+++ b/
usr/src/old/tk/tk.c
@@
-1,10
+1,11
@@
-static char *sccsid = "@(#)tk.c 4.
2
(Berkeley) %G%";
+static char *sccsid = "@(#)tk.c 4.
3
(Berkeley) %G%";
/*
* optimize output for Tek 4014
*/
/*
* optimize output for Tek 4014
*/
+#include <sys/signal.h>
#include <stdio.h>
#include <stdio.h>
-#include <
signal
.h>
+#include <
paths
.h>
#define MAXY 3071
#define LINE 47
#define MAXY 3071
#define LINE 47
@@
-56,7
+57,7
@@
char **argv;
}
break;
}
}
break;
}
- if ((ttyin = fopen(
"/dev/tty"
, "r")) != NULL)
+ if ((ttyin = fopen(
_PATH_TTY
, "r")) != NULL)
setbuf(ttyin, (char *)NULL);
if (argc) {
if (freopen(argv[0], "r", stdin) == NULL) {
setbuf(ttyin, (char *)NULL);
if (argc) {
if (freopen(argv[0], "r", stdin) == NULL) {
@@
-208,10
+209,10
@@
execom()
return;
}
if (isatty(fileno(stdin)) == 0) {
return;
}
if (isatty(fileno(stdin)) == 0) {
- if (freopen(
"/dev/tty"
, "r", stdin)==NULL)
- freopen(
"/dev/null"
, "r", stdin);
+ if (freopen(
_PATH_TTY
, "r", stdin)==NULL)
+ freopen(
_PATH_DEVNULL
, "r", stdin);
}
}
- execl(
"/bin/sh"
, "sh", "-t", 0);
+ execl(
_PATH_BSHELL
, "sh", "-t", 0);
}
sendpt(a)
}
sendpt(a)
diff --git
a/usr/src/old/tp/Makefile
b/usr/src/old/tp/Makefile
index
9f4855f
..
e6bf36c
100644
(file)
--- a/
usr/src/old/tp/Makefile
+++ b/
usr/src/old/tp/Makefile
@@
-14,13
+14,13
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 4.
4
(Berkeley) %G%
+# @(#)Makefile 4.
5
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= tp0.c tp1.c tp2.c tp3.c
OBJS= tp0.o tp1.o tp2.o tp3.o
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= tp0.c tp1.c tp2.c tp3.c
OBJS= tp0.o tp1.o tp2.o tp3.o
-MAN= tp.0
+MAN= tp.0
tp5.0
all: tp
all: tp
@@
-37,8
+37,9
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 tp ${DESTDIR}/bin/tp
- install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
+ install -s -o bin -g bin -m 755 tp ${DESTDIR}/usr/ucb
+ install -c -o bin -g bin -m 444 tp.0 ${DESTDIR}/usr/man/cat1
+ install -c -o bin -g bin -m 444 tp5.0 ${DESTDIR}/usr/man/cat5/tp.0
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git a/usr/src/old/tp/pathnames.h
b/usr/src/old/tp/pathnames.h
new file mode 100644
(file)
index 0000000..
849fc39
--- /dev/null
+++ b/
usr/src/old/tp/pathnames.h
@@ -0,0
+1,23
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_MT "/dev/rmt0"
+#define _PATH_TAPX "/dev/tapx"
+#define _PATH_MBOOT "/usr/mdec/mboot"
+#define _PATH_TBOOT "/usr/mdec/tboot"
diff --git
a/usr/src/old/tp/tp0.c
b/usr/src/old/tp/tp0.c
index
728b606
..
d3a33e9
100644
(file)
--- a/
usr/src/old/tp/tp0.c
+++ b/
usr/src/old/tp/tp0.c
@@
-1,6
+1,12
@@
#ifndef lint
#ifndef lint
-static char sccsid[] = "@(#)tp0.c 4.
1
%G%";
+static char sccsid[] = "@(#)tp0.c 4.
2
%G%";
#endif
#include "tp.h"
#endif
#include "tp.h"
-#include "tp_defs.h"
+#include "pathnames.h"
+
+char mt[] = _PATH_MT;
+char tc[] = _PATH_TAPX;
+int flags = flu;
+char mheader[] = _PATH_MBOOT;
+char theader[] = _PATH_TBOOT;
diff --git
a/usr/src/old/vfilters/Makefile
b/usr/src/old/vfilters/Makefile
index
9c05128
..
4f0ae04
100644
(file)
--- a/
usr/src/old/vfilters/Makefile
+++ b/
usr/src/old/vfilters/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 6.
6
(Berkeley) %G%
+# @(#)Makefile 6.
7
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-42,9
+42,9
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 ${ALL} ${DESTDIR}/usr/lib
- rm -f ${DESTDIR}/usr/lib/vpfW
- ln ${DESTDIR}/usr/lib
/vpf ${DESTDIR}/usr/lib
/vpfW
+ install -s -o bin -g bin -m 755 ${ALL} ${DESTDIR}/usr/lib
exec/lpr
+ rm -f ${DESTDIR}/usr/lib
exec/lpr
/vpfW
+ ln ${DESTDIR}/usr/lib
exec/lpr/vpf ${DESTDIR}/usr/libexec/lpr
/vpfW
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git a/usr/src/old/yacc/pathnames.h
b/usr/src/old/yacc/pathnames.h
new file mode 100644
(file)
index 0000000..
4977551
--- /dev/null
+++ b/
usr/src/old/yacc/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_PARSER "/usr/share/misc/yaccpar"
diff --git
a/usr/src/sbin/XNSrouted/Makefile
b/usr/src/sbin/XNSrouted/Makefile
index
82327f3
..
4e34816
100644
(file)
--- a/
usr/src/sbin/XNSrouted/Makefile
+++ b/
usr/src/sbin/XNSrouted/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
9
(Berkeley) %G%
+# @(#)Makefile 5.
10
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-37,7
+37,7
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 XNSrouted ${DESTDIR}/
etc/XNSrouted
+ install -s -o bin -g bin -m 755 XNSrouted ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 XNSrouted.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 XNSrouted.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/XNSrouted/main.c
b/usr/src/sbin/XNSrouted/main.c
index
88eaebb
..
799fa81
100644
(file)
--- a/
usr/src/sbin/XNSrouted/main.c
+++ b/
usr/src/sbin/XNSrouted/main.c
@@
-25,7
+25,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)main.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 5.
7
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-40,6
+40,7
@@
static char sccsid[] = "@(#)main.c 5.6 (Berkeley) %G%";
#include <errno.h>
#include <nlist.h>
#include <signal.h>
#include <errno.h>
#include <nlist.h>
#include <signal.h>
+#include <paths.h>
int supplier = -1; /* process should supply updates */
extern int gateway;
int supplier = -1; /* process should supply updates */
extern int gateway;
@@
-107,7
+108,7
@@
main(argc, argv)
(void) open("/", 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
(void) open("/", 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
- t = open(
"/dev/tty"
, 2);
+ t = open(
_PATH_TTY
, 2);
if (t >= 0) {
ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
if (t >= 0) {
ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
diff --git
a/usr/src/sbin/badsect/Makefile
b/usr/src/sbin/badsect/Makefile
index
8d0ce85
..
6e69f7d
100644
(file)
--- a/
usr/src/sbin/badsect/Makefile
+++ b/
usr/src/sbin/badsect/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 badsect ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 badsect ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/badsect/badsect.c
b/usr/src/sbin/badsect/badsect.c
index
09dc7b4
..
269d20c
100644
(file)
--- a/
usr/src/sbin/badsect/badsect.c
+++ b/
usr/src/sbin/badsect/badsect.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)badsect.c 5.
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)badsect.c 5.
6
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-35,12
+35,13
@@
static char sccsid[] = "@(#)badsect.c 5.5 (Berkeley) %G%";
* this program can be used if the driver for the file system in question
* does not support bad block forwarding.
*/
* this program can be used if the driver for the file system in question
* does not support bad block forwarding.
*/
-#include <stdio.h>
#include <sys/param.h>
#include <sys/param.h>
-#include <sys/fs.h>
#include <sys/dir.h>
#include <sys/stat.h>
#include <sys/dir.h>
#include <sys/stat.h>
+#include <sys/fs.h>
#include <sys/inode.h>
#include <sys/inode.h>
+#include <stdio.h>
+#include <paths.h>
union {
struct fs fs;
union {
struct fs fs;
@@
-79,7
+80,7
@@
main(argc, argv)
perror(argv[1]);
exit(2);
}
perror(argv[1]);
exit(2);
}
- strcpy(name,
"/dev/"
);
+ strcpy(name,
_PATH_DEV
);
if ((dirp = opendir(name)) == NULL) {
perror(name);
exit(3);
if ((dirp = opendir(name)) == NULL) {
perror(name);
exit(3);
diff --git
a/usr/src/sbin/clri/Makefile
b/usr/src/sbin/clri/Makefile
index
9d87a7b
..
63f6ec7
100644
(file)
--- a/
usr/src/sbin/clri/Makefile
+++ b/
usr/src/sbin/clri/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 clri ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 clri ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/clri/clri.c
b/usr/src/sbin/clri/clri.c
index
f5af1a9
..
2adadf2
100644
(file)
--- a/
usr/src/sbin/clri/clri.c
+++ b/
usr/src/sbin/clri/clri.c
@@
-1,4
+1,4
@@
-static char sccsid[] = "@(#)clri.c 2.
3
%G%";
+static char sccsid[] = "@(#)clri.c 2.
4
%G%";
/* static char *sccsid = "@(#)clri.c 4.1 (Berkeley) 10/1/80"; */
/* static char *sccsid = "@(#)clri.c 4.1 (Berkeley) 10/1/80"; */
@@
-6,15
+6,9
@@
static char sccsid[] = "@(#)clri.c 2.3 %G%";
* clri filsys inumber ...
*/
* clri filsys inumber ...
*/
-#ifndef SIMFS
#include <sys/param.h>
#include <sys/inode.h>
#include <sys/fs.h>
#include <sys/param.h>
#include <sys/inode.h>
#include <sys/fs.h>
-#else
-#include "../h/param.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#endif
#define ISIZE (sizeof(struct dinode))
#define NI (MAXBSIZE/ISIZE)
#define ISIZE (sizeof(struct dinode))
#define NI (MAXBSIZE/ISIZE)
diff --git
a/usr/src/sbin/disklabel/Makefile
b/usr/src/sbin/disklabel/Makefile
index
181b669
..
d5dc859
100644
(file)
--- a/
usr/src/sbin/disklabel/Makefile
+++ b/
usr/src/sbin/disklabel/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g operator -m 2750 disklabel ${DESTDIR}/
etc
+ install -s -o bin -g operator -m 2750 disklabel ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 disklabel.0 ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 disklabel.5.0 ${DESTDIR}/usr/man/cat5/disklabel.0
install -c -o bin -g bin -m 444 disklabel.0 ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 disklabel.5.0 ${DESTDIR}/usr/man/cat5/disklabel.0
diff --git
a/usr/src/sbin/disklabel/disklabel.c
b/usr/src/sbin/disklabel/disklabel.c
index
86a12ce
..
72422d9
100644
(file)
--- a/
usr/src/sbin/disklabel/disklabel.c
+++ b/
usr/src/sbin/disklabel/disklabel.c
@@
-25,7
+25,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)disklabel.c 5.1
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)disklabel.c 5.1
6
(Berkeley) %G%";
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#endif /* not lint */
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#endif /* not lint */
@@
-80,7
+80,7
@@
char *bootxx;
char *dkname;
char *specname;
char *dkname;
char *specname;
-char tmpfil[] =
"/tmp/EdDk.aXXXXXX"
;
+char tmpfil[] =
_PATH_TMP
;
extern int errno;
char namebuf[BBSIZE], *np = namebuf;
extern int errno;
char namebuf[BBSIZE], *np = namebuf;
@@
-156,14
+156,14
@@
main(argc, argv)
dkname = argv[0];
if (dkname[0] != '/') {
dkname = argv[0];
if (dkname[0] != '/') {
- (void)sprintf(np, "
/dev/r%s%c"
, dkname, RAWPARTITION);
+ (void)sprintf(np, "
%s/r%s%c", _PATH_DEV
, dkname, RAWPARTITION);
specname = np;
np += strlen(specname) + 1;
} else
specname = dkname;
f = open(specname, op == READ ? O_RDONLY : O_RDWR);
if (f < 0 && errno == ENOENT && dkname[0] != '/') {
specname = np;
np += strlen(specname) + 1;
} else
specname = dkname;
f = open(specname, op == READ ? O_RDONLY : O_RDWR);
if (f < 0 && errno == ENOENT && dkname[0] != '/') {
- (void)sprintf(specname, "
/dev/r%s"
, dkname);
+ (void)sprintf(specname, "
%s/r%s", _PATH_DEV
, dkname);
np = namebuf + strlen(specname) + 1;
f = open(specname, op == READ ? O_RDONLY : O_RDWR);
}
np = namebuf + strlen(specname) + 1;
f = open(specname, op == READ ? O_RDONLY : O_RDWR);
}
diff --git
a/usr/src/sbin/disklabel/pathnames.h
b/usr/src/sbin/disklabel/pathnames.h
index
f9e7a36
..
377d148
100644
(file)
--- a/
usr/src/sbin/disklabel/pathnames.h
+++ b/
usr/src/sbin/disklabel/pathnames.h
@@
-14,8
+14,11
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
+#include <paths.h>
+
#define _PATH_BOOTDIR "/usr/mdec"
#define _PATH_BOOTDIR "/usr/mdec"
-#define _PATH_EDITOR "/usr/ucb/vi"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/EdDk.aXXXXXX"
diff --git
a/usr/src/sbin/dmesg/Makefile
b/usr/src/sbin/dmesg/Makefile
index
d1f7bb1
..
b7d3bec
100644
(file)
--- a/
usr/src/sbin/dmesg/Makefile
+++ b/
usr/src/sbin/dmesg/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 dmesg ${DESTDIR}/
etc
+ install -s -o bin -g kmem -m 2755 dmesg ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/dmesg/pathnames.h
b/usr/src/sbin/dmesg/pathnames.h
index
d9a5257
..
fa17989
100644
(file)
--- a/
usr/src/sbin/dmesg/pathnames.h
+++ b/
usr/src/sbin/dmesg/pathnames.h
@@
-14,9
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
+#include <paths.h>
+
#define _PATH_MSGBUF "/usr/adm/msgbuf"
#define _PATH_MSGBUF "/usr/adm/msgbuf"
-#define _PATH_KMEM "/dev/kmem"
-#define _PATH_VMUNIX "/vmunix"
diff --git
a/usr/src/sbin/dump/Makefile
b/usr/src/sbin/dump/Makefile
index
53015da
..
fe9555a
100644
(file)
--- a/
usr/src/sbin/dump/Makefile
+++ b/
usr/src/sbin/dump/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
8
(Berkeley) %G%
+# @(#)Makefile 5.
9
(Berkeley) %G%
#
# dump.h header file
# dumpitime.c reads /etc/dumpdates
#
# dump.h header file
# dumpitime.c reads /etc/dumpdates
@@
-64,8
+64,8
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o root -g tty -m 6755 rdump ${DESTDIR}/
etc
/rdump
- install -s -o bin -g tty -m 2755 dump ${DESTDIR}/
etc
/dump
+ install -s -o root -g tty -m 6755 rdump ${DESTDIR}/
sbin
/rdump
+ install -s -o bin -g tty -m 2755 dump ${DESTDIR}/
sbin
/dump
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/dump/dump.h
b/usr/src/sbin/dump/dump.h
index
de0215c
..
068dfa8
100644
(file)
--- a/
usr/src/sbin/dump/dump.h
+++ b/
usr/src/sbin/dump/dump.h
@@
-3,15
+3,13
@@
* All rights reserved. The Berkeley software License Agreement
* specifies the terms and conditions for redistribution.
*
* All rights reserved. The Berkeley software License Agreement
* specifies the terms and conditions for redistribution.
*
- * @(#)dump.h 5.
5
(Berkeley) %G%
+ * @(#)dump.h 5.
6
(Berkeley) %G%
*/
#define NI 16
#define MAXINOPB (MAXBSIZE / sizeof(struct dinode))
#define MAXNINDIR (MAXBSIZE / sizeof(daddr_t))
*/
#define NI 16
#define MAXINOPB (MAXBSIZE / sizeof(struct dinode))
#define MAXNINDIR (MAXBSIZE / sizeof(daddr_t))
-#include <stdio.h>
-#include <ctype.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/fs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/fs.h>
@@
-20,8
+18,10
@@
#include <sys/dir.h>
#include <utmp.h>
#include <sys/time.h>
#include <sys/dir.h>
#include <utmp.h>
#include <sys/time.h>
-#include <signal.h>
+#include <s
ys/s
ignal.h>
#include <fstab.h>
#include <fstab.h>
+#include <stdio.h>
+#include <ctype.h>
#define MWORD(m,i) (m[(unsigned)(i-1)/NBBY])
#define MBIT(i) (1<<((unsigned)(i-1)%NBBY))
#define MWORD(m,i) (m[(unsigned)(i-1)/NBBY])
#define MBIT(i) (1<<((unsigned)(i-1)%NBBY))
@@
-96,8
+96,6
@@
int interrupt(); /* in case operator bangs on console */
#define X_REWRITE 2 /* restart writing from the check point */
#define X_ABORT 3 /* abort all of dump; don't attempt checkpointing*/
#define X_REWRITE 2 /* restart writing from the check point */
#define X_ABORT 3 /* abort all of dump; don't attempt checkpointing*/
-#define TAPE "/dev/rmt8" /* default tape device */
-#define DISK "/dev/rrp1g" /* default disk */
#define OPGRENT "operator" /* group entry to notify */
#define DIALUP "ttyd" /* prefix for dialups */
#define OPGRENT "operator" /* group entry to notify */
#define DIALUP "ttyd" /* prefix for dialups */
diff --git
a/usr/src/sbin/dump/dumprmt.c
b/usr/src/sbin/dump/dumprmt.c
index
9acc174
..
00421f1
100644
(file)
--- a/
usr/src/sbin/dump/dumprmt.c
+++ b/
usr/src/sbin/dump/dumprmt.c
@@
-5,7
+5,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)dumprmt.c 5.
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)dumprmt.c 5.
6
(Berkeley) %G%";
#endif not lint
#include <sys/param.h>
#endif not lint
#include <sys/param.h>
@@
-16,10
+16,11
@@
static char sccsid[] = "@(#)dumprmt.c 5.5 (Berkeley) %G%";
#include <netinet/in.h>
#include <netinet/in.h>
-#include <stdio.h>
-#include <pwd.h>
#include <netdb.h>
#include <protocols/dumprestore.h>
#include <netdb.h>
#include <protocols/dumprestore.h>
+#include <pwd.h>
+#include <stdio.h>
+#include "pathnames.h"
#define TS_CLOSED 0
#define TS_OPEN 1
#define TS_CLOSED 0
#define TS_OPEN 1
@@
-67,7
+68,7
@@
rmtgetconn()
pw = getpwuid(getuid());
if (pw && pw->pw_name)
name = pw->pw_name;
pw = getpwuid(getuid());
if (pw && pw->pw_name)
name = pw->pw_name;
- rmtape = rcmd(&rmtpeer, sp->s_port, name, name,
"/etc/rmt"
, 0);
+ rmtape = rcmd(&rmtpeer, sp->s_port, name, name,
_PATH_RMT
, 0);
size = ntrec * TP_BSIZE;
while (size > TP_BSIZE &&
setsockopt(rmtape, SOL_SOCKET, SO_SNDBUF, &size, sizeof (size)) < 0)
size = ntrec * TP_BSIZE;
while (size > TP_BSIZE &&
setsockopt(rmtape, SOL_SOCKET, SO_SNDBUF, &size, sizeof (size)) < 0)
diff --git
a/usr/src/sbin/dump/main.c
b/usr/src/sbin/dump/main.c
index
397f61c
..
936b0cf
100644
(file)
--- a/
usr/src/sbin/dump/main.c
+++ b/
usr/src/sbin/dump/main.c
@@
-5,7
+5,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)main.c 5.
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 5.
8
(Berkeley) %G%";
#endif not lint
#include "dump.h"
#endif not lint
#include "dump.h"
@@
-36,8
+36,8
@@
main(argc, argv)
time(&(spcl.c_date));
tsize = 0; /* Default later, based on 'c' option for cart tapes */
time(&(spcl.c_date));
tsize = 0; /* Default later, based on 'c' option for cart tapes */
- tape = TAPE;
- disk = DISK;
+ tape =
_PATH_DEF
TAPE;
+ disk =
_PATH_DEF
DISK;
increm = _PATH_DUMPDATES;
temp = _PATH_DTMP;
if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0) {
increm = _PATH_DUMPDATES;
temp = _PATH_DTMP;
if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0) {
diff --git
a/usr/src/sbin/dump/pathnames.h
b/usr/src/sbin/dump/pathnames.h
index
e7256f4
..
7375ccf
100644
(file)
--- a/
usr/src/sbin/dump/pathnames.h
+++ b/
usr/src/sbin/dump/pathnames.h
@@
-14,8
+14,14
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_DUMPDATES "/etc/dumpdates"
+#include <paths.h>
+
+#define _PATH_DEFDISK "/dev/rrp1g"
+#define _PATH_DEFTAPE "/dev/rmt8"
#define _PATH_DTMP "/etc/dtmp"
#define _PATH_DTMP "/etc/dtmp"
+#define _PATH_DUMPDATES "/etc/dumpdates"
+#define _PATH_LOCK "/tmp/dumplockXXXXXX"
+#define _PATH_RMT "rmt"
diff --git
a/usr/src/sbin/dumpfs/Makefile
b/usr/src/sbin/dumpfs/Makefile
index
f926eba
..
40e4ed9
100644
(file)
--- a/
usr/src/sbin/dumpfs/Makefile
+++ b/
usr/src/sbin/dumpfs/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 dumpfs ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 dumpfs ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/fastboot/Makefile
b/usr/src/sbin/fastboot/Makefile
index
8701a01
..
deaa861
100644
(file)
--- a/
usr/src/sbin/fastboot/Makefile
+++ b/
usr/src/sbin/fastboot/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
MAN= fastboot.0
#
MAN= fastboot.0
@@
-22,6
+22,8
@@
MAN= fastboot.0
all fastboot clean cleandir depend lint tags:
install: ${MAN}
all fastboot clean cleandir depend lint tags:
install: ${MAN}
- install -c -o bin -g bin -m 755 fastboot.sh ${DESTDIR}/etc/fastboot
- install -c -o bin -g bin -m 755 fasthalt.sh ${DESTDIR}/etc/fasthalt
+ install -c -o bin -g bin -m 755 fastboot.sh \
+ ${DESTDIR}/sbin/fastboot
+ install -c -o bin -g bin -m 755 fasthalt.sh \
+ ${DESTDIR}/sbin/fasthalt
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
diff --git
a/usr/src/sbin/fastboot/fastboot.sh
b/usr/src/sbin/fastboot/fastboot.sh
index
8d1932e
..
6c57fa9
100644
(file)
--- a/
usr/src/sbin/fastboot/fastboot.sh
+++ b/
usr/src/sbin/fastboot/fastboot.sh
@@
-15,7
+15,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)fastboot.sh 5.
3
(Berkeley) %G%
+# @(#)fastboot.sh 5.
4
(Berkeley) %G%
#
cp /dev/null /fastboot
#
cp /dev/null /fastboot
-/
etc
/reboot $*
+/
usr/sbin
/reboot $*
diff --git
a/usr/src/sbin/fastboot/fasthalt.sh
b/usr/src/sbin/fastboot/fasthalt.sh
index
d5b8aee
..
4265fd9
100644
(file)
--- a/
usr/src/sbin/fastboot/fasthalt.sh
+++ b/
usr/src/sbin/fastboot/fasthalt.sh
@@
-15,7
+15,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)fasthalt.sh 5.
1
(Berkeley) %G%
+# @(#)fasthalt.sh 5.
2
(Berkeley) %G%
#
cp /dev/null /fastboot
#
cp /dev/null /fastboot
-/
etc
/halt $*
+/
usr/sbin
/halt $*
diff --git
a/usr/src/sbin/fsck/Makefile
b/usr/src/sbin/fsck/Makefile
index
7619ec0
..
ddf5a0b
100644
(file)
--- a/
usr/src/sbin/fsck/Makefile
+++ b/
usr/src/sbin/fsck/Makefile
@@
-14,15
+14,15
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.1
0
(Berkeley) %G%
+# @(#)Makefile 5.1
1
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
-SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \
-
pass4.c pass5.c setup.c utilities.c /sys/sys/ufs_subr
.c \
-
/sys/sys/
ufs_tables.c
-LOCOBJS=dir.o inode.o main.o pass1.o pass1b.o pass2.o \
- pass
3.o pass4.o pass
5.o setup.o utilities.o
+VPATH= ../../sys/kern
+
SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4
.c \
+
pass5.c setup.c utilities.c ufs_subr.c
ufs_tables.c
+LOCOBJS=dir.o inode.o main.o pass1.o pass1b.o pass2.o
pass3.o pass4.o
\
+ pass5.o setup.o utilities.o
SYSOBJS=ufs_subr.o ufs_tables.o
OBJS= ${LOCOBJS} ${SYSOBJS}
MAN= fsck.0
SYSOBJS=ufs_subr.o ufs_tables.o
OBJS= ${LOCOBJS} ${SYSOBJS}
MAN= fsck.0
@@
-35,12
+35,6
@@
fsck: ${OBJS} ${LIBC}
${LOCOBJS}:
${CC} ${CFLAGS} -c $*.c
${LOCOBJS}:
${CC} ${CFLAGS} -c $*.c
-ufs_subr.o:
- ${CC} ${CFLAGS} -c /sys/sys/ufs_subr.c
-
-ufs_tables.o:
- ${CC} ${CFLAGS} -I/usr/include/sys -c /sys/sys/ufs_tables.c
-
clean:
rm -f ${OBJS} fsck core
clean:
rm -f ${OBJS} fsck core
@@
-51,7
+45,7
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 fsck ${DESTDIR}/
etc
/fsck
+ install -s -o bin -g bin -m 755 fsck ${DESTDIR}/
sbin
/fsck
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/fsdb/Makefile
b/usr/src/sbin/fsdb/Makefile
index
8609271
..
ed9ce0d
100644
(file)
--- a/
usr/src/sbin/fsdb/Makefile
+++ b/
usr/src/sbin/fsdb/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 fsdb ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 fsdb ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/icheck/Makefile
b/usr/src/sbin/icheck/Makefile
index
7174e03
..
a8be7bd
100644
(file)
--- a/
usr/src/sbin/icheck/Makefile
+++ b/
usr/src/sbin/icheck/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 icheck ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 icheck ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/ifconfig/Makefile
b/usr/src/sbin/ifconfig/Makefile
index
aced27e
..
0bb10e8
100644
(file)
--- a/
usr/src/sbin/ifconfig/Makefile
+++ b/
usr/src/sbin/ifconfig/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 ifconfig ${DESTDIR}/
etc
/ifconfig
+ install -s -o bin -g bin -m 755 ifconfig ${DESTDIR}/
sbin
/ifconfig
install -c -o bin -g bin -m 444 ifconfig.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ifconfig.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/init/Makefile
b/usr/src/sbin/init/Makefile
index
4ab8365
..
acf2a97
100644
(file)
--- a/
usr/src/sbin/init/Makefile
+++ b/
usr/src/sbin/init/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 700 init ${DESTDIR}/
etc
/init
+ install -s -o bin -g bin -m 700 init ${DESTDIR}/
sbin
/init
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}${MAN8}${MAN}
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}${MAN8}${MAN}
lint: ${SRCS}
diff --git
a/usr/src/sbin/init/pathnames.h
b/usr/src/sbin/init/pathnames.h
index
62ad49c
..
a047314
100644
(file)
--- a/
usr/src/sbin/init/pathnames.h
+++ b/
usr/src/sbin/init/pathnames.h
@@
-14,10
+14,10
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#
define _PATH_BSHELL "/bin/sh"
-#define _PATH_CONSOLE "/dev/console"
+#
include <paths.h>
+
#define _PATH_RC "/etc/rc"
#define _PATH_RCDOWN "/etc/rc.shutdown"
#define _PATH_RC "/etc/rc"
#define _PATH_RCDOWN "/etc/rc.shutdown"
diff --git
a/usr/src/sbin/mknod/Makefile
b/usr/src/sbin/mknod/Makefile
index
801cff7
..
f704c9e
100644
(file)
--- a/
usr/src/sbin/mknod/Makefile
+++ b/
usr/src/sbin/mknod/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 mknod ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 mknod ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/mount/Makefile
b/usr/src/sbin/mount/Makefile
index
9580f8a
..
533e2cb
100644
(file)
--- a/
usr/src/sbin/mount/Makefile
+++ b/
usr/src/sbin/mount/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 mount ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 mount ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/ncheck/Makefile
b/usr/src/sbin/ncheck/Makefile
index
8c55be8
..
cfe5d55
100644
(file)
--- a/
usr/src/sbin/ncheck/Makefile
+++ b/
usr/src/sbin/ncheck/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 ncheck ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 ncheck ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/newfs/Makefile
b/usr/src/sbin/newfs/Makefile
index
70fac4e
..
aa8929a
100644
(file)
--- a/
usr/src/sbin/newfs/Makefile
+++ b/
usr/src/sbin/newfs/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 7.
4
(Berkeley) %G%
+# @(#)Makefile 7.
5
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-37,7
+37,7
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 newfs ${DESTDIR}/
etc
/newfs
+ install -s -o bin -g bin -m 755 newfs ${DESTDIR}/
sbin
/newfs
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/newfs/newfs.c
b/usr/src/sbin/newfs/newfs.c
index
2cfc971
..
f34b36d
100644
(file)
--- a/
usr/src/sbin/newfs/newfs.c
+++ b/
usr/src/sbin/newfs/newfs.c
@@
-11,7
+11,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)newfs.c 6.1
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)newfs.c 6.1
7
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-27,6
+27,7
@@
static char sccsid[] = "@(#)newfs.c 6.16 (Berkeley) %G%";
#include <stdio.h>
#include <ctype.h>
#include <stdio.h>
#include <ctype.h>
+#include <paths.h>
#define COMPAT /* allow non-labeled disks */
#define COMPAT /* allow non-labeled disks */
@@
-395,7
+396,7
@@
next:
special = cp + 1;
if (*special == 'r' && special[1] != 'a' && special[1] != 'b')
special++;
special = cp + 1;
if (*special == 'r' && special[1] != 'a' && special[1] != 'b')
special++;
- (void)sprintf(device, "
/dev/r%s"
, special);
+ (void)sprintf(device, "
%s/r%s", _PATH_DEV
, special);
special = device;
if (!Nflag) {
fso = open(special, O_WRONLY);
special = device;
if (!Nflag) {
fso = open(special, O_WRONLY);
diff --git
a/usr/src/sbin/quotacheck/Makefile
b/usr/src/sbin/quotacheck/Makefile
index
aa8fda1
..
3d6b4f5
100644
(file)
--- a/
usr/src/sbin/quotacheck/Makefile
+++ b/
usr/src/sbin/quotacheck/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 quotacheck ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 quotacheck ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/reboot/Makefile
b/usr/src/sbin/reboot/Makefile
index
9da1f36
..
fb02be5
100644
(file)
--- a/
usr/src/sbin/reboot/Makefile
+++ b/
usr/src/sbin/reboot/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 reboot ${DESTDIR}/
etc/reboot
+ install -s -o bin -g bin -m 755 reboot ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 vax.reboot.0 ${DESTDIR}/usr/man/cat8/vax
install -c -o bin -g bin -m 444 tahoe.reboot.0 ${DESTDIR}/usr/man/cat8/tahoe
install -c -o bin -g bin -m 444 vax.reboot.0 ${DESTDIR}/usr/man/cat8/vax
install -c -o bin -g bin -m 444 tahoe.reboot.0 ${DESTDIR}/usr/man/cat8/tahoe
diff --git
a/usr/src/sbin/reboot/halt.c
b/usr/src/sbin/reboot/halt.c
index
f0e7318
..
9967092
100644
(file)
--- a/
usr/src/sbin/reboot/halt.c
+++ b/
usr/src/sbin/reboot/halt.c
@@
-22,20
+22,21
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)halt.c 5.
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)halt.c 5.
6
(Berkeley) %G%";
#endif /* not lint */
/*
* Halt
*/
#endif /* not lint */
/*
* Halt
*/
-#include <stdio.h>
-#include <sys/reboot.h>
#include <sys/types.h>
#include <sys/types.h>
+#include <sys/reboot.h>
#include <sys/time.h>
#include <sys/syslog.h>
#include <sys/time.h>
#include <sys/syslog.h>
+#include <sys/signal.h>
#include <errno.h>
#include <errno.h>
-#include <signal.h>
#include <pwd.h>
#include <pwd.h>
+#include <stdio.h>
+#include <paths.h>
main(argc, argv)
int argc;
main(argc, argv)
int argc;
@@
-69,7
+70,7
@@
main(argc, argv)
exit(1);
}
exit(1);
}
- if (ttyn &&
*(ttyn+strlen("/dev/tty"))
== 'd') {
+ if (ttyn &&
ttyn[sizeof(_PATH_TTY) - 1]
== 'd') {
fprintf(stderr, "halt: dangerous on a dialup; use ``halt -y'' if you are really sure\n");
exit(1);
}
fprintf(stderr, "halt: dangerous on a dialup; use ``halt -y'' if you are really sure\n");
exit(1);
}
diff --git
a/usr/src/sbin/restore/Makefile
b/usr/src/sbin/restore/Makefile
index
ccec103
..
134ce7c
100644
(file)
--- a/
usr/src/sbin/restore/Makefile
+++ b/
usr/src/sbin/restore/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
6
(Berkeley) %G%
+# @(#)Makefile 5.
7
(Berkeley) %G%
#
VPATH= ../dump:
CFLAGS= -O
#
VPATH= ../dump:
CFLAGS= -O
@@
-47,8
+47,8
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 restore ${DESTDIR}/
etc/restore
- install -s -o root -g bin -m 4755 rrestore ${DESTDIR}/
etc/rrestore
+ install -s -o bin -g bin -m 755 restore ${DESTDIR}/
sbin
+ install -s -o root -g bin -m 4755 rrestore ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/restore/dirs.c
b/usr/src/sbin/restore/dirs.c
index
8fa74e3
..
437b91e
100644
(file)
--- a/
usr/src/sbin/restore/dirs.c
+++ b/
usr/src/sbin/restore/dirs.c
@@
-16,12
+16,13
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)dirs.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)dirs.c 5.
7
(Berkeley) %G%";
#endif /* not lint */
#include "restore.h"
#include <protocols/dumprestore.h>
#include <sys/file.h>
#endif /* not lint */
#include "restore.h"
#include <protocols/dumprestore.h>
#include <sys/file.h>
+#include "pathnames.h"
/*
* Symbol table of directories read from tape.
/*
* Symbol table of directories read from tape.
@@
-86,7
+87,7
@@
extractdirs(genmode)
int putdir(), null();
vprintf(stdout, "Extract directories from tape\n");
int putdir(), null();
vprintf(stdout, "Extract directories from tape\n");
- (void) sprintf(dirfile, "
/tmp/rstdir%d"
, dumpdate);
+ (void) sprintf(dirfile, "
%s/rstdir%d", _PATH_TMP
, dumpdate);
df = fopen(dirfile, "w");
if (df == 0) {
fprintf(stderr,
df = fopen(dirfile, "w");
if (df == 0) {
fprintf(stderr,
@@
-96,7
+97,7
@@
extractdirs(genmode)
done(1);
}
if (genmode != 0) {
done(1);
}
if (genmode != 0) {
- (void) sprintf(modefile, "
/tmp/rstmode%d"
, dumpdate);
+ (void) sprintf(modefile, "
%s/rstmode%d", _PATH_TMP
, dumpdate);
mf = fopen(modefile, "w");
if (mf == 0) {
fprintf(stderr,
mf = fopen(modefile, "w");
if (mf == 0) {
fprintf(stderr,
@@
-457,7
+458,7
@@
setdirmodes()
char *cp;
vprintf(stdout, "Set directory mode, owner, and times.\n");
char *cp;
vprintf(stdout, "Set directory mode, owner, and times.\n");
- (void) sprintf(modefile, "
/tmp/rstmode%d"
, dumpdate);
+ (void) sprintf(modefile, "
%s/rstmode%d", _PATH_TMP
, dumpdate);
mf = fopen(modefile, "r");
if (mf == NULL) {
perror("fopen");
mf = fopen(modefile, "r");
if (mf == NULL) {
perror("fopen");
diff --git
a/usr/src/sbin/restore/main.c
b/usr/src/sbin/restore/main.c
index
746368e
..
d883092
100644
(file)
--- a/
usr/src/sbin/restore/main.c
+++ b/
usr/src/sbin/restore/main.c
@@
-22,7
+22,7
@@
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 */
/*
@@
-45,7
+45,8
@@
static char sccsid[] = "@(#)main.c 5.5 (Berkeley) %G%";
#include "restore.h"
#include <protocols/dumprestore.h>
#include "restore.h"
#include <protocols/dumprestore.h>
-#include <signal.h>
+#include <sys/signal.h>
+#include "pathnames.h"
int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
int hflag = 1, mflag = 1, Nflag = 0;
int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
int hflag = 1, mflag = 1, Nflag = 0;
@@
-66,7
+67,7
@@
main(argc, argv)
{
register char *cp;
ino_t ino;
{
register char *cp;
ino_t ino;
- char *inputdev =
"/dev/rmt8"
;
+ char *inputdev =
_PATH_DEFTAPE
;
char *symtbl = "./restoresymtable";
char name[MAXPATHLEN];
int (*signal())();
char *symtbl = "./restoresymtable";
char name[MAXPATHLEN];
int (*signal())();
diff --git a/usr/src/sbin/restore/pathnames.h
b/usr/src/sbin/restore/pathnames.h
new file mode 100644
(file)
index 0000000..
2eea22a
--- /dev/null
+++ b/
usr/src/sbin/restore/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_DEFTAPE "/dev/rmt8"
diff --git
a/usr/src/sbin/restore/tape.c
b/usr/src/sbin/restore/tape.c
index
e707f0d
..
db20879
100644
(file)
--- a/
usr/src/sbin/restore/tape.c
+++ b/
usr/src/sbin/restore/tape.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)tape.c 5.1
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)tape.c 5.1
6
(Berkeley) %G%";
#endif /* not lint */
#include "restore.h"
#endif /* not lint */
#include "restore.h"
@@
-26,6
+26,7
@@
static char sccsid[] = "@(#)tape.c 5.15 (Berkeley) %G%";
#include <sys/file.h>
#include <setjmp.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <setjmp.h>
#include <sys/stat.h>
+#include "pathnames.h"
static long fssize = MAXBSIZE;
static int mt = -1;
static long fssize = MAXBSIZE;
static int mt = -1;
@@
-52,9
+53,11
@@
static int Qcvt; /* Swap quads (for sun) */
setinput(source)
char *source;
{
setinput(source)
char *source;
{
+ extern int errno;
#ifdef RRESTORE
char *host, *tape;
#endif RRESTORE
#ifdef RRESTORE
char *host, *tape;
#endif RRESTORE
+ char *strerror();
flsht();
if (bflag)
flsht();
if (bflag)
@@
-81,12
+84,14
@@
nohost:
* Since input is coming from a pipe we must establish
* our own connection to the terminal.
*/
* Since input is coming from a pipe we must establish
* our own connection to the terminal.
*/
- terminal = fopen(
"/dev/tty"
, "r");
+ terminal = fopen(
_PATH_TTY
, "r");
if (terminal == NULL) {
if (terminal == NULL) {
- perror("Cannot open(\"/dev/tty\")");
- terminal = fopen("/dev/null", "r");
+ (void)fprintf(stderr, "Cannot open %s: %s\n",
+ _PATH_TTY, strerror(errno));
+ terminal = fopen(_PATH_DEVNULL, "r");
if (terminal == NULL) {
if (terminal == NULL) {
- perror("Cannot open(\"/dev/null\")");
+ (void)fprintf(stderr, "Cannot open %s: %s\n",
+ _PATH_DEVNULL, strerror(errno));
done(1);
}
}
done(1);
}
}
diff --git
a/usr/src/sbin/route/Makefile
b/usr/src/sbin/route/Makefile
index
0c70ee6
..
2b9cd3d
100644
(file)
--- a/
usr/src/sbin/route/Makefile
+++ b/
usr/src/sbin/route/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 route ${DESTDIR}/
etc/route
+ install -s -o bin -g bin -m 755 route ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 route.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 route.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/routed/Makefile
b/usr/src/sbin/routed/Makefile
index
4ce4af5
..
dacb65e
100644
(file)
--- a/
usr/src/sbin/routed/Makefile
+++ b/
usr/src/sbin/routed/Makefile
@@
-14,12
+14,12
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
8
(Berkeley) %G%
+# @(#)Makefile 5.
9
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
-C2= /
lib
/c2
-INLINE= /
sys/machine
/inline/inline
+C2= /
usr/libexec
/c2
+INLINE= /
usr/include/${MACHINE}
/inline/inline
SRCS= af.c if.c input.c main.c output.c startup.c tables.c timer.c \
trace.c inet.c
OBJS= af.o if.o input.o main.o output.o startup.o tables.o timer.o \
SRCS= af.c if.c input.c main.c output.c startup.c tables.c timer.c \
trace.c inet.c
OBJS= af.o if.o input.o main.o output.o startup.o tables.o timer.o \
@@
-52,7
+52,7
@@
depend: ${SRCS}
(cd tools; make ${MFLAGS} depend)
install: ${MAN}
(cd tools; make ${MFLAGS} depend)
install: ${MAN}
- install -s -o bin -g bin -m 755 routed ${DESTDIR}/
etc/routed
+ install -s -o bin -g bin -m 755 routed ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 routed.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 routed.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/routed/main.c
b/usr/src/sbin/routed/main.c
index
803b4a4
..
8b07553
100644
(file)
--- a/
usr/src/sbin/routed/main.c
+++ b/
usr/src/sbin/routed/main.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)main.c 5.1
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 5.1
8
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-37,6
+37,7
@@
static char sccsid[] = "@(#)main.c 5.17 (Berkeley) %G%";
#include <sys/errno.h>
#include <sys/signal.h>
#include <sys/syslog.h>
#include <sys/errno.h>
#include <sys/signal.h>
#include <sys/syslog.h>
+#include "pathnames.h"
int supplier = -1; /* process should supply updates */
int gateway = 0; /* 1 if we are a gateway to parts beyond */
int supplier = -1; /* process should supply updates */
int gateway = 0; /* 1 if we are a gateway to parts beyond */
@@
-116,7
+117,7
@@
main(argc, argv)
(void) open("/", 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
(void) open("/", 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
- t = open(
"/dev/tty"
, 2);
+ t = open(
_PATH_TTY
, 2);
if (t >= 0) {
ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
if (t >= 0) {
ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
diff --git
a/usr/src/sbin/routed/pathnames.h
b/usr/src/sbin/routed/pathnames.h
index
7d99b7b
..
11715ba
100644
(file)
--- a/
usr/src/sbin/routed/pathnames.h
+++ b/
usr/src/sbin/routed/pathnames.h
@@
-14,7
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
+#include <paths.h>
+
#define _PATH_GATEWAYS "/etc/gateways"
#define _PATH_GATEWAYS "/etc/gateways"
diff --git
a/usr/src/sbin/routed/trace.c
b/usr/src/sbin/routed/trace.c
index
79bbfc8
..
7f6fdc3
100644
(file)
--- a/
usr/src/sbin/routed/trace.c
+++ b/
usr/src/sbin/routed/trace.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)trace.c 5.
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)trace.c 5.
9
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-27,6
+27,7
@@
static char sccsid[] = "@(#)trace.c 5.8 (Berkeley) %G%";
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/signal.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/signal.h>
+#include "pathnames.h"
#define NRECORDS 50 /* size of circular trace buffer */
#ifdef DEBUG
#define NRECORDS 50 /* size of circular trace buffer */
#ifdef DEBUG
@@
-93,7
+94,7
@@
traceoff()
if (!traceactions)
return;
if (ftrace != NULL) {
if (!traceactions)
return;
if (ftrace != NULL) {
- int fd = open(
"/dev/null"
, O_RDWR);
+ int fd = open(
_PATH_DEVNULL
, O_RDWR);
fprintf(ftrace, "Tracing disabled %s\n",
ctime((time_t *)&now.tv_sec));
fprintf(ftrace, "Tracing disabled %s\n",
ctime((time_t *)&now.tv_sec));
diff --git
a/usr/src/sbin/savecore/Makefile
b/usr/src/sbin/savecore/Makefile
index
292ea95
..
4499955
100644
(file)
--- a/
usr/src/sbin/savecore/Makefile
+++ b/
usr/src/sbin/savecore/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 savecore ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 savecore ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/savecore/savecore.c
b/usr/src/sbin/savecore/savecore.c
index
451a514
..
01de926
100644
(file)
--- a/
usr/src/sbin/savecore/savecore.c
+++ b/
usr/src/sbin/savecore/savecore.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)savecore.c 5.1
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)savecore.c 5.1
6
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-37,7
+37,7
@@
static char sccsid[] = "@(#)savecore.c 5.15 (Berkeley) %G%";
#include <sys/syslog.h>
#include <stdio.h>
#include <nlist.h>
#include <sys/syslog.h>
#include <stdio.h>
#include <nlist.h>
-#include
"pathnames.h"
+#include
<paths.h>
#define DAY (60L*60L*24L)
#define LEEWAY (3*DAY)
#define DAY (60L*60L*24L)
#define LEEWAY (3*DAY)
@@
-184,7
+184,7
@@
find_dev(dev, type)
struct stat statb;
char *dp;
struct stat statb;
char *dp;
- strcpy(devname,
"/dev/"
);
+ strcpy(devname,
_PATH_DEV
);
if (stat(devname, &statb)) {
perror(devname);
continue;
if (stat(devname, &statb)) {
perror(devname);
continue;
diff --git
a/usr/src/sbin/shutdown/Makefile
b/usr/src/sbin/shutdown/Makefile
index
bf467e8
..
ce765da
100644
(file)
--- a/
usr/src/sbin/shutdown/Makefile
+++ b/
usr/src/sbin/shutdown/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-37,7
+37,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o root -g operator -m 4750 shutdown ${DESTDIR}/
etc/shutdow
n
+ install -s -o root -g operator -m 4750 shutdown ${DESTDIR}/
sbi
n
install -c -o bin -g bin -m 444 shutdown.0 ${DESTDIR}/usr/man/cat8/shutdown.0
lint: ${SRCS}
install -c -o bin -g bin -m 444 shutdown.0 ${DESTDIR}/usr/man/cat8/shutdown.0
lint: ${SRCS}
diff --git
a/usr/src/sbin/shutdown/pathnames.h
b/usr/src/sbin/shutdown/pathnames.h
index
a9bb0ed
..
114a0f8
100644
(file)
--- a/
usr/src/sbin/shutdown/pathnames.h
+++ b/
usr/src/sbin/shutdown/pathnames.h
@@
-14,11
+14,11
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
#define _PATH_FASTBOOT "/fastboot"
*/
#define _PATH_FASTBOOT "/fastboot"
-#define _PATH_HALT "/
etc
/halt"
+#define _PATH_HALT "/
sbin
/halt"
#define _PATH_NOLOGIN "/etc/nologin"
#define _PATH_NOLOGIN "/etc/nologin"
-#define _PATH_REBOOT "/
etc
/reboot"
-#define _PATH_WALL "/bin/wall"
+#define _PATH_REBOOT "/
sbin
/reboot"
+#define _PATH_WALL "/
usr/
bin/wall"
diff --git
a/usr/src/sbin/swapon/Makefile
b/usr/src/sbin/swapon/Makefile
index
2e1f949
..
d5e8f21
100644
(file)
--- a/
usr/src/sbin/swapon/Makefile
+++ b/
usr/src/sbin/swapon/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 swapon ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 swapon ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/tunefs/Makefile
b/usr/src/sbin/tunefs/Makefile
index
d1e0af9
..
d6df813
100644
(file)
--- a/
usr/src/sbin/tunefs/Makefile
+++ b/
usr/src/sbin/tunefs/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 tunefs ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 tunefs ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/sbin/tunefs/tunefs.c
b/usr/src/sbin/tunefs/tunefs.c
index
2d4046e
..
01c515f
100644
(file)
--- a/
usr/src/sbin/tunefs/tunefs.c
+++ b/
usr/src/sbin/tunefs/tunefs.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)tunefs.c 5.
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)tunefs.c 5.
8
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-32,9
+32,9
@@
static char sccsid[] = "@(#)tunefs.c 5.7 (Berkeley) %G%";
#include <sys/stat.h>
#include <sys/fs.h>
#include <sys/inode.h>
#include <sys/stat.h>
#include <sys/fs.h>
#include <sys/inode.h>
-
-#include <stdio.h>
#include <fstab.h>
#include <fstab.h>
+#include <stdio.h>
+#include <paths.h>
union {
struct fs sb;
union {
struct fs sb;
@@
-68,7
+68,7
@@
again:
if (*special != '/') {
if (*special == 'r')
special++;
if (*special != '/') {
if (*special == 'r')
special++;
- (void)sprintf(device, "
/dev/%s"
, special);
+ (void)sprintf(device, "
%s/%s", _PATH_DEV
, special);
special = device;
goto again;
}
special = device;
goto again;
}
diff --git
a/usr/src/sbin/umount/Makefile
b/usr/src/sbin/umount/Makefile
index
cd36ae6
..
ff125f7
100644
(file)
--- a/
usr/src/sbin/umount/Makefile
+++ b/
usr/src/sbin/umount/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 umount ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 umount ${DESTDIR}/
sbin
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git a/usr/src/usr.bin/ar/pathnames.h
b/usr/src/usr.bin/ar/pathnames.h
new file mode 100644
(file)
index 0000000..
d42a875
--- /dev/null
+++ b/
usr/src/usr.bin/ar/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_TMP1 "/tmp/vXXXXX"
+#define _PATH_TMP2 "/tmp/v1XXXXX"
+#define _PATH_TMP3 "/tmp/v2XXXXX"
diff --git
a/usr/src/usr.bin/at/at/Makefile
b/usr/src/usr.bin/at/at/Makefile
index
ac68199
..
8971baa
100644
(file)
--- a/
usr/src/usr.bin/at/at/Makefile
+++ b/
usr/src/usr.bin/at/at/Makefile
@@
-14,13
+14,13
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
7
(Berkeley) %G%
+# @(#)Makefile 5.
8
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= atq.c atrm.c at.c atrun.c
OBJS= atq.o atrm.o at.o atrun.o
#
CFLAGS= -O
LIBC= /lib/libc.a
SRCS= atq.c atrm.c at.c atrun.c
OBJS= atq.o atrm.o at.o atrun.o
-ATRUNDIR= /usr/lib
+ATRUNDIR= /usr/lib
exec
SPOOLDIRS= /usr/spool/at /usr/spool/at/past
SPOOLFILES= /usr/spool/at/lasttimedone
MAN= at.0 atq.0 atrm.0
SPOOLDIRS= /usr/spool/at /usr/spool/at/past
SPOOLFILES= /usr/spool/at/lasttimedone
MAN= at.0 atq.0 atrm.0
diff --git
a/usr/src/usr.bin/at/at/at.c
b/usr/src/usr.bin/at/at/at.c
index
410eeed
..
8c33541
100644
(file)
--- a/
usr/src/usr.bin/at/at/at.c
+++ b/
usr/src/usr.bin/at/at/at.c
@@
-11,7
+11,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)at.c 5.
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)at.c 5.
9
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-34,6
+34,7
@@
static char sccsid[] = "@(#)at.c 5.8 (Berkeley) %G%";
#include <stdio.h>
#include <ctype.h>
#include <pwd.h>
#include <stdio.h>
#include <ctype.h>
#include <pwd.h>
+#include "pathnames.h"
#define HOUR 100 /* 1 hour (using military time) */
#define HALFDAY (12 * HOUR) /* half a day (12 hours) */
#define HOUR 100 /* 1 hour (using military time) */
#define HALFDAY (12 * HOUR) /* half a day (12 hours) */
@@
-43,13
+44,8
@@
static char sccsid[] = "@(#)at.c 5.8 (Berkeley) %G%";
#define DAY 2 /* day requested is a weekday */
#define MONTH 3 /* day requested is a month */
#define DAY 2 /* day requested is a weekday */
#define MONTH 3 /* day requested is a month */
-#define BOURNE "/bin/sh" /* run commands with Bourne shell*/
-#define CSHELL "/bin/csh" /* run commands with C shell */
-
#define NODATEFOUND -1 /* no date was given on command line */
#define NODATEFOUND -1 /* no date was given on command line */
-#define ATDIR "/usr/spool/at" /* spooling area */
-
#define LINSIZ 256 /* length of input buffer */
/*
#define LINSIZ 256 /* length of input buffer */
/*
@@
-129,7
+125,7
@@
char **argv;
int cleanup(); /* do cleanup on an interrupt signal */
int dateindex = NODATEFOUND; /* if a day is specified, what option
is it? (mon day, week, dayofweek) */
int cleanup(); /* do cleanup on an interrupt signal */
int dateindex = NODATEFOUND; /* if a day is specified, what option
is it? (mon day, week, dayofweek) */
- char *shell =
BOURNE;
/* what shell do we use to run job? */
+ char *shell =
_PATH_BSHELL;
/* what shell do we use to run job? */
int shflag = 0; /* override the current shell and run
job using the Bourne Shell */
int cshflag = 0; /* override the current shell and run
int shflag = 0; /* override the current shell and run
job using the Bourne Shell */
int cshflag = 0; /* override the current shell and run
@@
-154,11
+150,11
@@
char **argv;
while (**argv) switch (*(*argv)++) {
case 'c' : cshflag++;
while (**argv) switch (*(*argv)++) {
case 'c' : cshflag++;
- shell = CSHELL;
+ shell =
_PATH_
CSHELL;
break;
case 's' : shflag++;
break;
case 's' : shflag++;
- shell =
BOURNE
;
+ shell =
_PATH_BSHELL
;
break;
case 'm' : mailflag++;
break;
case 'm' : mailflag++;
@@
-483,8
+479,8
@@
char *atfile;
int i; /* scratch variable */
for (i=0; ; i += 53) {
int i; /* scratch variable */
for (i=0; ; i += 53) {
- sprintf(atfile, "%s/%02d.%03d.%02d%02d.%02d",
ATDIR, year
,
- dayofyear, hour, minute, (getpid() + i) % 100);
+ sprintf(atfile, "%s/%02d.%03d.%02d%02d.%02d",
_PATH_ATDIR
,
+
year,
dayofyear, hour, minute, (getpid() + i) % 100);
/*
* Make sure that the file name that we've created is unique.
/*
* Make sure that the file name that we've created is unique.
diff --git a/usr/src/usr.bin/at/at/pathnames.h
b/usr/src/usr.bin/at/at/pathnames.h
new file mode 100644
(file)
index 0000000..
c1b956a
--- /dev/null
+++ b/
usr/src/usr.bin/at/at/pathnames.h
@@ -0,0
+1,25
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_ATDIR "/var/spool/at"
+#define _PATH_LASTFILE "/var/spool/at/lasttimedone"
+#define _PATH_MAIL "/bin/mail"
+#define _PATH_PAST "/var/spool/at/past"
diff --git
a/usr/src/usr.bin/at/atq/atq.c
b/usr/src/usr.bin/at/atq/atq.c
index
3f6a98d
..
c2e85a5
100644
(file)
--- a/
usr/src/usr.bin/at/atq/atq.c
+++ b/
usr/src/usr.bin/at/atq/atq.c
@@
-11,7
+11,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)atq.c 5.
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)atq.c 5.
6
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-38,10
+38,7
@@
static char sccsid[] = "@(#)atq.c 5.5 (Berkeley) %G%";
# include <sys/time.h>
# include <pwd.h>
# include <ctype.h>
# include <sys/time.h>
# include <pwd.h>
# include <ctype.h>
-
-# define ATDIR "/usr/spool/at" /* spooling area */
-# define LASTFILE "/usr/spool/at/lasttimedone" /* update time record
- file */
+# include "pathnames.h"
/*
* Months of the year
/*
* Months of the year
@@
-111,13
+108,13
@@
char **argv;
* files in the queue structure. The queue comes back sorted by
* execution time or creation time.
*/
* files in the queue structure. The queue comes back sorted by
* execution time or creation time.
*/
- if (chdir(ATDIR) == -1) {
- perror(ATDIR);
+ if (chdir(
_PATH_
ATDIR) == -1) {
+ perror(
_PATH_
ATDIR);
exit(1);
}
if ((numentries = scandir(".",&queue,filewanted, (cflag) ? creation :
alphasort)) < 0) {
exit(1);
}
if ((numentries = scandir(".",&queue,filewanted, (cflag) ? creation :
alphasort)) < 0) {
- perror(ATDIR);
+ perror(
_PATH_
ATDIR);
exit(1);
}
exit(1);
}
@@
-327,8
+324,8
@@
plastrun()
* last update hour. The update time is measured in seconds since
* 1/1/70.
*/
* last update hour. The update time is measured in seconds since
* 1/1/70.
*/
- if ((last = fopen(LASTFILE,"r")) == NULL) {
- perror(LASTFILE);
+ if ((last = fopen(
_PATH_
LASTFILE,"r")) == NULL) {
+ perror(
_PATH_
LASTFILE);
exit(1);
}
fscanf(last,"%lu",&lasttime);
exit(1);
}
fscanf(last,"%lu",&lasttime);
diff --git
a/usr/src/usr.bin/at/atrm/atrm.c
b/usr/src/usr.bin/at/atrm/atrm.c
index
d92fe38
..
cc326d6
100644
(file)
--- a/
usr/src/usr.bin/at/atrm/atrm.c
+++ b/
usr/src/usr.bin/at/atrm/atrm.c
@@
-11,7
+11,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)atrm.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)atrm.c 5.
5
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-34,11
+34,10
@@
static char sccsid[] = "@(#)atrm.c 5.4 (Berkeley) %G%";
#include <stdio.h>
#include <pwd.h>
#include <ctype.h>
#include <stdio.h>
#include <pwd.h>
#include <ctype.h>
+#include "pathnames.h"
#define SUPERUSER 0 /* is user super-user? */
#define MAXENTRIES 1000 /* max # of entries allowed */
#define SUPERUSER 0 /* is user super-user? */
#define MAXENTRIES 1000 /* max # of entries allowed */
-#define ATDIR "/usr/spool/at" /* spooling area */
-
int user; /* person requesting removal */
int fflag = 0; /* suppress announcements? */
int user; /* person requesting removal */
int fflag = 0; /* suppress announcements? */
@@
-118,8
+117,8
@@
char **argv;
/*
* Move to spooling area and get user id of person requesting removal.
*/
/*
* Move to spooling area and get user id of person requesting removal.
*/
- if (chdir(ATDIR) == -1) {
- perror(ATDIR);
+ if (chdir(
_PATH_
ATDIR) == -1) {
+ perror(
_PATH_
ATDIR);
exit(1);
}
user = getuid();
exit(1);
}
user = getuid();
@@
-129,7
+128,7
@@
char **argv;
* Get a list of the files in the spooling area.
*/
if ((numjobs = scandir(".",&namelist,filewanted,alphasort)) < 0) {
* Get a list of the files in the spooling area.
*/
if ((numjobs = scandir(".",&namelist,filewanted,alphasort)) < 0) {
- perror(ATDIR);
+ perror(
_PATH_
ATDIR);
exit(1);
}
exit(1);
}
diff --git
a/usr/src/usr.bin/at/atrun/atrun.c
b/usr/src/usr.bin/at/atrun/atrun.c
index
7943dd4
..
d1cd75a
100644
(file)
--- a/
usr/src/usr.bin/at/atrun/atrun.c
+++ b/
usr/src/usr.bin/at/atrun/atrun.c
@@
-11,7
+11,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)atrun.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)atrun.c 5.
7
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-36,16
+36,10
@@
static char sccsid[] = "@(#)atrun.c 5.6 (Berkeley) %G%";
#endif
# include <sys/stat.h>
# include <pwd.h>
#endif
# include <sys/stat.h>
# include <pwd.h>
+# include "pathnames.h"
-# define ATDIR "/usr/spool/at" /* spooling area */
-# define TMPDIR "/tmp" /* area for temporary files */
-# define MAILER "/bin/mail" /* program to use for sending
- mail */
# define NORMAL 0 /* job exited normally */
# define ABNORMAL 1 /* job exited abnormally */
# define NORMAL 0 /* job exited normally */
# define ABNORMAL 1 /* job exited abnormally */
-# define PASTDIR "/usr/spool/at/past" /* area to run jobs from */
-# define LASTFILE "/usr/spool/at/lasttimedone" /* update time file */
-
char nowtime[11]; /* time it is right now (yy.ddd.hhmm) */
char errfile[25]; /* file where we redirect errors to */
char nowtime[11]; /* time it is right now (yy.ddd.hhmm) */
char errfile[25]; /* file where we redirect errors to */
@@
-64,7
+58,7
@@
char **argv;
/*
* Move to the spooling area.
*/
/*
* Move to the spooling area.
*/
- chdir(ATDIR);
+ chdir(
_PATH_
ATDIR);
/*
* Create a filename that represents the time it is now. This is used
/*
* Create a filename that represents the time it is now. This is used
@@
-76,7
+70,7
@@
char **argv;
* Create a queue of the jobs that should be run.
*/
if ((numjobs = scandir(".",&jobqueue,should_be_run, 0)) < 0) {
* Create a queue of the jobs that should be run.
*/
if ((numjobs = scandir(".",&jobqueue,should_be_run, 0)) < 0) {
- perror(ATDIR);
+ perror(
_PATH_
ATDIR);
exit(1);
}
exit(1);
}
@@
-214,9
+208,9
@@
char *spoolfile;
* Move the spoolfile to the directory where jobs are run from and
* then move into that directory.
*/
* Move the spoolfile to the directory where jobs are run from and
* then move into that directory.
*/
- sprintf(runfile,"%s/%s",
PASTDIR
,spoolfile);
+ sprintf(runfile,"%s/%s",
_PATH_PAST
,spoolfile);
rename(spoolfile, runfile);
rename(spoolfile, runfile);
- chdir(
PASTDIR
);
+ chdir(
_PATH_PAST
);
/*
* Create a temporary file where we will redirect errors to.
/*
* Create a temporary file where we will redirect errors to.
@@
-224,7
+218,7
@@
char *spoolfile;
* check on the file.
*/
for (i = 0; i <= 1000; i += 2) {
* check on the file.
*/
for (i = 0; i <= 1000; i += 2) {
- sprintf(errfile,"%s/at.err%d",
TMPDIR
,(getpid() + i));
+ sprintf(errfile,"%s/at.err%d",
_PATH_TMP
,(getpid() + i));
if (access(errfile, F_OK))
break;
if (access(errfile, F_OK))
break;
@@
-253,7
+247,7
@@
char *spoolfile;
* rerun the next time "atrun" is executed and then exit.
*/
if (pid == -1) {
* rerun the next time "atrun" is executed and then exit.
*/
if (pid == -1) {
- chdir(ATDIR);
+ chdir(
_PATH_
ATDIR);
rename(runfile, spoolfile);
exit(1);
}
rename(runfile, spoolfile);
exit(1);
}
@@
-335,8
+329,8
@@
char *spoolfile;
* stderr = /tmp/at.err{pid}
*
*/
* stderr = /tmp/at.err{pid}
*
*/
- open(
"/dev/null"
, 0);
- open(
"/dev/null"
, 1);
+ open(
_PATH_DEVNULL
, 0);
+ open(
_PATH_DEVNULL
, 1);
open(errfile,O_CREAT|O_WRONLY,00644);
/*
open(errfile,O_CREAT|O_WRONLY,00644);
/*
@@
-347,18
+341,6
@@
char *spoolfile;
sprintf(whichshell,"/bin/%s",shell);
execl(whichshell,shell,runfile, 0);
sprintf(whichshell,"/bin/%s",shell);
execl(whichshell,shell,runfile, 0);
- /*
- * If not in /bin, look for the shell in /usr/bin.
- */
- sprintf(whichshell,"/usr/bin/%s",shell);
- execl(whichshell,shell,runfile, 0);
-
- /*
- * If not in /bin, look for the shell in /usr/new.
- */
- sprintf(whichshell,"/usr/new/%s",shell);
- execl(whichshell,shell,runfile, 0);
-
/*
* If we don't succeed by now, we're really having troubles,
* so we'll send the owner some mail.
/*
* If we don't succeed by now, we're really having troubles,
* so we'll send the owner some mail.
@@
-386,13
+368,13
@@
int exitstatus;
/*
* Create the full name for the mail process.
*/
/*
* Create the full name for the mail process.
*/
- sprintf(mailtouser,"%s %s",
MAILER
, user);
+ sprintf(mailtouser,"%s %s",
_PATH_MAIL
, user);
/*
* Open a stream to the mail process.
*/
if ((mailptr = popen(mailtouser,"w")) == NULL) {
/*
* Open a stream to the mail process.
*/
if ((mailptr = popen(mailtouser,"w")) == NULL) {
- perror(
MAILER
);
+ perror(
_PATH_MAIL
);
exit(1);
}
exit(1);
}
@@
-512,9
+494,9
@@
updatetime()
/*
* Open the record file.
*/
/*
* Open the record file.
*/
- if ((lastimefile = fopen(LASTFILE, "w")) == NULL) {
+ if ((lastimefile = fopen(
_PATH_
LASTFILE, "w")) == NULL) {
fprintf(stderr, "can't update lastfile: ");
fprintf(stderr, "can't update lastfile: ");
- perror(LASTFILE);
+ perror(
_PATH_
LASTFILE);
exit(1);
}
exit(1);
}
diff --git a/usr/src/usr.bin/bc/pathnames.h
b/usr/src/usr.bin/bc/pathnames.h
new file mode 100644
(file)
index 0000000..
0743e08
--- /dev/null
+++ b/
usr/src/usr.bin/bc/pathnames.h
@@ -0,0
+1,21
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_LIBB "/usr/share/misc/lib.b"
+#define _PATH_DC "/usr/bin/dc"
diff --git a/usr/src/usr.bin/diction/diction/pathnames.h
b/usr/src/usr.bin/diction/diction/pathnames.h
new file mode 100644
(file)
index 0000000..
e2415ee
--- /dev/null
+++ b/
usr/src/usr.bin/diction/diction/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_DICT "/usr/share/dict/dict.d"
diff --git a/usr/src/usr.bin/diff/diff/pathnames.h
b/usr/src/usr.bin/diff/diff/pathnames.h
new file mode 100644
(file)
index 0000000..
fc0eead
--- /dev/null
+++ b/
usr/src/usr.bin/diff/diff/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_DIFF "/usr/bin/diff"
+#define _PATH_DIFFH "/usr/bin/diffh"
+#define _PATH_PR "/usr/bin/pr"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/dXXXXX"
diff --git a/usr/src/usr.bin/error/pathnames.h
b/usr/src/usr.bin/error/pathnames.h
new file mode 100644
(file)
index 0000000..
ca0054b
--- /dev/null
+++ b/
usr/src/usr.bin/error/pathnames.h
@@ -0,0
+1,27
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define IG_FILE1 "llib-lc"
+#define IG_FILE2 "llib-port"
+#define IG_FILE3 "/usr/lib/llib-lc"
+#define IG_FILE4 "/usr/lib/llib-port"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/ErrorXXXXXX"
diff --git a/usr/src/usr.bin/ex/pathnames.h
b/usr/src/usr.bin/ex/pathnames.h
new file mode 100644
(file)
index 0000000..
4020bc6
--- /dev/null
+++ b/
usr/src/usr.bin/ex/pathnames.h
@@ -0,0
+1,32
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_MAKEKEY "/usr/libexec/makekey"
+#define _PATH_BINMAIL "/bin/mail"
+#define _PATH_EXRECOVER "/usr/libexec/ex3.7recover"
+#define _PATH_EXPRESERVE "/usr/libexec/ex3.7preserve"
+#define _PATH_PRESERVE "/var/preserve"
+#define _PATH_TMP "tmp"
+#ifndef VMUNIX
+#ifndef vms
+#define EXSTRINGS "/usr/libexec/ex3.7strings"
+#endif
+#endif
diff --git a/usr/src/usr.bin/f77/pass1.vax/pathnames.h
b/usr/src/usr.bin/f77/pass1.vax/pathnames.h
new file mode 100644
(file)
index 0000000..
90b5281
--- /dev/null
+++ b/
usr/src/usr.bin/f77/pass1.vax/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_INCLUDES "/usr/include"
diff --git a/usr/src/usr.bin/finger/pathnames.h
b/usr/src/usr.bin/finger/pathnames.h
new file mode 100644
(file)
index 0000000..
7fe4bd6
--- /dev/null
+++ b/
usr/src/usr.bin/finger/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_MAILDIR "/var/spool/mail"
diff --git a/usr/src/usr.bin/ftp/pathnames.h
b/usr/src/usr.bin/ftp/pathnames.h
new file mode 100644
(file)
index 0000000..
7872ef1
--- /dev/null
+++ b/
usr/src/usr.bin/ftp/pathnames.h
@@ -0,0
+1,23
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/ftpXXXXXX"
diff --git a/usr/src/usr.bin/gprof/pathnames.h
b/usr/src/usr.bin/gprof/pathnames.h
new file mode 100644
(file)
index 0000000..
7931f95
--- /dev/null
+++ b/
usr/src/usr.bin/gprof/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_FLAT_BLURB "/usr/share/misc/gprof.flat"
+#define _PATH_CALLG_BLURB "/usr/share/misc/gprof.callg"
+
diff --git a/usr/src/usr.bin/grep/egrep/pathnames.h
b/usr/src/usr.bin/grep/egrep/pathnames.h
new file mode 100644
(file)
index 0000000..
ea29d38
--- /dev/null
+++ b/
usr/src/usr.bin/grep/egrep/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_EGREPSTD "/usr/libexec/old.egrep"
+#define _PATH_GREPSTD "/usr/libexec/old.bin.grep"
+#define _PATH_FGREPSTD "/usr/libexec/old.fgrep"
diff --git a/usr/src/usr.bin/lastcomm/pathnames.h
b/usr/src/usr.bin/lastcomm/pathnames.h
new file mode 100644
(file)
index 0000000..
c9aea5f
--- /dev/null
+++ b/
usr/src/usr.bin/lastcomm/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_ACCT "/usr/adm/acct"
diff --git a/usr/src/usr.bin/learn/learn/pathnames.h
b/usr/src/usr.bin/learn/learn/pathnames.h
new file mode 100644
(file)
index 0000000..
3acad63
--- /dev/null
+++ b/
usr/src/usr.bin/learn/learn/pathnames.h
@@ -0,0
+1,25
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_DEFPATH "PATH=%s/bin:"
+#define _PATH_LEARN "/usr/libdata/learn"
+#define _PATH_RM "/bin/rm"
+#define _PATH_STTY "/bin/stty"
diff --git a/usr/src/usr.bin/locate/locate/pathnames.h
b/usr/src/usr.bin/locate/locate/pathnames.h
new file mode 100644
(file)
index 0000000..
406aa26
--- /dev/null
+++ b/
usr/src/usr.bin/locate/locate/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_FCODES "/usr/libdata/find.database"
diff --git a/usr/src/usr.bin/look/pathnames.h
b/usr/src/usr.bin/look/pathnames.h
new file mode 100644
(file)
index 0000000..
c46048b
--- /dev/null
+++ b/
usr/src/usr.bin/look/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_WORDS "/usr/share/dict/words"
diff --git a/usr/src/usr.bin/m4/pathnames.h
b/usr/src/usr.bin/m4/pathnames.h
new file mode 100644
(file)
index 0000000..
58b68dc
--- /dev/null
+++ b/
usr/src/usr.bin/m4/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_TMP "/tmp/m4aXXXXX"
diff --git a/usr/src/usr.bin/man/pathnames.h
b/usr/src/usr.bin/man/pathnames.h
new file mode 100644
(file)
index 0000000..
f486e9c
--- /dev/null
+++ b/
usr/src/usr.bin/man/pathnames.h
@@ -0,0
+1,23
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_DEFAULT "/usr/share/man:/usr/new/man:/usr/local/man"
+#define _PATH_LOCAL "/usr/local/man"
+#define _PATH_NEW "/usr/new/man"
+#define _PATH_PAGER "/usr/bin/more -s"
diff --git a/usr/src/usr.bin/more/pathnames.h
b/usr/src/usr.bin/more/pathnames.h
new file mode 100644
(file)
index 0000000..
6d108a1
--- /dev/null
+++ b/
usr/src/usr.bin/more/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_HELPFILE "/usr/share/misc/more.help"
diff --git a/usr/src/usr.bin/ptx/pathnames.h
b/usr/src/usr.bin/ptx/pathnames.h
new file mode 100644
(file)
index 0000000..
9f0f22f
--- /dev/null
+++ b/
usr/src/usr.bin/ptx/pathnames.h
@@ -0,0
+1,23
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_EIGN "/usr/share/dict/eign"
+#define _PATH_SORT "/usr/bin/sort"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/ptxsXXXXX"
diff --git a/usr/src/usr.bin/rdist/pathnames.h
b/usr/src/usr.bin/rdist/pathnames.h
new file mode 100644
(file)
index 0000000..
91b956d
--- /dev/null
+++ b/
usr/src/usr.bin/rdist/pathnames.h
@@ -0,0
+1,25
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_RDIST "rdist"
+#define _PATH_SENDMAIL "/usr/libexec/sendmail"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/rdistXXXXXX"
diff --git
a/usr/src/usr.bin/rev/Makefile
b/usr/src/usr.bin/rev/Makefile
index
5c97a02
..
dc1057b
100644
(file)
--- a/
usr/src/usr.bin/rev/Makefile
+++ b/
usr/src/usr.bin/rev/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 rev ${DESTDIR}/usr/
bin
+ install -s -o bin -g bin -m 755 rev ${DESTDIR}/usr/
ucb
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
diff --git a/usr/src/usr.bin/rsh/pathnames.h
b/usr/src/usr.bin/rsh/pathnames.h
new file mode 100644
(file)
index 0000000..
fa30f20
--- /dev/null
+++ b/
usr/src/usr.bin/rsh/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_RLOGIN "/usr/bin/rlogin"
diff --git a/usr/src/usr.bin/sccs/pathnames.h
b/usr/src/usr.bin/sccs/pathnames.h
new file mode 100644
(file)
index 0000000..
b72131e
--- /dev/null
+++ b/
usr/src/usr.bin/sccs/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define PROGPATH(name) "/usr/local/name"
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/sccsXXXXX"
diff --git a/usr/src/usr.bin/sort/pathnames.h
b/usr/src/usr.bin/sort/pathnames.h
new file mode 100644
(file)
index 0000000..
87efdd5
--- /dev/null
+++ b/
usr/src/usr.bin/sort/pathnames.h
@@ -0,0
+1,21
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_TMP1 "/usr/tmp"
+#define _PATH_TMP2 "/tmp"
diff --git a/usr/src/usr.bin/tcopy/pathnames.h
b/usr/src/usr.bin/tcopy/pathnames.h
new file mode 100644
(file)
index 0000000..
ee439b8
--- /dev/null
+++ b/
usr/src/usr.bin/tcopy/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_DEFTAPE "/dev/rmt0"
diff --git a/usr/src/usr.bin/tip/pathnames.h
b/usr/src/usr.bin/tip/pathnames.h
new file mode 100644
(file)
index 0000000..
92e159c
--- /dev/null
+++ b/
usr/src/usr.bin/tip/pathnames.h
@@ -0,0
+1,28
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_ACULOG "/var/log/aculog"
+#define _PATH_LOCKDIRNAME "/var/spool/uucp/LCK..%s"
+#ifdef notdef
+#define _PATH_LOCKDIRNAME "/var/spool/uucp/LCK/LCK..%s"
+#endif
+#define _PATH_PHONES "/etc/phones"
+#define _PATH_REMOTE "/etc/remote"
diff --git a/usr/src/usr.bin/units/pathnames.h
b/usr/src/usr.bin/units/pathnames.h
new file mode 100644
(file)
index 0000000..
139c4e2
--- /dev/null
+++ b/
usr/src/usr.bin/units/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_UNITS "/usr/share/misc/units.lib"
diff --git a/usr/src/usr.bin/uucp/includes/pathnames.h
b/usr/src/usr.bin/uucp/includes/pathnames.h
new file mode 100644
(file)
index 0000000..
03c5335
--- /dev/null
+++ b/
usr/src/usr.bin/uucp/includes/pathnames.h
@@ -0,0
+1,24
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_NEWTTYS "/etc/ttys.new"
+#define _PATH_NOLOGIN "/etc/nologin"
+#define _PATH_TTYS "/etc/ttys"
diff --git
a/usr/src/usr.bin/write/Makefile
b/usr/src/usr.bin/write/Makefile
index
4f1dd71
..
33eea41
100644
(file)
--- a/
usr/src/usr.bin/write/Makefile
+++ b/
usr/src/usr.bin/write/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g tty -m 2755 write ${DESTDIR}/bin
+ install -s -o bin -g tty -m 2755 write ${DESTDIR}/
usr/
bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
diff --git
a/usr/src/usr.bin/write/write.c
b/usr/src/usr.bin/write/write.c
index
3d8287c
..
075c219
100644
(file)
--- a/
usr/src/usr.bin/write/write.c
+++ b/
usr/src/usr.bin/write/write.c
@@
-1,18
+1,18
@@
#ifndef lint
#ifndef lint
-static char *sccsid = "@(#)write.c 4.1
4
%G%";
+static char *sccsid = "@(#)write.c 4.1
5
%G%";
#endif
/*
* write to another user
*/
#endif
/*
* write to another user
*/
-#include <stdio.h>
-#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <signal.h>
-#include <utmp.h>
+#include <sys/signal.h>
#include <sys/time.h>
#include <sys/time.h>
-#include "pathnames.h"
+#include <utmp.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <paths.h>
#define NMAX sizeof(ubuf.ut_name)
#define LMAX sizeof(ubuf.ut_line)
#define NMAX sizeof(ubuf.ut_name)
#define LMAX sizeof(ubuf.ut_line)
diff --git a/usr/src/usr.bin/xsend/common_source/pathnames.h
b/usr/src/usr.bin/xsend/common_source/pathnames.h
new file mode 100644
(file)
index 0000000..
efa6a89
--- /dev/null
+++ b/
usr/src/usr.bin/xsend/common_source/pathnames.h
@@ -0,0
+1,22
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_MAIL "/bin/mail"
+#define _PATH_MAKEKEY "/usr/libexec/makekey"
+#define _PATH_SECRETMAIL "/var/spool/secretmail"
diff --git a/usr/src/usr.bin/xstr/pathnames.h
b/usr/src/usr.bin/xstr/pathnames.h
new file mode 100644
(file)
index 0000000..
55576fc
--- /dev/null
+++ b/
usr/src/usr.bin/xstr/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_TMP "/tmp/xstrXXXXXX"
diff --git
a/usr/src/usr.sbin/ac/Makefile
b/usr/src/usr.sbin/ac/Makefile
index
6844159
..
3905ca6
100644
(file)
--- a/
usr/src/usr.sbin/ac/Makefile
+++ b/
usr/src/usr.sbin/ac/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 ac ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 ac ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/accton/Makefile
b/usr/src/usr.sbin/accton/Makefile
index
3fca01c
..
1038f5b
100644
(file)
--- a/
usr/src/usr.sbin/accton/Makefile
+++ b/
usr/src/usr.sbin/accton/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 accton ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 accton ${DESTDIR}/
usr/sbin
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
diff --git
a/usr/src/usr.sbin/arp/Makefile
b/usr/src/usr.sbin/arp/Makefile
index
849e7ff
..
4622f2d
100644
(file)
--- a/
usr/src/usr.sbin/arp/Makefile
+++ b/
usr/src/usr.sbin/arp/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 arp ${DESTDIR}/
etc/arp
+ install -s -o bin -g kmem -m 2755 arp ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 arp.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 arp.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/arp/arp.c
b/usr/src/usr.sbin/arp/arp.c
index
274f33a
..
a77bfd9
100644
(file)
--- a/
usr/src/usr.sbin/arp/arp.c
+++ b/
usr/src/usr.sbin/arp/arp.c
@@
-25,7
+25,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)arp.c 5.
9
(Berkeley) %G%";
+static char sccsid[] = "@(#)arp.c 5.
10
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-48,8
+48,7
@@
static char sccsid[] = "@(#)arp.c 5.9 (Berkeley) %G%";
#include <errno.h>
#include <nlist.h>
#include <stdio.h>
#include <errno.h>
#include <nlist.h>
#include <stdio.h>
-
-#include "pathnames.h"
+#include <paths.h>
extern int errno;
static int kflag;
extern int errno;
static int kflag;
@@
-73,7
+72,7
@@
main(argc, argv)
}
else
mem = _PATH_KMEM;
}
else
mem = _PATH_KMEM;
- dump((argc >= 3) ? argv[2] : _PATH_
VM
UNIX, mem);
+ dump((argc >= 3) ? argv[2] : _PATH_UNIX, mem);
exit(0);
}
case 'd':
exit(0);
}
case 'd':
@@
-428,7
+427,7
@@
ether_aton(a, n)
usage()
{
printf("usage: arp hostname\n");
usage()
{
printf("usage: arp hostname\n");
- printf(" arp -a [
/vmunix] [/dev/kmem
]\n");
+ printf(" arp -a [
kernel] [kernel_memory
]\n");
printf(" arp -d hostname\n");
printf(" arp -s hostname ether_addr [temp] [pub] [trail]\n");
printf(" arp -f filename\n");
printf(" arp -d hostname\n");
printf(" arp -s hostname ether_addr [temp] [pub] [trail]\n");
printf(" arp -f filename\n");
diff --git
a/usr/src/usr.sbin/bad144/Makefile
b/usr/src/usr.sbin/bad144/Makefile
index
574acab
..
76a9bfa
100644
(file)
--- a/
usr/src/usr.sbin/bad144/Makefile
+++ b/
usr/src/usr.sbin/bad144/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 bad144 ${DESTDIR}/
etc/bad144
+ install -s -o bin -g bin -m 755 bad144 ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 bad144.0 ${DESTDIR}/usr/man/cat8/vax
lint: ${SRCS}
install -c -o bin -g bin -m 444 bad144.0 ${DESTDIR}/usr/man/cat8/vax
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/bad144/bad144.c
b/usr/src/usr.sbin/bad144/bad144.c
index
7e9cd6d
..
f87da9e
100644
(file)
--- a/
usr/src/usr.sbin/bad144/bad144.c
+++ b/
usr/src/usr.sbin/bad144/bad144.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)bad144.c 5.1
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)bad144.c 5.1
6
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-44,9
+44,10
@@
static char sccsid[] = "@(#)bad144.c 5.15 (Berkeley) %G%";
#include <sys/ioctl.h>
#include <sys/fs.h>
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/fs.h>
#include <sys/file.h>
+#include <sys/disklabel.h>
#include <stdio.h>
#include <stdio.h>
-#include <
sys/disklabel
.h>
+#include <
paths
.h>
#define RETRIES 10 /* number of retries on reading old sectors */
#define RAWPART "c" /* disk partition containing badsector tables */
#define RETRIES 10 /* number of retries on reading old sectors */
#define RAWPART "c" /* disk partition containing badsector tables */
@@
-123,7
+124,7
@@
usage:
exit(1);
}
if (argv[0][0] != '/')
exit(1);
}
if (argv[0][0] != '/')
- (void)sprintf(name, "
/dev/r%s%s"
, argv[0], RAWPART);
+ (void)sprintf(name, "
%s/r%s%s", _PATH_DEV
, argv[0], RAWPART);
else
strcpy(name, argv[0]);
f = open(name, argc == 1? O_RDONLY : O_RDWR);
else
strcpy(name, argv[0]);
f = open(name, argc == 1? O_RDONLY : O_RDWR);
diff --git
a/usr/src/usr.sbin/chown/Makefile
b/usr/src/usr.sbin/chown/Makefile
index
18bab04
..
438c503
100644
(file)
--- a/
usr/src/usr.sbin/chown/Makefile
+++ b/
usr/src/usr.sbin/chown/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,9
+38,8
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 chown ${DESTDIR}/etc
- rm -f ${DESTDIR}/bin/chgrp
- ln ${DESTDIR}/etc/chown ${DESTDIR}/bin/chgrp
+ install -c -s -o bin -g bin -m 755 chown ${DESTDIR}/sbin
+ install -s -o bin -g bin -m 755 chown ${DESTDIR}/usr/bin/chgrp
install -c -o bin -g bin -m 444 chown.0 ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 chgrp.0 ${DESTDIR}/usr/man/cat1
install -c -o bin -g bin -m 444 chown.0 ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 chgrp.0 ${DESTDIR}/usr/man/cat1
diff --git
a/usr/src/usr.sbin/chroot/chroot.c
b/usr/src/usr.sbin/chroot/chroot.c
index
153ac0e
..
ff3a9a6
100644
(file)
--- a/
usr/src/usr.sbin/chroot/chroot.c
+++ b/
usr/src/usr.sbin/chroot/chroot.c
@@
-22,11
+22,11
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)chroot.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)chroot.c 5.
5
(Berkeley) %G%";
#endif /* not lint */
#include <stdio.h>
#endif /* not lint */
#include <stdio.h>
-#include
"pathnames.h"
+#include
<paths.h>
main(argc, argv)
int argc;
main(argc, argv)
int argc;
diff --git
a/usr/src/usr.sbin/config/Makefile
b/usr/src/usr.sbin/config/Makefile
index
b696ed9
..
18d2535
100644
(file)
--- a/
usr/src/usr.sbin/config/Makefile
+++ b/
usr/src/usr.sbin/config/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
8
(Berkeley) %G%
+# @(#)Makefile 5.
9
(Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
#
CFLAGS= -O
LIBC= /lib/libc.a
@@
-49,7
+49,7
@@
depend: y.tab.h ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 config ${DESTDIR}/
etc/config
+ install -s -o bin -g bin -m 755 config ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/cron/Makefile
b/usr/src/usr.sbin/cron/Makefile
index
63f5bb2
..
1faa8f5
100644
(file)
--- a/
usr/src/usr.sbin/cron/Makefile
+++ b/
usr/src/usr.sbin/cron/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 cron ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 cron ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
rm -f ${DESTDIR}/usr/man/cat5/crontab.0
ln ${DESTDIR}/usr/man/cat8/cron.0 ${DESTDIR}/usr/man/cat5/crontab.0
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
rm -f ${DESTDIR}/usr/man/cat5/crontab.0
ln ${DESTDIR}/usr/man/cat8/cron.0 ${DESTDIR}/usr/man/cat5/crontab.0
diff --git
a/usr/src/usr.sbin/cron/pathnames.h
b/usr/src/usr.sbin/cron/pathnames.h
index
6a03b5b
..
373084f
100644
(file)
--- a/
usr/src/usr.sbin/cron/pathnames.h
+++ b/
usr/src/usr.sbin/cron/pathnames.h
@@
-14,10
+14,10
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#
define _PATH_CRON "/usr/lib/crontab"
-#define _PATH_LCRON "/usr/lib/crontab.local"
-#define _PATH_
BSHELL "/bin/sh
"
-#define _PATH_
DEVTTY "/dev/tty
"
+#
include <paths.h>
+
+#define _PATH_
CRON "/etc/crontab
"
+#define _PATH_
LCRON "/etc/crontab.local
"
diff --git
a/usr/src/usr.sbin/diskpart/Makefile
b/usr/src/usr.sbin/diskpart/Makefile
index
74b0698
..
72f3445
100644
(file)
--- a/
usr/src/usr.sbin/diskpart/Makefile
+++ b/
usr/src/usr.sbin/diskpart/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 diskpart ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 diskpart ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/edquota/Makefile
b/usr/src/usr.sbin/edquota/Makefile
index
9592148
..
2d73089
100644
(file)
--- a/
usr/src/usr.sbin/edquota/Makefile
+++ b/
usr/src/usr.sbin/edquota/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 edquota ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 edquota ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/edquota/edquota.c
b/usr/src/usr.sbin/edquota/edquota.c
index
70c83a4
..
9a3a21a
100644
(file)
--- a/
usr/src/usr.sbin/edquota/edquota.c
+++ b/
usr/src/usr.sbin/edquota/edquota.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)edquota.c 5.
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)edquota.c 5.
9
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-45,7
+45,7
@@
struct dquot odq[NMOUNT];
char dqf[NMOUNT][MAXPATHLEN + 1];
char odqf[NMOUNT][MAXPATHLEN + 1];
char dqf[NMOUNT][MAXPATHLEN + 1];
char odqf[NMOUNT][MAXPATHLEN + 1];
-char tmpfil[] =
"/tmp/EdP.aXXXXX"
;
+char tmpfil[] =
_PATH_TMP
;
char *qfname = "quotas";
char *getenv();
char *qfname = "quotas";
char *getenv();
@@
-148,7
+148,7
@@
editit()
setgid(getgid());
setuid(getuid());
if ((ed = getenv("EDITOR")) == (char *)0)
setgid(getgid());
setuid(getuid());
if ((ed = getenv("EDITOR")) == (char *)0)
- ed = _PATH_
EDITOR
;
+ ed = _PATH_
VI
;
execlp(ed, ed, tmpfil, 0);
perror(ed);
exit(1);
execlp(ed, ed, tmpfil, 0);
perror(ed);
exit(1);
@@
-395,7
+395,7
@@
putdiscq(uid, dq, dqf)
for (cnt = 0; ++cnt <= NMOUNT && **dqf; dq++, dqf++) {
fs = getfsfile(*dqf);
if (fs == NULL) {
for (cnt = 0; ++cnt <= NMOUNT && **dqf; dq++, dqf++) {
fs = getfsfile(*dqf);
if (fs == NULL) {
- fprintf(stderr, "%s: not in
/etc/
fstab\n", *dqf);
+ fprintf(stderr, "%s: not in fstab\n", *dqf);
continue;
}
strcat(*dqf, "/");
continue;
}
strcat(*dqf, "/");
diff --git
a/usr/src/usr.sbin/edquota/pathnames.h
b/usr/src/usr.sbin/edquota/pathnames.h
index
9c3c740
..
e165578
100644
(file)
--- a/
usr/src/usr.sbin/edquota/pathnames.h
+++ b/
usr/src/usr.sbin/edquota/pathnames.h
@@
-14,7
+14,10
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_EDITOR "/usr/ucb/vi"
+#include <paths.h>
+
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/EdP.aXXXXX"
diff --git
a/usr/src/usr.sbin/inetd/Makefile
b/usr/src/usr.sbin/inetd/Makefile
index
cfab47b
..
74145d9
100644
(file)
--- a/
usr/src/usr.sbin/inetd/Makefile
+++ b/
usr/src/usr.sbin/inetd/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
2
(Berkeley) %G%
+# @(#)Makefile 5.
3
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 inetd ${DESTDIR}/
etc/inetd
+ install -s -o bin -g bin -m 755 inetd ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 inetd.0 ${DESTDIR}/usr/man/cat8
rm -f ${DESTDIR}/usr/man/cat5/inetd.conf.0
ln ${DESTDIR}/usr/man/cat8/inetd.0 ${DESTDIR}/usr/man/cat5/inetd.conf.0
install -c -o bin -g bin -m 444 inetd.0 ${DESTDIR}/usr/man/cat8
rm -f ${DESTDIR}/usr/man/cat5/inetd.conf.0
ln ${DESTDIR}/usr/man/cat8/inetd.0 ${DESTDIR}/usr/man/cat5/inetd.conf.0
diff --git
a/usr/src/usr.sbin/inetd/inetd.c
b/usr/src/usr.sbin/inetd/inetd.c
index
6c31544
..
7814433
100644
(file)
--- a/
usr/src/usr.sbin/inetd/inetd.c
+++ b/
usr/src/usr.sbin/inetd/inetd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)inetd.c 5.1
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)inetd.c 5.1
6
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-200,7
+200,7
@@
main(argc, argv, envp)
(void) open("/", O_RDONLY);
(void) dup2(0, 1);
(void) dup2(0, 2);
(void) open("/", O_RDONLY);
(void) dup2(0, 1);
(void) dup2(0, 2);
- tmpint = open(
"/dev/tty"
, O_RDWR);
+ tmpint = open(
_PATH_TTY
, O_RDWR);
if (tmpint > 0) {
ioctl(tmpint, TIOCNOTTY, (char *)0);
close(tmpint);
if (tmpint > 0) {
ioctl(tmpint, TIOCNOTTY, (char *)0);
close(tmpint);
@@
-317,7
+317,7
@@
main(argc, argv, envp)
if (pid == 0) {
if (debug) {
if (dofork &&
if (pid == 0) {
if (debug) {
if (dofork &&
- (tmpint = open(
"/dev/tty"
, O_RDWR)) > 0) {
+ (tmpint = open(
_PATH_TTY
, O_RDWR)) > 0) {
ioctl(tmpint, TIOCNOTTY, 0);
close(tmpint);
}
ioctl(tmpint, TIOCNOTTY, 0);
close(tmpint);
}
diff --git
a/usr/src/usr.sbin/inetd/pathnames.h
b/usr/src/usr.sbin/inetd/pathnames.h
index
3226e90
..
8235e8d
100644
(file)
--- a/
usr/src/usr.sbin/inetd/pathnames.h
+++ b/
usr/src/usr.sbin/inetd/pathnames.h
@@
-14,7
+14,9
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
+#include <paths.h>
+
#define _PATH_INETDCONF "/etc/inetd.conf"
#define _PATH_INETDCONF "/etc/inetd.conf"
diff --git
a/usr/src/usr.sbin/iostat/Makefile
b/usr/src/usr.sbin/iostat/Makefile
index
719ba7c
..
b09d991
100644
(file)
--- a/
usr/src/usr.sbin/iostat/Makefile
+++ b/
usr/src/usr.sbin/iostat/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 iostat ${DESTDIR}/usr/bin
+ install -s -o bin -g kmem -m 2755 iostat ${DESTDIR}/usr/
s
bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/iostat/iostat.c
b/usr/src/usr.sbin/iostat/iostat.c
index
3076bd2
..
2d2bbd4
100644
(file)
--- a/
usr/src/usr.sbin/iostat/iostat.c
+++ b/
usr/src/usr.sbin/iostat/iostat.c
@@
-1,19
+1,19
@@
#ifndef lint
#ifndef lint
-static char *sccsid = "@(#)iostat.c 4.1
5 (Berkeley) 87/01/12
";
+static char *sccsid = "@(#)iostat.c 4.1
6 (Berkeley) 89/05/11
";
#endif
/*
* iostat
*/
#endif
/*
* iostat
*/
-#include <stdio.h>
-#include <ctype.h>
-#include <nlist.h>
-#include <signal.h>
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/buf.h>
#include <sys/dkstat.h>
#include <sys/types.h>
#include <sys/file.h>
#include <sys/buf.h>
#include <sys/dkstat.h>
+#include <sys/signal.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <nlist.h>
+#include <paths.h>
struct nlist nl[] = {
{ "_dk_busy" },
struct nlist nl[] = {
{ "_dk_busy" },
@@
-92,14
+92,15
@@
main(argc, argv)
long t;
char *arg, **cp, name[6], buf[BUFSIZ];
long t;
char *arg, **cp, name[6], buf[BUFSIZ];
- nlist(
"/vmunix"
, nl);
+ nlist(
_PATH_UNIX
, nl);
if(nl[X_DK_BUSY].n_type == 0) {
if(nl[X_DK_BUSY].n_type == 0) {
- printf("dk_busy not found in /vmunix namelist\n");
+ fprintf(stderr, "iostat: dk_busy not found in %s namelist\n",
+ _PATH_UNIX);
exit(1);
}
exit(1);
}
- mf = open(
"/dev/kmem"
, 0);
+ mf = open(
_PATH_KMEM
, 0);
if(mf < 0) {
if(mf < 0) {
-
printf("cannot open /dev/kmem\n"
);
+
fprintf(stderr, "iostat: cannot open %s\n", _PATH_KMEM
);
exit(1);
}
iter = 0;
exit(1);
}
iter = 0;
diff --git
a/usr/src/usr.sbin/kgmon/Makefile
b/usr/src/usr.sbin/kgmon/Makefile
index
c9a7170
..
5310502
100644
(file)
--- a/
usr/src/usr.sbin/kgmon/Makefile
+++ b/
usr/src/usr.sbin/kgmon/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 kgmon ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 kgmon ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/kgmon/kgmon.c
b/usr/src/usr.sbin/kgmon/kgmon.c
index
35e70ad
..
11be7f7
100644
(file)
--- a/
usr/src/usr.sbin/kgmon/kgmon.c
+++ b/
usr/src/usr.sbin/kgmon/kgmon.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)kgmon.c 5.
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)kgmon.c 5.
9
(Berkeley) %G%";
#endif /* not lint */
#include <machine/pte.h>
#endif /* not lint */
#include <machine/pte.h>
@@
-34,7
+34,7
@@
static char sccsid[] = "@(#)kgmon.c 5.8 (Berkeley) %G%";
#include <stdio.h>
#include <nlist.h>
#include <ctype.h>
#include <stdio.h>
#include <nlist.h>
#include <ctype.h>
-#include
"pathnames.h"
+#include
<paths.h>
#define PROFILING_ON 0
#define PROFILING_OFF 3
#define PROFILING_ON 0
#define PROFILING_OFF 3
diff --git
a/usr/src/usr.sbin/lpr/Makefile
b/usr/src/usr.sbin/lpr/Makefile
index
15dab1c
..
ac3c271
100644
(file)
--- a/
usr/src/usr.sbin/lpr/Makefile
+++ b/
usr/src/usr.sbin/lpr/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.1
0
(Berkeley) %G%
+# @(#)Makefile 5.1
1
(Berkeley) %G%
#
# Ownerships {see note at the top of lpd.c}
# ROOT a user that can access any and all files
#
# Ownerships {see note at the top of lpd.c}
# ROOT a user that can access any and all files
@@
-22,9
+22,7
@@
# SPGRP the group id of the spooling programs
#
CFLAGS= -O
# SPGRP the group id of the spooling programs
#
CFLAGS= -O
-LIBDIR= /usr/lib
-BINDIR= /usr/ucb
-SPLDIR= /usr/spool/lpd
+SPLDIR= /var/spool/lpd
DAEMON= daemon
SPGRP= daemon
LIBC= /lib/libc.a
DAEMON= daemon
SPGRP= daemon
LIBC= /lib/libc.a
@@
-98,14
+96,12
@@
depend: ${SRCS}
cd vfilters; make ${MFLAGS} depend
install: ${MAN}
cd vfilters; make ${MFLAGS} depend
install: ${MAN}
- install -s -o root -g ${SPGRP} -m 6711 lpd ${DESTDIR}/${LIBDIR}/lpd
- install -s -o root -g ${SPGRP} -m 6711 lpr ${DESTDIR}/${BINDIR}/lpr
- install -s -o root -g ${SPGRP} -m 6711 lpq ${DESTDIR}/${BINDIR}/lpq
- install -s -o root -g ${SPGRP} -m 6711 lprm ${DESTDIR}/${BINDIR}/lprm
- install -s -o bin -g ${SPGRP} -m 2711 lpc ${DESTDIR}/etc/lpc
- install -s -o bin -g bin -m 755 lptest ${DESTDIR}/${BINDIR}/lptest
- install -s -o bin -g bin -m 755 pac ${DESTDIR}/etc/pac
- /etc/chown ${DAEMON} ${DESTDIR}/${SPLDIR}
+ install -s -o root -g ${SPGRP} -m 6711 lpd ${DESTDIR}/usr/sbin
+ install -s -o root -g ${SPGRP} -m 6711 lpr lpq lprm \
+ ${DESTDIR}/usr/bin
+ install -s -o bin -g ${SPGRP} -m 2711 lpc ${DESTDIR}/usr/sbin
+ install -s -o bin -g bin -m 755 lptest pac ${DESTDIR}/usr/sbin
+ chown ${DAEMON} ${DESTDIR}/${SPLDIR}
chgrp ${SPGRP} ${DESTDIR}/${SPLDIR}
chmod 775 ${DESTDIR}/${SPLDIR}
install -c -o bin -g bin -m 444 ${MAN1} ${DESTDIR}/usr/man/cat1
chgrp ${SPGRP} ${DESTDIR}/${SPLDIR}
chmod 775 ${DESTDIR}/${SPLDIR}
install -c -o bin -g bin -m 444 ${MAN1} ${DESTDIR}/usr/man/cat1
diff --git
a/usr/src/usr.sbin/lpr/common_source/displayq.c
b/usr/src/usr.sbin/lpr/common_source/displayq.c
index
71a7a6b
..
49aba42
100644
(file)
--- a/
usr/src/usr.sbin/lpr/common_source/displayq.c
+++ b/
usr/src/usr.sbin/lpr/common_source/displayq.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)displayq.c 5.
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)displayq.c 5.
9
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-24,6
+24,7
@@
static char sccsid[] = "@(#)displayq.c 5.8 (Berkeley) %G%";
*/
#include "lp.h"
*/
#include "lp.h"
+#include "pathnames.h"
#define JOBCOL 40 /* column for job # in -l format */
#define OWNCOL 7 /* start of Owner column in normal */
#define JOBCOL 40 /* column for job # in -l format */
#define OWNCOL 7 /* start of Owner column in normal */
@@
-73,11
+74,11
@@
displayq(format)
else if (i == 0)
fatal("unknown printer");
if ((LP = pgetstr("lp", &bp)) == NULL)
else if (i == 0)
fatal("unknown printer");
if ((LP = pgetstr("lp", &bp)) == NULL)
- LP = DEFDEVLP;
+ LP =
_PATH_
DEFDEVLP;
if ((RP = pgetstr("rp", &bp)) == NULL)
RP = DEFLP;
if ((SD = pgetstr("sd", &bp)) == NULL)
if ((RP = pgetstr("rp", &bp)) == NULL)
RP = DEFLP;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((ST = pgetstr("st", &bp)) == NULL)
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((ST = pgetstr("st", &bp)) == NULL)
diff --git
a/usr/src/usr.sbin/lpr/common_source/lp.local.h
b/usr/src/usr.sbin/lpr/common_source/lp.local.h
index
251e362
..
a03264d
100644
(file)
--- a/
usr/src/usr.sbin/lpr/common_source/lp.local.h
+++ b/
usr/src/usr.sbin/lpr/common_source/lp.local.h
@@
-14,7
+14,7
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)lp.local.h 5.
3
(Berkeley) %G%
+ * @(#)lp.local.h 5.
4
(Berkeley) %G%
*/
/*
*/
/*
@@
-43,12
+43,6
@@
#define DEFLP "lp"
#define DEFLOCK "lock"
#define DEFSTAT "status"
#define DEFLP "lp"
#define DEFLOCK "lock"
#define DEFSTAT "status"
-#define DEFSPOOL "/usr/spool/lpd"
-#define DEFDAEMON "/usr/lib/lpd"
-#define DEFLOGF "/dev/console"
-#define DEFDEVLP "/dev/lp"
-#define DEFRLPR "/usr/lib/rlpr"
-#define DEFBINDIR "/usr/ucb"
#define DEFMX 1000
#define DEFMAXCOPIES 0
#define DEFFF "\f"
#define DEFMX 1000
#define DEFMAXCOPIES 0
#define DEFFF "\f"
@@
-74,18
+68,6
@@
#define WIDTH 8 /* width of characters */
#define DROP 3 /* offset to drop characters with descenders */
#define WIDTH 8 /* width of characters */
#define DROP 3 /* offset to drop characters with descenders */
-/*
- * path name of files created by lpd.
- */
-#define MASTERLOCK "/usr/spool/lpd.lock"
-#define SOCKETNAME "/dev/printer"
-
-/*
- * Some utilities used by printjob.
- */
-#define PR "/bin/pr"
-#define MAIL "/usr/lib/sendmail"
-
/*
* Define TERMCAP if the terminal capabilites are to be used for lpq.
*/
/*
* Define TERMCAP if the terminal capabilites are to be used for lpq.
*/
diff --git a/usr/src/usr.sbin/lpr/common_source/pathnames.h
b/usr/src/usr.sbin/lpr/common_source/pathnames.h
new file mode 100644
(file)
index 0000000..
9a2634f
--- /dev/null
+++ b/
usr/src/usr.sbin/lpr/common_source/pathnames.h
@@ -0,0
+1,35
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#include <paths.h>
+
+#define _PATH_DEFDEVLP "/dev/lp"
+#define _PATH_DEFSPOOL "/var/spool/lpd"
+#define _PATH_HOSTSEQUIV "/etc/hosts.equiv"
+#define _PATH_HOSTSLPD "/etc/hosts.lpd"
+#define _PATH_MASTERLOCK "/var/spool/lpd.lock"
+#define _PATH_PR "/usr/bin/pr"
+#define _PATH_PRINTCAP "/etc/printcap"
+#define _PATH_SENDMAIL "/usr/libexec/sendmail"
+#define _PATH_SOCKETNAME "/var/run/printer"
+#define _PATH_VFONT "/usr/libdata/vfont/"
+#define _PATH_VFONTB "/usr/libdata/vfont/B"
+#define _PATH_VFONTI "/usr/libdata/vfont/I"
+#define _PATH_VFONTR "/usr/libdata/vfont/R"
+#define _PATH_VFONTS "/usr/libdata/vfont/S"
diff --git
a/usr/src/usr.sbin/lpr/common_source/printcap.c
b/usr/src/usr.sbin/lpr/common_source/printcap.c
index
b50efba
..
d9286b5
100644
(file)
--- a/
usr/src/usr.sbin/lpr/common_source/printcap.c
+++ b/
usr/src/usr.sbin/lpr/common_source/printcap.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)printcap.c 5.
3
(Berkeley) %G%";
+static char sccsid[] = "@(#)printcap.c 5.
4
(Berkeley) %G%";
#endif /* not lint */
#define BUFSIZ 1024
#endif /* not lint */
#define BUFSIZ 1024
@@
-24,6
+24,8
@@
static char sccsid[] = "@(#)printcap.c 5.3 (Berkeley) %G%";
#include <ctype.h>
#include <stdio.h>
#include <ctype.h>
#include <stdio.h>
+#include "pathnames.h"
+
/*
* termcap - routines for dealing with the terminal capability data base
*
/*
* termcap - routines for dealing with the terminal capability data base
*
@@
-50,8
+52,6
@@
static char sccsid[] = "@(#)printcap.c 5.3 (Berkeley) %G%";
#define tdecode pdecode
#define tnchktc pnchktc
#define tnamatch pnamatch
#define tdecode pdecode
#define tnchktc pnchktc
#define tnamatch pnamatch
-#undef E_TERMCAP
-#define E_TERMCAP "/etc/printcap"
#define V6
#endif
#define V6
#endif
@@
-72,7
+72,7
@@
getprent(bp)
{
register int c, skip = 0;
{
register int c, skip = 0;
- if (pfp == NULL && (pfp = fopen(
E_TERM
CAP, "r")) == NULL)
+ if (pfp == NULL && (pfp = fopen(
_PATH_PRINT
CAP, "r")) == NULL)
return(-1);
tbuf = bp;
for (;;) {
return(-1);
tbuf = bp;
for (;;) {
@@
-147,15
+147,15
@@
tgetent(bp, name)
strcpy(bp,cp);
return(tnchktc());
} else {
strcpy(bp,cp);
return(tnchktc());
} else {
- tf = open(
E_TERM
CAP, 0);
+ tf = open(
_PATH_PRINT
CAP, 0);
}
} else
tf = open(cp, 0);
}
if (tf==0)
}
} else
tf = open(cp, 0);
}
if (tf==0)
- tf = open(
E_TERM
CAP, 0);
+ tf = open(
_PATH_PRINT
CAP, 0);
#else
#else
- tf = open(
E_TERM
CAP, 0);
+ tf = open(
_PATH_PRINT
CAP, 0);
#endif
if (tf < 0)
return (-1);
#endif
if (tf < 0)
return (-1);
diff --git
a/usr/src/usr.sbin/lpr/common_source/rmjob.c
b/usr/src/usr.sbin/lpr/common_source/rmjob.c
index
178e9d1
..
6cc9d57
100644
(file)
--- a/
usr/src/usr.sbin/lpr/common_source/rmjob.c
+++ b/
usr/src/usr.sbin/lpr/common_source/rmjob.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)rmjob.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)rmjob.c 5.
5
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-24,6
+24,7
@@
static char sccsid[] = "@(#)rmjob.c 5.4 (Berkeley) %G%";
*/
#include "lp.h"
*/
#include "lp.h"
+#include "pathnames.h"
/*
* Stuff for handling lprm specifications
/*
* Stuff for handling lprm specifications
@@
-52,11
+53,11
@@
rmjob()
else if (i == 0)
fatal("unknown printer");
if ((SD = pgetstr("sd", &bp)) == NULL)
else if (i == 0)
fatal("unknown printer");
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((LP = pgetstr("lp", &bp)) == NULL)
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((LP = pgetstr("lp", &bp)) == NULL)
- LP = DEFDEVLP;
+ LP =
_PATH_
DEFDEVLP;
if ((RP = pgetstr("rp", &bp)) == NULL)
RP = DEFLP;
RM = pgetstr("rm", &bp);
if ((RP = pgetstr("rp", &bp)) == NULL)
RP = DEFLP;
RM = pgetstr("rm", &bp);
diff --git
a/usr/src/usr.sbin/lpr/common_source/startdaemon.c
b/usr/src/usr.sbin/lpr/common_source/startdaemon.c
index
58f14ef
..
0c80cfd
100644
(file)
--- a/
usr/src/usr.sbin/lpr/common_source/startdaemon.c
+++ b/
usr/src/usr.sbin/lpr/common_source/startdaemon.c
@@
-16,18
+16,19
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)startdaemon.c 5.
3
(Berkeley) %G%";
+static char sccsid[] = "@(#)startdaemon.c 5.
4
(Berkeley) %G%";
#endif /* not lint */
/*
* Tell the printer daemon that there are new files in the spool directory.
*/
#endif /* not lint */
/*
* Tell the printer daemon that there are new files in the spool directory.
*/
-#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <stdio.h>
#include "lp.local.h"
#include "lp.local.h"
+#include "pathnames.h"
startdaemon(printer)
char *printer;
startdaemon(printer)
char *printer;
@@
-42,7
+43,7
@@
startdaemon(printer)
return(0);
}
sun.sun_family = AF_UNIX;
return(0);
}
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, SOCKETNAME);
+ strcpy(sun.sun_path,
_PATH_
SOCKETNAME);
if (connect(s, &sun, strlen(sun.sun_path) + 2) < 0) {
perr("connect");
(void) close(s);
if (connect(s, &sun, strlen(sun.sun_path) + 2) < 0) {
perr("connect");
(void) close(s);
diff --git
a/usr/src/usr.sbin/lpr/lpc/cmds.c
b/usr/src/usr.sbin/lpr/lpc/cmds.c
index
464c4b3
..
76f5d86
100644
(file)
--- a/
usr/src/usr.sbin/lpr/lpc/cmds.c
+++ b/
usr/src/usr.sbin/lpr/lpc/cmds.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)cmds.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)cmds.c 5.
5
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-25,6
+25,7
@@
static char sccsid[] = "@(#)cmds.c 5.4 (Berkeley) %G%";
#include "lp.h"
#include <sys/time.h>
#include "lp.h"
#include <sys/time.h>
+#include "pathnames.h"
/*
* kill an existing daemon and disable printing.
/*
* kill an existing daemon and disable printing.
@@
-73,7
+74,7
@@
abortpr(dis)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
@@
-204,7
+205,7
@@
cleanpr()
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
printf("%s:\n", printer);
for (lp = line, cp = SD; *lp++ = *cp++; )
printf("%s:\n", printer);
for (lp = line, cp = SD; *lp++ = *cp++; )
@@
-300,7
+301,7
@@
enablepr()
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
@@
-363,7
+364,7
@@
disablepr()
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
@@
-436,7
+437,7
@@
putmsg(argc, argv)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((ST = pgetstr("st", &bp)) == NULL)
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((ST = pgetstr("st", &bp)) == NULL)
@@
-585,7
+586,7
@@
startpr(enable)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
@@
-653,7
+654,7
@@
prstat()
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((ST = pgetstr("st", &bp)) == NULL)
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
if ((ST = pgetstr("st", &bp)) == NULL)
@@
-750,7
+751,7
@@
stoppr()
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) sprintf(line, "%s/%s", SD, LO);
@@
-807,7
+808,7
@@
topq(argc, argv)
}
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
}
bp = pbuf;
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
printf("%s:\n", printer);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
printf("%s:\n", printer);
diff --git
a/usr/src/usr.sbin/lpr/lpd/lpd.c
b/usr/src/usr.sbin/lpr/lpd/lpd.c
index
afcea7f
..
5f826c5
100644
(file)
--- a/
usr/src/usr.sbin/lpr/lpd/lpd.c
+++ b/
usr/src/usr.sbin/lpr/lpd/lpd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)lpd.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)lpd.c 5.
7
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-55,6
+55,7
@@
static char sccsid[] = "@(#)lpd.c 5.6 (Berkeley) %G%";
*/
#include "lp.h"
*/
#include "lp.h"
+#include "pathnames.h"
int lflag; /* log requests flag */
int lflag; /* log requests flag */
@@
-94,10
+95,10
@@
main(argc, argv)
exit(0);
for (f = 0; f < 5; f++)
(void) close(f);
exit(0);
for (f = 0; f < 5; f++)
(void) close(f);
- (void) open(
"/dev/null"
, O_RDONLY);
- (void) open(
"/dev/null"
, O_WRONLY);
+ (void) open(
_PATH_DEVNULL
, O_RDONLY);
+ (void) open(
_PATH_DEVNULL
, O_WRONLY);
(void) dup(1);
(void) dup(1);
- f = open(
"/dev/tty"
, O_RDWR);
+ f = open(
_PATH_TTY
, O_RDWR);
if (f > 0) {
ioctl(f, TIOCNOTTY, 0);
(void) close(f);
if (f > 0) {
ioctl(f, TIOCNOTTY, 0);
(void) close(f);
@@
-106,15
+107,15
@@
main(argc, argv)
openlog("lpd", LOG_PID, LOG_LPR);
(void) umask(0);
openlog("lpd", LOG_PID, LOG_LPR);
(void) umask(0);
- lfd = open(MASTERLOCK, O_WRONLY|O_CREAT, 0644);
+ lfd = open(
_PATH_
MASTERLOCK, O_WRONLY|O_CREAT, 0644);
if (lfd < 0) {
if (lfd < 0) {
- syslog(LOG_ERR, "%s: %m", MASTERLOCK);
+ syslog(LOG_ERR, "%s: %m",
_PATH_
MASTERLOCK);
exit(1);
}
if (flock(lfd, LOCK_EX|LOCK_NB) < 0) {
if (errno == EWOULDBLOCK) /* active deamon present */
exit(0);
exit(1);
}
if (flock(lfd, LOCK_EX|LOCK_NB) < 0) {
if (errno == EWOULDBLOCK) /* active deamon present */
exit(0);
- syslog(LOG_ERR, "%s: %m", MASTERLOCK);
+ syslog(LOG_ERR, "%s: %m",
_PATH_
MASTERLOCK);
exit(1);
}
ftruncate(lfd, 0);
exit(1);
}
ftruncate(lfd, 0);
@@
-124,7
+125,7
@@
main(argc, argv)
sprintf(line, "%u\n", getpid());
f = strlen(line);
if (write(lfd, line, f) != f) {
sprintf(line, "%u\n", getpid());
f = strlen(line);
if (write(lfd, line, f) != f) {
- syslog(LOG_ERR, "%s: %m", MASTERLOCK);
+ syslog(LOG_ERR, "%s: %m",
_PATH_
MASTERLOCK);
exit(1);
}
signal(SIGCHLD, reapchild);
exit(1);
}
signal(SIGCHLD, reapchild);
@@
-132,7
+133,7
@@
main(argc, argv)
* Restart all the printers.
*/
startup();
* Restart all the printers.
*/
startup();
- (void) unlink(SOCKETNAME);
+ (void) unlink(
_PATH_
SOCKETNAME);
funix = socket(AF_UNIX, SOCK_STREAM, 0);
if (funix < 0) {
syslog(LOG_ERR, "socket: %m");
funix = socket(AF_UNIX, SOCK_STREAM, 0);
if (funix < 0) {
syslog(LOG_ERR, "socket: %m");
@@
-145,7
+146,7
@@
main(argc, argv)
signal(SIGQUIT, mcleanup);
signal(SIGTERM, mcleanup);
sun.sun_family = AF_UNIX;
signal(SIGQUIT, mcleanup);
signal(SIGTERM, mcleanup);
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, SOCKETNAME);
+ strcpy(sun.sun_path,
_PATH_
SOCKETNAME);
if (bind(funix, &sun, strlen(sun.sun_path) + 2) < 0) {
syslog(LOG_ERR, "ubind: %m");
exit(1);
if (bind(funix, &sun, strlen(sun.sun_path) + 2) < 0) {
syslog(LOG_ERR, "ubind: %m");
exit(1);
@@
-231,7
+232,7
@@
mcleanup()
{
if (lflag)
syslog(LOG_INFO, "exiting");
{
if (lflag)
syslog(LOG_INFO, "exiting");
- unlink(SOCKETNAME);
+ unlink(
_PATH_
SOCKETNAME);
exit(0);
}
exit(0);
}
@@
-423,7
+424,7
@@
chkhost(f)
}
}
*cp = '\0';
}
}
*cp = '\0';
- hostf = fopen(
"/etc/hosts.equiv"
, "r");
+ hostf = fopen(
_PATH_HOSTSEQUIV
, "r");
again:
if (hostf) {
if (!_validuser(hostf, ahost, DUMMY, DUMMY, baselen)) {
again:
if (hostf) {
if (!_validuser(hostf, ahost, DUMMY, DUMMY, baselen)) {
@@
-434,7
+435,7
@@
again:
}
if (first == 1) {
first = 0;
}
if (first == 1) {
first = 0;
- hostf = fopen(
"/etc/hosts.lpd"
, "r");
+ hostf = fopen(
_PATH_HOSTSLPD
, "r");
goto again;
}
fatal("Your host does not have line printer access");
goto again;
}
fatal("Your host does not have line printer access");
diff --git
a/usr/src/usr.sbin/lpr/lpd/printjob.c
b/usr/src/usr.sbin/lpr/lpd/printjob.c
index
6c1bac5
..
ec16f4d
100644
(file)
--- a/
usr/src/usr.sbin/lpr/lpd/printjob.c
+++ b/
usr/src/usr.sbin/lpr/lpd/printjob.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)printjob.c 5.
6
(Berkeley) %G%";
+static char sccsid[] = "@(#)printjob.c 5.
7
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-27,6
+27,7
@@
static char sccsid[] = "@(#)printjob.c 5.6 (Berkeley) %G%";
*/
#include "lp.h"
*/
#include "lp.h"
+#include "pathnames.h"
#define DORETURN 0 /* absorb fork error */
#define DOABORT 1 /* abort if dofork fails */
#define DORETURN 0 /* absorb fork error */
#define DOABORT 1 /* abort if dofork fails */
@@
-82,7
+83,7
@@
printjob()
(void) close(2); /* set up log file */
if (open(LF, O_WRONLY|O_APPEND, 0664) < 0) {
syslog(LOG_ERR, "%s: %m", LF);
(void) close(2); /* set up log file */
if (open(LF, O_WRONLY|O_APPEND, 0664) < 0) {
syslog(LOG_ERR, "%s: %m", LF);
- (void) open(
"/dev/null"
, O_WRONLY);
+ (void) open(
_PATH_DEVNULL
, O_WRONLY);
}
setgid(getegid());
pid = getpid(); /* for use with lprm */
}
setgid(getegid());
pid = getpid(); /* for use with lprm */
@@
-218,11
+219,11
@@
again:
char fonts[4][50]; /* fonts for troff */
char fonts[4][50]; /* fonts for troff */
-char ifonts[4][
18
] = {
-
"/usr/lib/vfont/R"
,
-
"/usr/lib/vfont/I"
,
-
"/usr/lib/vfont/B"
,
- "/usr/lib/vfont/S"
+char ifonts[4][
40
] = {
+
_PATH_VFONTR
,
+
_PATH_VFONTI
,
+
_PATH_VFONTB
,
+ _PATH_VFONTS,
};
/*
};
/*
@@
-459,7
+460,7
@@
print(format, file)
switch (format) {
case 'p': /* print file using 'pr' */
if (IF == NULL) { /* use output filter */
switch (format) {
case 'p': /* print file using 'pr' */
if (IF == NULL) { /* use output filter */
- prog = PR;
+ prog =
_PATH_
PR;
av[0] = "pr";
av[1] = width;
av[2] = length;
av[0] = "pr";
av[1] = width;
av[2] = length;
@@
-475,8
+476,9
@@
print(format, file)
dup2(p[1], 1); /* pipe is stdout */
for (n = 3; n < NOFILE; n++)
(void) close(n);
dup2(p[1], 1); /* pipe is stdout */
for (n = 3; n < NOFILE; n++)
(void) close(n);
- execl(PR, "pr", width, length, "-h", *title ? title : " ", 0);
- syslog(LOG_ERR, "cannot execl %s", PR);
+ execl(_PATH_PR, "pr", width, length,
+ "-h", *title ? title : " ", 0);
+ syslog(LOG_ERR, "cannot execl %s", _PATH_PR);
exit(2);
}
(void) close(p[1]); /* close output side */
exit(2);
}
(void) close(p[1]); /* close output side */
@@
-518,7
+520,7
@@
print(format, file)
} else {
for (n = 0; n < 4; n++) {
if (fonts[n][0] != '/')
} else {
for (n = 0; n < 4; n++) {
if (fonts[n][0] != '/')
- (void) write(fo,
"/usr/lib/vfont/"
, 15);
+ (void) write(fo,
_PATH_VFONT
, 15);
(void) write(fo, fonts[n], strlen(fonts[n]));
(void) write(fo, "\n", 1);
}
(void) write(fo, fonts[n], strlen(fonts[n]));
(void) write(fo, "\n", 1);
}
@@
-921,12
+923,12
@@
sendmail(user, bombed)
dup2(p[0], 0);
for (i = 3; i < NOFILE; i++)
(void) close(i);
dup2(p[0], 0);
for (i = 3; i < NOFILE; i++)
(void) close(i);
- if ((cp = rindex(MAIL, '/')) != NULL)
+ if ((cp = rindex(
_PATH_SEND
MAIL, '/')) != NULL)
cp++;
else
cp++;
else
- cp = MAIL;
+ cp =
_PATH_SEND
MAIL;
sprintf(buf, "%s@%s", user, fromhost);
sprintf(buf, "%s@%s", user, fromhost);
- execl(MAIL, cp, buf, 0);
+ execl(
_PATH_SEND
MAIL, cp, buf, 0);
exit(0);
} else if (s > 0) { /* parent */
dup2(p[1], 1);
exit(0);
} else if (s > 0) { /* parent */
dup2(p[1], 1);
@@
-1028,7
+1030,7
@@
init()
exit(1);
}
if ((LP = pgetstr("lp", &bp)) == NULL)
exit(1);
}
if ((LP = pgetstr("lp", &bp)) == NULL)
- LP = DEFDEVLP;
+ LP =
_PATH_
DEFDEVLP;
if ((RP = pgetstr("rp", &bp)) == NULL)
RP = DEFLP;
if ((LO = pgetstr("lo", &bp)) == NULL)
if ((RP = pgetstr("rp", &bp)) == NULL)
RP = DEFLP;
if ((LO = pgetstr("lo", &bp)) == NULL)
@@
-1036,9
+1038,9
@@
init()
if ((ST = pgetstr("st", &bp)) == NULL)
ST = DEFSTAT;
if ((LF = pgetstr("lf", &bp)) == NULL)
if ((ST = pgetstr("st", &bp)) == NULL)
ST = DEFSTAT;
if ((LF = pgetstr("lf", &bp)) == NULL)
- LF =
DEFLOGF
;
+ LF =
_PATH_CONSOLE
;
if ((SD = pgetstr("sd", &bp)) == NULL)
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((DU = pgetnum("du")) < 0)
DU = DEFUID;
if ((FF = pgetstr("ff", &bp)) == NULL)
if ((DU = pgetnum("du")) < 0)
DU = DEFUID;
if ((FF = pgetstr("ff", &bp)) == NULL)
diff --git
a/usr/src/usr.sbin/lpr/lpd/recvjob.c
b/usr/src/usr.sbin/lpr/lpd/recvjob.c
index
2caa23e
..
0318c44
100644
(file)
--- a/
usr/src/usr.sbin/lpr/lpd/recvjob.c
+++ b/
usr/src/usr.sbin/lpr/lpd/recvjob.c
@@
-16,7
+16,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)recvjob.c 5.
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)recvjob.c 5.
8
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-26,6
+26,7
@@
static char sccsid[] = "@(#)recvjob.c 5.7 (Berkeley) %G%";
#include "lp.h"
#include <sys/fs.h>
#include "lp.h"
#include <sys/fs.h>
+#include "pathnames.h"
char *sp = "";
#define ack() (void) write(1, sp, 1);
char *sp = "";
#define ack() (void) write(1, sp, 1);
@@
-52,16
+53,16
@@
recvjob()
else if (status == 0)
frecverr("unknown printer %s", printer);
if ((LF = pgetstr("lf", &bp)) == NULL)
else if (status == 0)
frecverr("unknown printer %s", printer);
if ((LF = pgetstr("lf", &bp)) == NULL)
- LF =
DEFLOGF
;
+ LF =
_PATH_CONSOLE
;
if ((SD = pgetstr("sd", &bp)) == NULL)
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) close(2); /* set up log file */
if (open(LF, O_WRONLY|O_APPEND, 0664) < 0) {
syslog(LOG_ERR, "%s: %m", LF);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
(void) close(2); /* set up log file */
if (open(LF, O_WRONLY|O_APPEND, 0664) < 0) {
syslog(LOG_ERR, "%s: %m", LF);
- (void) open(
"/dev/null"
, O_WRONLY);
+ (void) open(
_PATH_DEVNULL
, O_WRONLY);
}
if (chdir(SD) < 0)
}
if (chdir(SD) < 0)
@@
-90,13
+91,13
@@
find_dev(dev, type)
register dev_t dev;
register int type;
{
register dev_t dev;
register int type;
{
- register DIR *dfd = opendir(
"/dev"
);
+ register DIR *dfd = opendir(
_PATH_DEV
);
struct direct *dir;
struct stat stb;
char devname[MAXNAMLEN+6];
char *dp;
struct direct *dir;
struct stat stb;
char devname[MAXNAMLEN+6];
char *dp;
- strcpy(devname,
"/dev/"
);
+ strcpy(devname,
_PATH_DEV
);
while ((dir = readdir(dfd))) {
strcpy(devname + 5, dir->d_name);
if (stat(devname, &stb))
while ((dir = readdir(dfd))) {
strcpy(devname + 5, dir->d_name);
if (stat(devname, &stb))
diff --git
a/usr/src/usr.sbin/lpr/lpr/lpr.c
b/usr/src/usr.sbin/lpr/lpr/lpr.c
index
06c50b3
..
1e409d0
100644
(file)
--- a/
usr/src/usr.sbin/lpr/lpr/lpr.c
+++ b/
usr/src/usr.sbin/lpr/lpr/lpr.c
@@
-79,7
+79,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)lpr.c 5.
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)lpr.c 5.
6
(Berkeley) %G%";
#endif /* not lint */
/*
* lpr -- off line print
#endif /* not lint */
/*
* lpr -- off line print
@@
-98,6
+98,7
@@
static char sccsid[] = "@(#)lpr.c 5.5 (Berkeley) %G%";
#include <ctype.h>
#include <syslog.h>
#include "lp.local.h"
#include <ctype.h>
#include <syslog.h>
#include "lp.local.h"
+#include "pathnames.h"
char *tfname; /* tmp copy of cf before linking */
char *cfname; /* daemon control files, linked from tf's */
char *tfname; /* tmp copy of cf before linking */
char *cfname; /* daemon control files, linked from tf's */
@@
-678,7
+679,7
@@
chkprinter(s)
else if (status == 0)
fatal("%s: unknown printer", s);
if ((SD = pgetstr("sd", &bp)) == NULL)
else if (status == 0)
fatal("%s: unknown printer", s);
if ((SD = pgetstr("sd", &bp)) == NULL)
- SD = DEFSPOOL;
+ SD =
_PATH_
DEFSPOOL;
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
RG = pgetstr("rg", &bp);
if ((LO = pgetstr("lo", &bp)) == NULL)
LO = DEFLOCK;
RG = pgetstr("rg", &bp);
diff --git
a/usr/src/usr.sbin/mkproto/Makefile
b/usr/src/usr.sbin/mkproto/Makefile
index
71e022e
..
684cda5
100644
(file)
--- a/
usr/src/usr.sbin/mkproto/Makefile
+++ b/
usr/src/usr.sbin/mkproto/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 mkproto ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 mkproto ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/quotaon/Makefile
b/usr/src/usr.sbin/quotaon/Makefile
index
ef5f625
..
0686cb2
100644
(file)
--- a/
usr/src/usr.sbin/quotaon/Makefile
+++ b/
usr/src/usr.sbin/quotaon/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,9
+38,9
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 quotaon ${DESTDIR}/
etc
- rm -f ${DESTDIR}/
etc
/quotaoff
- ln ${DESTDIR}/
etc/quotaon ${DESTDIR}/etc
/quotaoff
+ install -s -o bin -g bin -m 755 quotaon ${DESTDIR}/
usr/sbin
+ rm -f ${DESTDIR}/
usr/sbin
/quotaoff
+ ln ${DESTDIR}/
usr/sbin/quotaon ${DESTDIR}/usr/sbin
/quotaoff
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git a/usr/src/usr.sbin/quotaon/pathnames.h
b/usr/src/usr.sbin/quotaon/pathnames.h
new file mode 100644
(file)
index 0000000..
054a868
--- /dev/null
+++ b/
usr/src/usr.sbin/quotaon/pathnames.h
@@ -0,0
+1,20
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+#define _PATH_MTAB "/etc/mtab"
diff --git
a/usr/src/usr.sbin/quotaon/quotaon.c
b/usr/src/usr.sbin/quotaon/quotaon.c
index
47bac71
..
b1e3d81
100644
(file)
--- a/
usr/src/usr.sbin/quotaon/quotaon.c
+++ b/
usr/src/usr.sbin/quotaon/quotaon.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)quotaon.c 5.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)quotaon.c 5.
5
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-33,6
+33,7
@@
static char sccsid[] = "@(#)quotaon.c 5.4 (Berkeley) %G%";
#include <stdio.h>
#include <fstab.h>
#include <mtab.h>
#include <stdio.h>
#include <fstab.h>
#include <mtab.h>
+#include "pathnames.h"
struct mtab mtab[NMOUNT];
struct mtab mtab[NMOUNT];
@@
-78,9
+79,9
@@
again:
whoami, whoami);
exit(1);
}
whoami, whoami);
exit(1);
}
- mf = open(
"/etc/mtab"
, O_RDONLY);
+ mf = open(
_PATH_MTAB
, O_RDONLY);
if (mf < 0) {
if (mf < 0) {
- perror(
"/etc/mtab"
);
+ perror(
_PATH_MTAB
);
exit(1);
}
(void) read(mf, (char *)mtab, sizeof (mtab));
exit(1);
}
(void) read(mf, (char *)mtab, sizeof (mtab));
@@
-99,7
+100,7
@@
again:
endfsent();
for (i = 0; i < argc; i++)
if ((done & (1 << i)) == 0)
endfsent();
for (i = 0; i < argc; i++)
if ((done & (1 << i)) == 0)
- fprintf(stderr, "%s not found in
/etc/
fstab\n",
+ fprintf(stderr, "%s not found in fstab\n",
argv[i]);
exit(errs);
}
argv[i]);
exit(errs);
}
@@
-173,7
+174,7
@@
replace:
mp = mtab + NMOUNT - 1;
while (mp > mtab && mp->m_path[0] == '\0')
--mp;
mp = mtab + NMOUNT - 1;
while (mp > mtab && mp->m_path[0] == '\0')
--mp;
- mf = creat(
"/etc/mtab"
, 0644);
+ mf = creat(
_PATH_MTAB
, 0644);
(void) write(mf, (char *)mtab, (mp - mtab + 1) * sizeof (struct mtab));
close(mf);
}
(void) write(mf, (char *)mtab, (mp - mtab + 1) * sizeof (struct mtab));
close(mf);
}
diff --git
a/usr/src/usr.sbin/repquota/Makefile
b/usr/src/usr.sbin/repquota/Makefile
index
52f1238
..
6bf7fa2
100644
(file)
--- a/
usr/src/usr.sbin/repquota/Makefile
+++ b/
usr/src/usr.sbin/repquota/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 repquota ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 repquota ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/rmt/Makefile
b/usr/src/usr.sbin/rmt/Makefile
index
d2302bc
..
072f422
100644
(file)
--- a/
usr/src/usr.sbin/rmt/Makefile
+++ b/
usr/src/usr.sbin/rmt/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 rmt ${DESTDIR}/
etc/rmt
+ install -s -o bin -g bin -m 755 rmt ${DESTDIR}/
usr/libexec
install -c -o bin -g bin -m 444 rmt.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 rmt.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/rwhod/Makefile
b/usr/src/usr.sbin/rwhod/Makefile
index
2847731
..
ec95331
100644
(file)
--- a/
usr/src/usr.sbin/rwhod/Makefile
+++ b/
usr/src/usr.sbin/rwhod/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 rwhod ${DESTDIR}/
etc/rwhod
+ install -s -o bin -g bin -m 755 rwhod ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 rwhod.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 rwhod.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/rwhod/rwhod.c
b/usr/src/usr.sbin/rwhod/rwhod.c
index
685492b
..
6fbcb9d
100644
(file)
--- a/
usr/src/usr.sbin/rwhod/rwhod.c
+++ b/
usr/src/usr.sbin/rwhod/rwhod.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)rwhod.c 5.1
2
(Berkeley) %G%";
+static char sccsid[] = "@(#)rwhod.c 5.1
3
(Berkeley) %G%";
#endif /* not lint */
#include <sys/types.h>
#endif /* not lint */
#include <sys/types.h>
@@
-43,7
+43,7
@@
static char sccsid[] = "@(#)rwhod.c 5.12 (Berkeley) %G%";
#include <syslog.h>
#include <protocols/rwhod.h>
#include <stdio.h>
#include <syslog.h>
#include <protocols/rwhod.h>
#include <stdio.h>
-#include
"pathnames.h"
+#include
<paths.h>
/*
* Alarm interval. Don't forget to change the down time check in ruptime
/*
* Alarm interval. Don't forget to change the down time check in ruptime
@@
-117,7
+117,7
@@
main()
(void) open("/", 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
(void) open("/", 0);
(void) dup2(0, 1);
(void) dup2(0, 2);
- s = open(
"/dev/tty"
, 2);
+ s = open(
_PATH_TTY
, 2);
if (s >= 0) {
ioctl(s, TIOCNOTTY, 0);
(void) close(s);
if (s >= 0) {
ioctl(s, TIOCNOTTY, 0);
(void) close(s);
@@
-314,8
+314,8
@@
onalrm()
* logged on, why worry about efficiency?---but is useful on
* (e.g.) compute servers.
*/
* logged on, why worry about efficiency?---but is useful on
* (e.g.) compute servers.
*/
- if (utmpent && chdir(
"/dev"
)) {
- syslog(LOG_ERR, "chdir(
/dev): %m"
);
+ if (utmpent && chdir(
_PATH_DEV
)) {
+ syslog(LOG_ERR, "chdir(
%s): %m", _PATH_DEV
);
exit(1);
}
we = mywd.wd_we;
exit(1);
}
we = mywd.wd_we;
diff --git
a/usr/src/usr.sbin/sendmail/mailstats/mailstats.c
b/usr/src/usr.sbin/sendmail/mailstats/mailstats.c
index
33423db
..
bc0fd85
100644
(file)
--- a/
usr/src/usr.sbin/sendmail/mailstats/mailstats.c
+++ b/
usr/src/usr.sbin/sendmail/mailstats/mailstats.c
@@
-24,12
+24,13
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)mailstats.c 5.
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)mailstats.c 5.
6
(Berkeley) %G%";
#endif /* not lint */
#include <sys/file.h>
#include <sendmail.h>
#include <mailstats.h>
#endif /* not lint */
#include <sys/file.h>
#include <sendmail.h>
#include <mailstats.h>
+#include "pathnames.h"
main(argc, argv)
int argc;
main(argc, argv)
int argc;
@@
-42,7
+43,7
@@
main(argc, argv)
int ch, fd;
char *sfile, *ctime();
int ch, fd;
char *sfile, *ctime();
- sfile =
"/usr/lib/sendmail.st"
;
+ sfile =
_PATH_MAILSTATS
;
while ((ch = getopt(argc, argv, "f:")) != EOF)
switch((char)ch) {
case 'f':
while ((ch = getopt(argc, argv, "f:")) != EOF)
switch((char)ch) {
case 'f':
diff --git
a/usr/src/usr.sbin/sendmail/src/Makefile
b/usr/src/usr.sbin/sendmail/src/Makefile
index
d298f81
..
abc170b
100644
(file)
--- a/
usr/src/usr.sbin/sendmail/src/Makefile
+++ b/
usr/src/usr.sbin/sendmail/src/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.1
3
(Berkeley) %G%
+# @(#)Makefile 5.1
4
(Berkeley) %G%
#
SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
deliver.c domain.c envelope.c err.c headers.c macro.c main.c \
#
SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
deliver.c domain.c envelope.c err.c headers.c macro.c main.c \
@@
-34,28
+34,28
@@
WHAT= what
PRT= sccs prt
sendmail: ${OBJS} Version.o
PRT= sccs prt
sendmail: ${OBJS} Version.o
- ${CC}
${COPTS}
-o $@ Version.o ${OBJS} -ldbm
+ ${CC} -o $@ Version.o ${OBJS} -ldbm
size sendmail; ls -l sendmail; ${WHAT} < Version.o
dsendmail: ${OBJS} Version.o
size sendmail; ls -l sendmail; ${WHAT} < Version.o
dsendmail: ${OBJS} Version.o
- ${CC}
${COPTS}
-o sendmail Version.o ${OBJS} -ldbm -lresolv
+ ${CC}
-g
-o sendmail Version.o ${OBJS} -ldbm -lresolv
size sendmail; ls -l sendmail; ${WHAT} < Version.o
install: ${MAN}
size sendmail; ls -l sendmail; ${WHAT} < Version.o
install: ${MAN}
- install -c -s -o root -g kmem -m 6755 sendmail ${DESTDIR}/usr/
lib
- install -c -o bin -g bin -m 644 /dev/null ${DESTDIR}/
usr/lib
/sendmail.fc
- install -c -o bin -g bin -m 666 /dev/null ${DESTDIR}/
usr/lib
/sendmail.st
- install -c -o bin -g bin -m 444 sendmail.hf /usr/
lib/sendmail.hf
+ install -c -s -o root -g kmem -m 6755 sendmail ${DESTDIR}/usr/
sbin
+ install -c -o bin -g bin -m 644 /dev/null ${DESTDIR}/
etc
/sendmail.fc
+ install -c -o bin -g bin -m 666 /dev/null ${DESTDIR}/
var/log
/sendmail.st
+ install -c -o bin -g bin -m 444 sendmail.hf /usr/
share/misc
install -c -o bin -g bin -m 444 sendmail.0 ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 aliases.0 ${DESTDIR}/usr/man/cat5
install -c -o bin -g bin -m 444 newaliases.0 ${DESTDIR}/usr/man/cat1
install -c -o bin -g bin -m 444 sendmail.0 ${DESTDIR}/usr/man/cat8
install -c -o bin -g bin -m 444 aliases.0 ${DESTDIR}/usr/man/cat5
install -c -o bin -g bin -m 444 newaliases.0 ${DESTDIR}/usr/man/cat1
- -mkdir ${DESTDIR}/
us
r/spool/mqueue
- chown root.wheel ${DESTDIR}/
us
r/spool/mqueue
- chmod 775 ${DESTDIR}/
us
r/spool/mqueue
- rm -f ${DESTDIR}/usr/
ucb
/newaliases
- ln -s ${DESTDIR}/usr/
lib/sendmail ${DESTDIR}/usr/ucb
/newaliases
- rm -f ${DESTDIR}/usr/
ucb
/mailq
- ln -s ${DESTDIR}/usr/
lib/sendmail ${DESTDIR}/usr/ucb
/mailq
+ -mkdir ${DESTDIR}/
va
r/spool/mqueue
+ chown root.wheel ${DESTDIR}/
va
r/spool/mqueue
+ chmod 775 ${DESTDIR}/
va
r/spool/mqueue
+ rm -f ${DESTDIR}/usr/
bin
/newaliases
+ ln -s ${DESTDIR}/usr/
sbin/sendmail ${DESTDIR}/usr/bin
/newaliases
+ rm -f ${DESTDIR}/usr/
bin
/mailq
+ ln -s ${DESTDIR}/usr/
sbin/sendmail ${DESTDIR}/usr/bin
/mailq
version: newversion ${OBJS} Version.c
version: newversion ${OBJS} Version.c
diff --git
a/usr/src/usr.sbin/sendmail/src/conf.c
b/usr/src/usr.sbin/sendmail/src/conf.c
index
ac6a479
..
f9fca2f
100644
(file)
--- a/
usr/src/usr.sbin/sendmail/src/conf.c
+++ b/
usr/src/usr.sbin/sendmail/src/conf.c
@@
-17,7
+17,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)conf.c 5.1
8
(Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c 5.1
9
(Berkeley) %G%";
#endif /* not lint */
# include <sys/ioctl.h>
#endif /* not lint */
# include <sys/ioctl.h>
@@
-113,8
+113,8
@@
char Arpa_Usrerr[] = "554"; /* some (fatal) user error */
** Location of system files/databases/etc.
*/
** Location of system files/databases/etc.
*/
-char *ConfFile = "/
usr/lib/sendmail.cf";
/* runtime configuration */
-char *FreezeFile = "/
usr/lib/sendmail.fc";
/* frozen version of above */
+char *ConfFile = "/
etc/sendmail.cf";
/* runtime configuration */
+char *FreezeFile = "/
etc/sendmail.fc";
/* frozen version of above */
diff --git
a/usr/src/usr.sbin/syslogd/Makefile
b/usr/src/usr.sbin/syslogd/Makefile
index
738f54e
..
9b6074a
100644
(file)
--- a/
usr/src/usr.sbin/syslogd/Makefile
+++ b/
usr/src/usr.sbin/syslogd/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 syslogd ${DESTDIR}/
etc/syslogd
+ install -s -o bin -g bin -m 755 syslogd ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 syslogd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 syslogd.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/syslogd/pathnames.h
b/usr/src/usr.sbin/syslogd/pathnames.h
index
adb029a
..
6395085
100644
(file)
--- a/
usr/src/usr.sbin/syslogd/pathnames.h
+++ b/
usr/src/usr.sbin/syslogd/pathnames.h
@@
-14,11
+14,12
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
-#define _PATH_CONSOLE "/dev/console"
+#include <paths.h>
+
#define _PATH_KLOG "/dev/klog"
#define _PATH_LOG "/dev/log"
#define _PATH_KLOG "/dev/klog"
#define _PATH_LOG "/dev/log"
-#define _PATH_LOGCONF "/
dev
/syslog.conf"
-#define _PATH_LOGPID "/
dev
/syslog.pid"
+#define _PATH_LOGCONF "/
etc
/syslog.conf"
+#define _PATH_LOGPID "/
var/run
/syslog.pid"
diff --git
a/usr/src/usr.sbin/syslogd/syslogd.c
b/usr/src/usr.sbin/syslogd/syslogd.c
index
85bd526
..
dfd3f06
100644
(file)
--- a/
usr/src/usr.sbin/syslogd/syslogd.c
+++ b/
usr/src/usr.sbin/syslogd/syslogd.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)syslogd.c 5.3
1
(Berkeley) %G%";
+static char sccsid[] = "@(#)syslogd.c 5.3
2
(Berkeley) %G%";
#endif /* not lint */
/*
#endif /* not lint */
/*
@@
-353,7
+353,7
@@
untty()
int i;
if (!Debug) {
int i;
if (!Debug) {
- i = open(
"/dev/tty"
, O_RDWR);
+ i = open(
_PATH_TTY
, O_RDWR);
if (i >= 0) {
(void) ioctl(i, (int) TIOCNOTTY, (char *)0);
(void) close(i);
if (i >= 0) {
(void) ioctl(i, (int) TIOCNOTTY, (char *)0);
(void) close(i);
diff --git
a/usr/src/usr.sbin/timed/timed/Makefile
b/usr/src/usr.sbin/timed/timed/Makefile
index
f0739fc
..
37f6549
100644
(file)
--- a/
usr/src/usr.sbin/timed/timed/Makefile
+++ b/
usr/src/usr.sbin/timed/timed/Makefile
@@
-14,7
+14,7
@@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
7
(Berkeley) %G%
+# @(#)Makefile 5.
8
(Berkeley) %G%
#
# optional flags are: MEASURE TESTING DEBUG
#
#
# optional flags are: MEASURE TESTING DEBUG
#
@@
-51,8
+51,8
@@
depend: ${SRCS}
mkdep ${CFLAGS} ${SRCDS} ${SRCCS} ${COMMS}
install: ${MAN}
mkdep ${CFLAGS} ${SRCDS} ${SRCCS} ${COMMS}
install: ${MAN}
- install -s -o bin -g bin -m 755 timed ${DESTDIR}/
etc
/timed
- install -s -o root -g bin -m 4511 timedc ${DESTDIR}/
etc
/timedc
+ install -s -o bin -g bin -m 755 timed ${DESTDIR}/
usr/sbin
/timed
+ install -s -o root -g bin -m 4511 timedc ${DESTDIR}/
usr/sbin
/timedc
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/timed/timed/pathnames.h
b/usr/src/usr.sbin/timed/timed/pathnames.h
index
e5d01a5
..
3887775
100644
(file)
--- a/
usr/src/usr.sbin/timed/timed/pathnames.h
+++ b/
usr/src/usr.sbin/timed/timed/pathnames.h
@@
-14,8
+14,10
@@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.
1
(Berkeley) %G%
+ * @(#)pathnames.h 5.
2
(Berkeley) %G%
*/
*/
+#include <paths.h>
+
#define _PATH_MASTERLOG "/usr/adm/timed.masterlog"
#define _PATH_TIMEDLOG "/usr/adm/timed.log"
#define _PATH_MASTERLOG "/usr/adm/timed.masterlog"
#define _PATH_TIMEDLOG "/usr/adm/timed.log"
diff --git
a/usr/src/usr.sbin/timed/timed/timed.c
b/usr/src/usr.sbin/timed/timed/timed.c
index
c5ca2ac
..
7925142
100644
(file)
--- a/
usr/src/usr.sbin/timed/timed/timed.c
+++ b/
usr/src/usr.sbin/timed/timed/timed.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)timed.c 2.1
5
(Berkeley) %G%";
+static char sccsid[] = "@(#)timed.c 2.1
6
(Berkeley) %G%";
#endif /* not lint */
#include "globals.h"
#endif /* not lint */
#include "globals.h"
diff --git
a/usr/src/usr.sbin/trpt/Makefile
b/usr/src/usr.sbin/trpt/Makefile
index
ea8ff16
..
45d548d
100644
(file)
--- a/
usr/src/usr.sbin/trpt/Makefile
+++ b/
usr/src/usr.sbin/trpt/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 trpt ${DESTDIR}/
etc/trpt
+ install -s -o bin -g kmem -m 2755 trpt ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 trpt.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 trpt.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/trpt/trpt.c
b/usr/src/usr.sbin/trpt/trpt.c
index
e08fb90
..
2e14d12
100644
(file)
--- a/
usr/src/usr.sbin/trpt/trpt.c
+++ b/
usr/src/usr.sbin/trpt/trpt.c
@@
-22,7
+22,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)trpt.c 5.
7
(Berkeley) %G%";
+static char sccsid[] = "@(#)trpt.c 5.
8
(Berkeley) %G%";
#endif /* not lint */
#include <machine/pte.h>
#endif /* not lint */
#include <machine/pte.h>
@@
-59,7
+59,7
@@
static char sccsid[] = "@(#)trpt.c 5.7 (Berkeley) %G%";
#include <stdio.h>
#include <errno.h>
#include <nlist.h>
#include <stdio.h>
#include <errno.h>
#include <nlist.h>
-#include
"pathnames.h"
+#include
<paths.h>
struct nlist nl[] = {
#define N_TCP_DEBUG 0
struct nlist nl[] = {
#define N_TCP_DEBUG 0
diff --git
a/usr/src/usr.sbin/trsp/Makefile
b/usr/src/usr.sbin/trsp/Makefile
index
79e3161
..
03c1ac5
100644
(file)
--- a/
usr/src/usr.sbin/trsp/Makefile
+++ b/
usr/src/usr.sbin/trsp/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 trsp ${DESTDIR}/
etc/trsp
+ install -s -o bin -g kmem -m 2755 trsp ${DESTDIR}/
usr/sbin
install -c -o bin -g bin -m 444 trsp.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 trsp.0 ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git
a/usr/src/usr.sbin/trsp/trsp.c
b/usr/src/usr.sbin/trsp/trsp.c
index
095384b
..
193ed60
100644
(file)
--- a/
usr/src/usr.sbin/trsp/trsp.c
+++ b/
usr/src/usr.sbin/trsp/trsp.c
@@
-25,7
+25,7
@@
char copyright[] =
#endif /* not lint */
#ifndef lint
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)trsp.c 6.
4
(Berkeley) %G%";
+static char sccsid[] = "@(#)trsp.c 6.
5
(Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
#endif /* not lint */
#include <sys/param.h>
@@
-56,7
+56,7
@@
static char sccsid[] = "@(#)trsp.c 6.4 (Berkeley) %G%";
#include <stdio.h>
#include <errno.h>
#include <nlist.h>
#include <stdio.h>
#include <errno.h>
#include <nlist.h>
-#include
"pathnames.h"
+#include
<paths.h>
unsigned long ntime;
int sflag;
unsigned long ntime;
int sflag;
diff --git
a/usr/src/usr.sbin/update/Makefile
b/usr/src/usr.sbin/update/Makefile
index
ca8f165
..
1647a7c
100644
(file)
--- a/
usr/src/usr.sbin/update/Makefile
+++ b/
usr/src/usr.sbin/update/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 update ${DESTDIR}/
et
c
+ install -s -o bin -g bin -m 755 update ${DESTDIR}/
usr/libexe
c
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
diff --git a/usr/src/usr.sbin/update/pathnames.h
b/usr/src/usr.sbin/update/pathnames.h
new file mode 100644
(file)
index 0000000..
d7cdbab
--- /dev/null
+++ b/
usr/src/usr.sbin/update/pathnames.h
@@ -0,0
+1,26
@@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @(#)pathnames.h 5.1 (Berkeley) %G%
+ */
+
+char *fillst[] = {
+ "/bin",
+ "/usr",
+ "/usr/bin",
+ "/usr/lib",
+ NULL,
+};
diff --git
a/usr/src/usr.sbin/update/update.c
b/usr/src/usr.sbin/update/update.c
index
d5af26a
..
7afe02f
100644
(file)
--- a/
usr/src/usr.sbin/update/update.c
+++ b/
usr/src/usr.sbin/update/update.c
@@
-5,7
+5,7
@@
*/
#ifndef lint
*/
#ifndef lint
-static char sccsid[] = "@(#)update.c 4.
3
(Berkeley) %G%";
+static char sccsid[] = "@(#)update.c 4.
4
(Berkeley) %G%";
#endif
/*
#endif
/*
@@
-18,16
+18,7
@@
static char sccsid[] = "@(#)update.c 4.3 (Berkeley) %G%";
#include <sys/signal.h>
#include <syslog.h>
#include <stdio.h>
#include <sys/signal.h>
#include <syslog.h>
#include <stdio.h>
-
-char *fillst[] = {
- "/bin",
- "/lib",
- "/usr",
- "/usr/bin",
- "/usr/lib",
- "/usr/ucb",
- 0,
-};
+#include "pathnames.h"
main()
{
main()
{
diff --git
a/usr/src/usr.sbin/vipw/Makefile
b/usr/src/usr.sbin/vipw/Makefile
index
38c8160
..
a6d3559
100644
(file)
--- a/
usr/src/usr.sbin/vipw/Makefile
+++ b/
usr/src/usr.sbin/vipw/Makefile
@@
-14,7
+14,7
@@
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
# FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.
1
(Berkeley) %G%
+# @(#)Makefile 5.
2
(Berkeley) %G%
#
CFLAGS= -O
#
CFLAGS= -O
@@
-38,7
+38,7
@@
depend: ${SRCS}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 vipw ${DESTDIR}/
etc
+ install -s -o bin -g bin -m 755 vipw ${DESTDIR}/
sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}