# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.13 (Berkeley) %G%
+# @(#)Makefile 5.14 (Berkeley) %G%
#
CFLAGS= -O -I.
LIBC= /lib/libc.a
mkdep ${CFLAGS} ${SRCS}
install: ${MAN1} ${MAN8}
- install -s -o root -g bin -m 4755 bugfiler ${DESTDIR}/usr/lib
- install -c -o bin -g bin -m 755 sendbug.sh ${DESTDIR}/usr/ucb
- install -c -o bin -g bin -m 644 bugformat ${DESTDIR}/usr/lib
+ install -s -o root -g bin -m 4755 bugfiler ${DESTDIR}/usr/libexec
+ install -c -o bin -g bin -m 755 sendbug.sh ${DESTDIR}/usr/bin/sendbug
+ install -c -o bin -g bin -m 644 bugformat ${DESTDIR}/usr/share/misc
install -c -o bin -g bin -m 444 ${MAN1} ${DESTDIR}/usr/man/cat1
install -c -o bin -g bin -m 444 ${MAN8} ${DESTDIR}/usr/man/cat8
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)bug.h 5.7 (Berkeley) %G%
+ * @(#)bug.h 5.8 (Berkeley) %G%
*/
#define BUGS_HOME "owner-bugs@ucbvax.Berkeley.EDU"
#define BUGS_ID "bugs"
-#define MAIL_CMD "/usr/lib/sendmail -i -t -F \"Bugs Bunny\" -f owner-bugs"
/*
* the METOO definition has the bugfiler exit with an error (-1) status
*/
#ifndef lint
-static char sccsid[] = "@(#)gethead.c 5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)gethead.c 5.7 (Berkeley) %G%";
#endif /* not lint */
#include <bug.h>
#include <sys/stat.h>
#include <stdio.h>
+#include "pathnames.h"
static int chk1(), pbuf();
int fd;
char *distf;
- distf = "/tmp/BUG_XXXXXX";
+ distf = _PATH_TMP;
if (!(fd = mkstemp(distf)) || !(dfp = fdopen(fd, "w+")))
error("can't create redistribution file %s.", distf);
/* disappear after last reference is closed */
*/
#ifndef lint
-static char sccsid[] = "@(#)redist.c 5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)redist.c 5.9 (Berkeley) %G%";
#endif /* not lint */
#include <sys/file.h>
#include <stdio.h>
#include <ctype.h>
#include <bug.h>
+#include "pathnames.h"
/*
* redist --
*/
#ifndef lint
-static char sccsid[] = "@(#)reply.c 5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)reply.c 5.7 (Berkeley) %G%";
#endif /* not lint */
#include <bug.h>
#include <sys/file.h>
#include <stdio.h>
+#include "pathnames.h"
/*
* reply --
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)sendbug.sh 5.8 (Berkeley) %G%
+# @(#)sendbug.sh 5.9 (Berkeley) %G%
#
# Create a bug report and mail to '4bsd-bugs'.
+PATH=/bin:/sbin:/usr/sbin:/usr/bin
+export PATH
+
TEMP=/tmp/bug$$
-FORMAT=/usr/lib/bugformat
+FORMAT=/usr/share/misc/bugformat
# uucp sites should use ": ${BUGADDR=ucbvax!4bsd-bugs}" with a suitable path.
: ${BUGADDR=4bsd-bugs@BERKELEY.EDU}
-: ${EDITOR=/usr/ucb/vi}
+: ${EDITOR=vi}
-trap '/bin/rm -f $TEMP ; exit 1' 1 2 3 13 15
+trap 'rm -f $TEMP ; exit 1' 1 2 3 13 15
-/bin/cp $FORMAT $TEMP
+cp $FORMAT $TEMP
if $EDITOR $TEMP
then
if cmp -s $FORMAT $TEMP
exit
fi
case "$#" in
- 0) /usr/lib/sendmail -t -oi $BUGADDR < $TEMP ;;
- *) /usr/lib/sendmail -t -oi "$@" < $TEMP ;;
+ 0) sendmail -t -oi $BUGADDR < $TEMP ;;
+ *) sendmail -t -oi "$@" < $TEMP ;;
esac
fi
-/bin/rm -f $TEMP
+rm -f $TEMP
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 cpio ${DESTDIR}/bin/cpio
- install -c -o bin -g bin -m 444 cpio.0 ${DESTDIR}/usr/man/cat1/cpio.0
- install -c -o bin -g bin -m 444 cpio_format.0 ${DESTDIR}/usr/man/cat5/cpio.0
+ install -s -o bin -g bin -m 755 cpio ${DESTDIR}/usr/bin
+ install -c -o bin -g bin -m 444 cpio.0 ${DESTDIR}/usr/man/cat1
+ install -c -o bin -g bin -m 444 cpio_format.0 ${DESTDIR}/usr/man/cat5
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <paths.h>
struct utimbuf {
time_t actime;
FILE *Rtty,
*Wtty;
static
-char ttyname[] = "/dev/tty";
+char ttyname[] = _PATH_TTY;
static
char **Pattern = 0;
-static char *sccsid = "@(#)crypt.c 4.3 (Berkeley) %G%";
+static char *sccsid = "@(#)crypt.c 4.4 (Berkeley) %G%";
/*
* A one-rotor machine designed along the lines of Enigma
#define ECHO 010
#include <stdio.h>
+#include "pathnames.h"
#define ROTORSZ 256
#define MASK 0377
char t1[ROTORSZ];
close(1);
dup(pf[0]);
dup(pf[1]);
- execl("/usr/lib/makekey", "-", 0);
- execl("/lib/makekey", "-", 0);
+ execl(_PATH_MAKEKEY, "-", 0);
exit(1);
}
write(pf[1], buf, 10);
# 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%
#
COMMON= ../common_source
CFLAGS= -O -DNEQN -I. -I${COMMON}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 neqn ${DESTDIR}/usr/bin/neqn
+ install -s -o bin -g bin -m 755 neqn ${DESTDIR}/usr/bin
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 machine ${DESTDIR}/bin
+ install -s -o bin -g bin -m 755 machine ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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%
#
MAN= which.0
all which clean cleandir depend lint tags:
install: ${MAN}
- install -c -o bin -g bin -m 755 which.csh ${DESTDIR}/usr/ucb/which
+ install -c -o bin -g bin -m 755 which.csh ${DESTDIR}/usr/bin/which
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 apply ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 apply ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)apply.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)apply.c 5.3 (Berkeley) %G%";
#endif not lint
/*%cc -s -O %
* apply -2 cmp A1 B1 A2 B2 compares A's with B's
* apply "ln %1 /usr/fred/dir" * duplicates a directory
*/
+#include <paths.h>
#include <stdio.h>
+
char *cmdp;
#define NCHARS 512
char cmd[512];
char *shell = getenv("SHELL");
if ((pid = fork()) == 0) {
- execl(shell ? shell : "/bin/sh", "sh", "-c", s, 0);
+ execl(shell ? shell : _PATH_BSHELL, "sh", "-c", s, 0);
_exit(127);
}
if(pid == -1){
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 banner ${DESTDIR}/usr/games
- install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+ install -s -o bin -g bin -m 755 banner ${DESTDIR}/usr/bin
+ install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 biff ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 biff ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 calendar ${DESTDIR}/usr/lib
+ install -s -o bin -g bin -m 755 calendar ${DESTDIR}/usr/libexec
install -c -o bin -g bin -m 755 calendar.sh ${DESTDIR}/usr/bin/calendar
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
# All rights reserved. The Berkeley software License Agreement
# specifies the terms and conditions for redistribution.
#
-# @(#)calendar.sh 4.7 (Berkeley) %G%
+# @(#)calendar.sh 4.8 (Berkeley) %G%
#
-PATH=/usr/lib:/bin:/usr/bin:/usr/ucb:/lib # order important
+PATH=/usr/libexec:/bin:/usr/bin:/usr/ucb:/lib:/usr/pgrm # order important
tmp=/tmp/cal0$$
trap "rm -f $tmp /tmp/cal1$$ /tmp/cal2$$"
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 checknr ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 checknr ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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= -I. -O
+CFLAGS= -O
LIBC= /lib/libc.a
SRCS= chpass.c field.c util.c
OBJS= chpass.o field.o util.o
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
+ install -s -o root -g bin -m 4755 chpass ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
- install -s -o root -g bin -m 4755 chpass ${DESTDIR}/bin/chpass
- rm -f ${DESTDIR}/bin/chfn; ln ${DESTDIR}/bin/chpass ${DESTDIR}/bin/chfn
- rm -f ${DESTDIR}/bin/chsh; ln ${DESTDIR}/bin/chpass ${DESTDIR}/bin/chsh
+ rm -f ${DESTDIR}/usr/bin/chfn; ln ${DESTDIR}/usr/bin/chpass \
+ ${DESTDIR}/usr/bin/chfn
+ rm -f ${DESTDIR}/usr/bin/chsh; ln ${DESTDIR}/usr/bin/chpass \
+ ${DESTDIR}/usr/bin/chsh
rm -f ${DESTDIR}/usr/man/cat1/chfn.0
rm -f ${DESTDIR}/usr/man/cat1/chsh.0
ln ${DESTDIR}/usr/man/cat1/chpass.0 ${DESTDIR}/usr/man/cat1/chfn.0
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)chpass.c 5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)chpass.c 5.11 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
-#include <chpass.h>
#include <strings.h>
+#include "chpass.h"
+#include "pathnames.h"
char e1[] = ": ";
char e2[] = ":,";
int fd, rval;
char *tfile;
- tfile = "/tmp/passwd.XXXXXX";
+ tfile = _PATH_TMP;
if ((fd = mkstemp(tfile)) == -1 || !(fp = fdopen(fd, "w+"))) {
(void)fprintf(stderr, "chpass: no temporary file");
return(0);
*/
#ifndef lint
-static char sccsid[] = "@(#)field.c 5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)field.c 5.9 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
#include <strings.h>
#include <stdio.h>
#include <ctype.h>
-#include <chpass.h>
+#include "chpass.h"
#include "pathnames.h"
/* ARGSUSED */
* 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"
+#include <paths.h>
+
+#undef _PATH_TMP
+#define _PATH_TMP "/tmp/passwd.XXXXXX"
*/
#ifndef lint
-static char sccsid[] = "@(#)util.c 5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)util.c 5.10 (Berkeley) %G%";
#endif /* not lint */
#include <sys/types.h>
#include <tzfile.h>
#include <pwd.h>
#include <stdio.h>
-#include <chpass.h>
#include <strings.h>
#include <ctype.h>
+#include "chpass.h"
#include "pathnames.h"
static int dmsize[] =
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 cmp ${DESTDIR}/bin
+ install -s -o bin -g bin -m 755 cmp ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 colcrt ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 colcrt ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 colrm ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 colrm ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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%
#
CFLAGS= -O -I.
LIBC= /lib/libc.a
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 dc ${DESTDIR}/usr/bin/dc
+ install -s -o bin -g bin -m 755 dc ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#ifndef lint
-static char sccsid[] = "@(#)dc.c 4.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)dc.c 4.6 (Berkeley) %G%";
#endif not lint
+#include <paths.h>
+#include <sys/signal.h>
#include <stdio.h>
-#include <signal.h>
#include "dc.h"
+
main(argc,argv)
int argc;
char *argv[];
while((c = readc()) != '\n')*sl++ = c;
*sl = 0;
if((pid = fork()) == 0){
- execl("/bin/sh","sh","-c",line,0);
+ execl(_PATH_BSHELL,"sh","-c",line,0);
exit(0100);
}
savint = signal(SIGINT, SIG_IGN);
# 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%
#
CFLAGS= -O
LIBC= /lib/libc.a
all: dprog style1 style2 style3
dprog: diction.c ${LIBC}
- ${CC} ${CFLAGS} -DDICT=\"/usr/lib/dict.d\" diction.c -o $@
+ ${CC} ${CFLAGS} diction.c -o $@
style1: nwords.o ${LIBC}
${CC} nwords.o -o $@ -ll
cleandir: clean
rm -f ${MAN} tags .depend
-depend: ${SRCS} FRC
+depend: ${SRCS}
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 style1 ${DESTDIR}/usr/lib
- install -s -o bin -g bin -m 755 style2 ${DESTDIR}/usr/lib
- install -s -o bin -g bin -m 755 style3 ${DESTDIR}/usr/lib
- install -s -o bin -g bin -m 755 dprog ${DESTDIR}/usr/lib
+ install -s -o bin -g bin -m 755 dprog style1 style2 style3 \
+ ${DESTDIR}/usr/libexec
+ install -c -o bin -g bin -m 755 dict.d explain.d \
+ ${DESTDIR}/usr/share/dict
install -c -o bin -g bin -m 755 style.sh ${DESTDIR}/usr/bin/style
install -c -o bin -g bin -m 755 diction.sh ${DESTDIR}/usr/bin/diction
install -c -o bin -g bin -m 755 explain.sh ${DESTDIR}/usr/bin/explain
- install -c -o bin -g bin -m 755 dict.d ${DESTDIR}/usr/lib
- install -c -o bin -g bin -m 755 explain.d ${DESTDIR}/usr/lib
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
rm -f ${DESTDIR}/usr/man/cat1/explain.0
ln ${DESTDIR}/usr/man/cat1/diction.0 ${DESTDIR}/usr/man/cat1/explain.0
-# ln ${DESTDIR}/usr/bin/explain ${DESTDIR}/usr/bin/suggest
lint: ${SRCS}
lint ${CFLAGS} nwords.c
-#! /bin/sh
+#!/bin/sh -
#
-# @(#)suggest.sh 4.4 (Berkeley) 82/11/06
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved. The Berkeley software License Agreement
+# specifies the terms and conditions for redistribution.
+#
+# @(#)suggest.sh 5.2 (Berkeley) %G%
#
trap 'rm $$; exit' 1 2 3 15
-D=/usr/lib/explain.d
+D=/usr/share/dict/explain.d
while echo "phrase?";read x
do
cat >$$ <<dn
#! /bin/sh
#
-# @(#)diction.sh 4.5 (Berkeley) 82/11/06
+# @(#)diction.sh 4.6 (Berkeley) 89/05/11
#
D=/usr/bin
-B=/usr/lib
+B=/usr/libexec
echo $*
rest=
flag=
#ifndef lint
-static char sccsid[] = "@(#)dprog.c 4.2 (Berkeley) 82/11/06";
+static char sccsid[] = "@(#)dprog.c 4.3 (Berkeley) 89/05/11";
#endif not lint
/*
#include <stdio.h>
#include <ctype.h>
+#include "pathnames.h"
#define MAXSIZ 6500
#define QSIZE 650
}
out:
if(nflag){
- wordf = fopen(DICT,"r");
+ wordf = fopen(_PATH_DICT,"r");
if(wordf == NULL){
fprintf(stderr,"diction: can't open default dictionary\n");
exit(2);
#! /bin/sh
#
-# @(#)explain.sh 4.5 (Berkeley) 83/05/27
+# @(#)explain.sh 4.6 (Berkeley) 89/05/11
#
-D=/usr/lib/explain.d
+D=/usr/share/dict/explain.d
while echo 'phrase?'
read x
do
#! /bin/sh
#
-# @(#)style.sh 4.5 (Berkeley) 82/11/06
+# @(#)style.sh 4.6 (Berkeley) 89/05/11
#
-L=/usr/lib
-B=/usr/bin
+L=/usr/libexec
+B=/usr/ucb
echo " " $*
sflag=-s
eflag=
# 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%
#
-DIFF= /bin/diff
-DIFFH= /usr/lib/diffh
-PR= /bin/pr
-CFLAGS= -O -DDIFF='"${DIFF}"' -DDIFFH='"${DIFFH}"' -DPR='"${PR}"'
+CFLAGS= -O
LIBC= /lib/libc.a
SRCS= diff.c diffdir.c diffreg.c
OBJS= diff.o diffdir.o diffreg.o
mkdep ${CFLAGS} ${HSRCS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 diff ${DESTDIR}/bin/diff
- install -s -o bin -g bin -m 755 diffh ${DESTDIR}/usr/lib/diffh
+ install -s -o bin -g bin -m 755 diff ${DESTDIR}/usr/bin/diff
+ install -s -o bin -g bin -m 755 diffh ${DESTDIR}/usr/bin/diffh
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
rm -f ${DESTDIR}/usr/man/cat1/diffh.0
ln ${DESTDIR}/usr/man/cat1/diff.0 ${DESTDIR}/usr/man/cat1/diffh.0
-static char sccsid[] = "@(#)diff.c 4.6 %G%";
+static char sccsid[] = "@(#)diff.c 4.7 %G%";
#include "diff.h"
+#include "pathnames.h"
+
/*
* diff - driver and subroutines
*/
-char diff[] = DIFF;
-char diffh[] = DIFFH;
-char pr[] = PR;
+char diff[] = _PATH_DIFF;
+char diffh[] = _PATH_DIFFH;
+char pr[] = _PATH_PR;
main(argc, argv)
int argc;
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 4.5 (Berkeley) %G%
+# @(#)Makefile 4.6 (Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 diff3 $(DESTDIR)/usr/lib/diff3
+ install -s -o bin -g bin -m 755 diff3 $(DESTDIR)/usr/libexec/diff3
install -c -o bin -g bin -m 755 diff3.sh $(DESTDIR)/usr/bin/diff3
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
#! /bin/sh
#
-# diff3.sh 4.1 83/02/10
+# diff3.sh 4.2 89/05/11
#
e=
case $1 in
trap "rm -f /tmp/d3[ab]$$" 0 1 2 13 15
diff $1 $3 >/tmp/d3a$$
diff $2 $3 >/tmp/d3b$$
-/usr/lib/diff3 $e /tmp/d3[ab]$$ $1 $2 $3
+/usr/libexec/diff3 $e /tmp/d3[ab]$$ $1 $2 $3
#endif not lint
#ifndef lint
-static char *sccsid = "@(#)ex.c 7.6.1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)ex.c 7.7 (Berkeley) %G%";
#endif not lint
#include "ex.h"
#include "ex_argv.h"
#include "ex_temp.h"
#include "ex_tty.h"
+#include "pathnames.h"
#ifdef TRACE
#ifdef vms
if (ac == 0) {
ppid = 0;
setrupt();
- execl(EXRECOVER, "exrecover", "-r", 0);
- filioerr(EXRECOVER);
+ execl(_PATH_EXRECOVER, "exrecover", "-r", 0);
+ filioerr(_PATH_EXRECOVER);
ex_exit(1);
}
CP(savedfile, *av++), ac--;
#endif not lint
#ifndef lint
-static char *sccsid = "@(#)ex3.7preserve.c 7.13 (Berkeley) %G%";
+static char *sccsid = "@(#)ex3.7preserve.c 7.14 (Berkeley) %G%";
#endif not lint
-#include <stdio.h>
-#include <ctype.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/dir.h>
#include <pwd.h>
-#include "uparm.h"
-
-#define TMP "/tmp"
+#include <stdio.h>
+#include <ctype.h>
+#include "pathnames.h"
#ifdef VMUNIX
#define HBLKS 2
char xstr[1]; /* make loader happy */
/*
- * Expreserve - preserve a file in usrpath(preserve)
+ * Expreserve - preserve a file in _PATH_PRESERVE.
* Bill Joy UCB November 13, 1977
*
* This routine is very naive - it doesn't remove anything from
- * usrpath(preserve)... this may mean that we leave
- * stuff there... the danger in doing anything with usrpath(preserve)
+ * _PATH_PRESERVE... this may mean that we leave
+ * stuff there... the danger in doing anything with _PATH_PRESERVE
* is that the clock may be screwed up and we may get confused.
*
* We are called in two ways - first from the editor with no argumentss
* ... else preserve all the stuff in /tmp, removing
* it as we go.
*/
- if (chdir(TMP) < 0) {
- perror(TMP);
+ if (chdir(_PATH_TMP) < 0) {
+ perror(_PATH_TMP);
exit(1);
}
tf = opendir(".");
if (tf == NULL) {
- perror(TMP);
+ perror(_PATH_TMP);
exit(1);
}
while ((dirent = readdir(tf)) != NULL) {
exit(0);
}
-char pattern[] = usrpath(preserve/Exaa`XXXXX);
+char pattern[MAXPATHLEN];
/*
- * Copy file name into usrpath(preserve)/...
+ * Copy file name into pattern[].
* If name is (char *) 0, then do the standard input.
* We make some checks on the input to make sure it is
* really an editor temporary, generate a name for the
static int reenter;
char buf[BUFSIZ];
+ (void)sprintf(pattern, "%s/Exaa`XXXXX", _PATH_PRESERVE);
/*
* The first time we put in the digits of our
* process number at the end of the pattern.
gethostname(hostname, sizeof(hostname));
timestamp = ctime(&time);
timestamp[16] = 0; /* blast from seconds on */
- sprintf(cmd, "/bin/mail %s", pp->pw_name);
+ sprintf(cmd, "%s %s", _PATH_BINMAIL, pp->pw_name);
setuid(getuid());
mf = popen(cmd, "w");
if (mf == NULL)
#endif not lint
#ifndef lint
-static char *sccsid = "@(#)ex3.7recover.c 7.9 (Berkeley) %G%";
+static char *sccsid = "@(#)ex3.7recover.c 7.10 (Berkeley) %G%";
#endif not lint
#include <stdio.h> /* mjm: BUFSIZ: stdio = 512, VMUNIX = 1024 */
#include "ex_temp.h"
#include "ex_tty.h"
#include <sys/dir.h>
-#include "uparm.h"
char xstr[1]; /* make loader happy */
short tfile = -1; /* ditto */
/*
*
* This program searches through the specified directory and then
- * the directory usrpath(preserve) looking for an instance of the specified
+ * the directory _PATH_USRPRESERVE looking for an instance of the specified
* file from a crashed editor or a crashed system.
* If this file is found, it is unscrambled and written to
* the standard output.
#define ignorl(a) a
#endif
-/*
- * This directory definition also appears (obviously) in expreserve.c.
- * Change both if you change either.
- */
-char mydir[] = usrpath(preserve);
-
/*
* Limit on the number of printed entries
* when an, e.g. ``ex -r'' command is given.
* If given only a -r argument, then list the saved files.
*/
if (argc == 2 && eq(argv[1], "-r")) {
- listfiles(mydir);
+ listfiles(_PATH_PRESERVE);
exit(0);
}
if (argc != 3)
struct svfile *fp, svbuf[NENTRY];
/*
- * Open usrpath(preserve), and go there to make things quick.
+ * Open _PATH_PRESERVE, and go there to make things quick.
*/
dir = opendir(dirname);
if (dir == NULL) {
}
/*
- * Look at the candidate files in usrpath(preserve).
+ * Look at the candidate files in _PATH_PRESERVE.
*/
fp = &svbuf[0];
ecount = 0;
/*
* Look for a file, both in the users directory option value
- * (i.e. usually /tmp) and in usrpath(preserve).
+ * (i.e. usually /tmp) and in _PATH_PRESERVE.
* Want to find the newest so we search on and on.
*/
findtmp(dir)
bestfd = -1;
/*
- * Search usrpath(preserve) and, if we can get there, /tmp
+ * Search _PATH_PRESERVE and, if we can get there, /tmp
* (actually the users "directory" option).
*/
searchdir(dir);
- if (chdir(mydir) == 0)
- searchdir(mydir);
+ if (chdir(_PATH_PRESERVE) == 0)
+ searchdir(_PATH_PRESERVE);
if (bestfd != -1) {
/*
* Gotcha.
* Don't chdir here, because the users directory
* may be ".", and we would move away before we searched it.
* Note that we actually chdir elsewhere (because it is too slow
- * to look around in usrpath(preserve) without chdir'ing there) so we
+ * to look around in _PATH_PRESERVE without chdir'ing there) so we
* can't win, because we don't know the name of '.' and if the path
* name of the file we want to unlink is relative, rather than absolute
* we won't be able to find it again.
*/
#ifndef lint
-static char *sccsid = "@(#)ex_subr.c 7.11 (Berkeley) %G%";
+static char *sccsid = "@(#)ex_subr.c 7.12 (Berkeley) %G%";
#endif not lint
#include "ex.h"
#include "ex_re.h"
#include "ex_tty.h"
#include "ex_vis.h"
+#include "pathnames.h"
/*
* Random routines, in alphabetical order.
if (pid == 0) {
close(0);
dup(tfile);
- execl(EXPRESERVE, "expreserve", (char *) 0);
+ execl(_PATH_EXPRESERVE, "expreserve", (char *) 0);
ex_exit(1);
}
waitfor();
*/
#ifndef lint
-static char *sccsid = "@(#)ex_temp.c 7.6.1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)ex_temp.c 7.7 (Berkeley) %G%";
#endif not lint
#include "ex.h"
#include "ex_temp.h"
#include "ex_vis.h"
#include "ex_tty.h"
+#include "pathnames.h"
/*
* Editor temporary file routines.
* All rights reserved. The Berkeley software License Agreement
* specifies the terms and conditions for redistribution.
*
- * @(#)ex_tune.h 7.11 (Berkeley) %G%
+ * @(#)ex_tune.h 7.12 (Berkeley) %G%
*/
-/*
- * Definitions of editor parameters and limits
- */
+#include "pathnames.h"
/*
- * Pathnames.
- *
- * Only exstrings is looked at "+4", i.e. if you give
- * "/usr/lib/..." here, "/lib" will be tried only for strings.
+ * Definitions of editor parameters and limits
*/
-#define libpath(file) "/usr/lib/file"
-#define loclibpath(file) "/usr/local/lib/file"
-#define binpath(file) "/usr/ucb/file"
-#define usrpath(file) "/usr/file"
-#ifndef vms
-#define E_TERMCAP "/etc/termcap"
-#else
-#define E_TERMCAP "etc:termcap."
-#endif
-#define B_CSH "/bin/csh"
-#define EXRECOVER libpath(ex3.7recover)
-#define EXPRESERVE libpath(ex3.7preserve)
-#ifndef VMUNIX
-#ifndef vms
-#define EXSTRINGS libpath(ex3.7strings)
-#endif
-#endif
/*
* If your system believes that tabs expand to a width other than
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 expand unexpand ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 expand unexpand ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
rm -f ${DESTDIR}/usr/man/cat1/unexpand.0
ln ${DESTDIR}/usr/man/cat1/expand.0 ${DESTDIR}/usr/man/cat1/unexpand.0
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 fold ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 fold ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 from ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 from ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 fstat ${DESTDIR}/etc/fstat
+ install -s -o bin -g kmem -m 2755 fstat ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)fstat.c 5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)fstat.c 5.18 (Berkeley) %G%";
#endif /* not lint */
/*
#include <nlist.h>
#include <pwd.h>
#include <strings.h>
-#include "pathnames.h"
+#include <paths.h>
#ifdef ULTRIX
/* UFS -> GFS */
if (read(swap, (char *)&user.user, sizeof(struct user))
!= sizeof(struct user)) {
VP("fstat: can't read u for pid %d from %s\n",
- mproc->p_pid, _PATH_SWAP);
+ mproc->p_pid, _PATH_DRUM);
return(0);
}
return(1);
(void)lseek(kmem, (off_t)pteaddr, L_SET);
if (read(kmem, (char *)&apte, sizeof(apte)) != sizeof(apte)) {
VP("fstat: can't read indir pte to get u for pid %d from %s\n",
- mproc->p_pid, _PATH_SWAP);
+ mproc->p_pid, _PATH_DRUM);
return(0);
}
(void)lseek(mem, (off_t)ctob(apte.pg_pfnum+1) - (UPAGES+CLSIZE)
strerror(errno), _PATH_MEM);
exit(1);
}
- if ((swap = open(_PATH_SWAP, O_RDONLY, 0)) < 0) {
+ if ((swap = open(_PATH_DRUM, O_RDONLY, 0)) < 0) {
(void)fprintf(stderr, "fstat: %s: %s\n",
- strerror(errno), _PATH_SWAP);
+ strerror(errno), _PATH_DRUM);
exit(1);
}
}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 graph ${DESTDIR}/usr/bin/graph
+ install -s -o bin -g bin -m 755 graph ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 leave ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 leave ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o root -g bin -m 4755 lock ${DESTDIR}/usr/ucb
+ install -s -o root -g bin -m 4755 lock ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 logger ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 logger ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)look.c 4.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)look.c 4.7 (Berkeley) %G%";
#endif not lint
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <ctype.h>
+#include "pathnames.h"
#define EOS '\0'
#define MAXLINELEN 250
{
extern char *optarg;
extern int optind;
- static char *filename = "/usr/share/dict/words";
+ static char *filename = _PATH_WORDS;
register off_t bot, mid, top;
register int c;
struct stat sb;
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.12 (Berkeley) %G%
+# @(#)Makefile 5.13 (Berkeley) %G%
#
CFLAGS= -O -R -DUSE_OLD_TTY
LIBC= /lib/libc.a
quit.o send.o strings.o temp.o tty.o vars.o flsbuf.o
FSRCS= fmt.c head.c
FOBJS= fmt.o head.o
+FILES= Mail.help Mail.rc Mail.tildehelp
MAN= mail.0 fmt.0
all: mail fmt
mkdep fmt.c ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 mail ${DESTDIR}/usr/ucb/mail
- install -s -o bin -g bin -m 755 fmt ${DESTDIR}/usr/ucb/fmt
- install -c -o bin -g bin -m 444 misc/Mail.* ${DESTDIR}/usr/lib
- rm -f ${DESTDIR}/usr/ucb/Mail
- ln ${DESTDIR}/usr/ucb/mail ${DESTDIR}/usr/ucb/Mail
- install -c -o bin -g bin -m 444 mail.0 ${DESTDIR}/usr/man/cat1/mail.0
- install -c -o bin -g bin -m 444 fmt.0 ${DESTDIR}/usr/man/cat1/fmt.0
+ install -s -o bin -g bin -m 755 mail ${DESTDIR}/usr/bin
+ install -s -o bin -g bin -m 755 fmt ${DESTDIR}/usr/bin
+ cd misc; install -c -o bin -g bin -m 444 ${FILES} \
+ ${DESTDIR}/usr/share/misc
+ rm -f ${DESTDIR}/usr/bin/Mail
+ ln ${DESTDIR}/usr/bin/mail ${DESTDIR}/usr/bin/Mail
+ install -c -o bin -g bin -m 444 mail.0 fmt.0 ${DESTDIR}/usr/man/cat1
rm -f ${DESTDIR}/usr/man/cat1/Mail.0
ln ${DESTDIR}/usr/man/cat1/mail.0 ${DESTDIR}/usr/man/cat1/Mail.0
ctags ${SRCS}
ctags -a fmt.c
sort -o tags tags
-
*/
#ifndef lint
-static char sccsid[] = "@(#)cmd1.c 5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmd1.c 5.19 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) {
cp = value("PAGER");
if (cp == NULL || *cp == '\0')
- cp = MORE;
+ cp = _PATH_MORE;
obuf = Popen(cp, "w");
if (obuf == NULL) {
perror(cp);
*/
#ifndef lint
-static char sccsid[] = "@(#)cmd3.c 5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmd3.c 5.21 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
if (bangexp(cmd) < 0)
return 1;
if ((shell = value("SHELL")) == NOSTR)
- shell = SHELL;
+ shell = _PATH_CSHELL;
(void) run_command(shell, 0, -1, -1, "-c", cmd, NOSTR);
(void) signal(SIGINT, sigint);
printf("!\n");
char *shell;
if ((shell = value("SHELL")) == NOSTR)
- shell = SHELL;
+ shell = _PATH_CSHELL;
(void) run_command(shell, 0, -1, -1, NOSTR);
(void) signal(SIGINT, sigint);
putchar('\n');
register c;
register FILE *f;
- if ((f = fopen(HELPFILE, "r")) == NULL) {
- perror(HELPFILE);
+ if ((f = fopen(_PATH_HELP, "r")) == NULL) {
+ perror(_PATH_HELP);
return(1);
}
while ((c = getc(f)) != EOF)
*/
#ifndef lint
-static char sccsid[] = "@(#)collect.c 5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)collect.c 5.18 (Berkeley) %G%";
#endif /* not lint */
/*
goto err;
goto cont;
case '?':
- if ((fbuf = fopen(THELPFILE, "r")) == NULL) {
- perror(THELPFILE);
+ if ((fbuf = fopen(_PATH_TILDE, "r")) == NULL) {
+ perror(_PATH_TILDE);
break;
}
while ((t = getc(fbuf)) != EOF)
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)def.h 5.18 (Berkeley) %G%
+ * @(#)def.h 5.19 (Berkeley) %G%
*/
#include <sys/param.h> /* includes <sys/types.h> */
#include <sgtty.h>
#include <ctype.h>
#include <strings.h>
-#include "local.h"
+#include "pathnames.h"
/*
* Mail -- a mail program
* Author: Kurt Shoens (UCB) March 25, 1978
*/
+#define APPEND /* New mail goes to end of mailbox */
#define ESCAPE '~' /* Default escape for sending */
#define NMLSIZE 1024 /* max names in a message list */
*/
#ifndef lint
-static char sccsid[] = "@(#)edit.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)edit.c 5.12 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
* Run an editor on the file at "fpp" of "size" bytes,
* and return a new file pointer.
* Signals must be handled by the caller.
- * "Type" is 'e' for EDITOR, 'v' for VISUAL.
+ * "Type" is 'e' for _PATH_EX, 'v' for _PATH_VI.
*/
FILE *
run_editor(fp, size, type, readonly)
}
nf = NULL;
if ((edit = value(type == 'e' ? "EDITOR" : "VISUAL")) == NOSTR)
- edit = type == 'e' ? EDITOR : VISUAL;
+ edit = type == 'e' ? _PATH_EX : _PATH_VI;
if (run_command(edit, 0, -1, -1, tempEdit, NOSTR) < 0) {
(void) unlink(tempEdit);
goto out;
*/
#ifndef lint
-static char sccsid[] = "@(#)fio.c 5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)fio.c 5.21 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
}
sprintf(cmdbuf, "echo %s", name);
if ((shell = value("SHELL")) == NOSTR)
- shell = SHELL;
+ shell = _PATH_CSHELL;
pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NOSTR);
if (pid < 0) {
close(pivec[0]);
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)main.c 5.22 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 5.23 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
rcvmode = !to;
spreserve();
if (!nosrc)
- load(MASTER);
+ load(_PATH_MASTER_RC);
/*
* Expand returns a savestr, but load only uses the file name
* for fopen, so it's save to do this.
*/
#ifndef lint
-static char sccsid[] = "@(#)names.c 5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)names.c 5.14 (Berkeley) %G%";
#endif /* not lint */
/*
/* XXX, can't really reuse the same image file */
if ((shell = value("SHELL")) == NOSTR)
- shell = SHELL;
+ shell = _PATH_CSHELL;
pid = start_command(shell, sigmask(SIGHUP)|
sigmask(SIGINT)|sigmask(SIGQUIT),
image, -1, "-c", fname, NOSTR);
* 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)pathnames.h 5.6 (Berkeley) %G%
+ * @(#)pathnames.h 5.7 (Berkeley) %G%
*/
-/*
- * Declarations and constants specific to an installation.
- *
- * Vax/Unix version 7.
- */
+#include <paths.h>
-#define SENDMAIL "/usr/lib/sendmail"
- /* Name of classy mail deliverer */
-#define EDITOR "/usr/ucb/ex" /* Name of text editor */
-#define VISUAL "/usr/ucb/vi" /* Name of display editor */
-#define SHELL "/bin/csh" /* Standard shell */
-#define MORE "/usr/ucb/more" /* Standard output pager */
-#define HELPFILE "/usr/lib/Mail.help"
- /* Name of casual help file */
-#define THELPFILE "/usr/lib/Mail.tildehelp"
- /* Name of casual tilde help */
-#define POSTAGE "/usr/adm/maillog"
- /* Where to audit mail sending */
-#define MASTER "/usr/lib/Mail.rc"
-#define APPEND /* New mail goes to end of mailbox */
+#define _PATH_EX "/usr/bin/ex"
+#define _PATH_HELP "/usr/share/misc/Mail.help"
+#define _PATH_TILDE "/usr/share/misc/Mail.tildehelp"
+#define _PATH_MAIL_LOG "/usr/adm/maillog"
+#define _PATH_MASTER_RC "/usr/share/misc/Mail.rc"
+#define _PATH_MBOX "/var/spool/mail/"
+#define _PATH_MORE "/usr/bin/more"
+#define _PATH_SENDMAIL "/usr/libexec/sendmail"
*/
#ifndef lint
-static char sccsid[] = "@(#)quit.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)quit.c 5.12 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
goto done;
ibuf = NULL;
if (stat(mailname, &statb) >= 0 && statb.st_size > mailsize) {
- strcpy(tempname, "/tmp/mboxXXXXXX");
+ strcpy(tempname, _PATH_TMP);
+ strcat(tempname, "/mboxXXXXXX");
mktemp(tempname);
if ((obuf = fopen(tempname, "w")) == NULL) {
perror(tempname);
*/
#ifndef lint
-static char sccsid[] = "@(#)send.c 5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)send.c 5.18 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
goto out;
}
if (pid == 0) {
- if (access(POSTAGE, 0) == 0) {
+ if (access(_PATH_MAIL_LOG, 0) == 0) {
FILE *postage;
- if ((postage = fopen(POSTAGE, "a")) != NULL) {
+ if ((postage = fopen(_PATH_MAIL_LOG, "a")) != NULL) {
fprintf(postage, "%s %d %ld\n", myname,
count(to), fsize(mtf));
(void) fclose(postage);
if ((cp = value("sendmail")) != NOSTR)
cp = expand(cp);
else
- cp = SENDMAIL;
+ cp = _PATH_SENDMAIL;
execv(cp, namelist);
perror(cp);
_exit(1);
*/
#ifndef lint
-static char sccsid[] = "@(#)temp.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)temp.c 5.12 (Berkeley) %G%";
#endif /* not lint */
#include "rcv.h"
* Give names to all the temporary files that we will need.
*/
-char tempMail[14];
-char tempQuit[14];
-char tempEdit[14];
-char tempSet[14];
-char tempResid[14];
-char tempMesg[14];
+char tempMail[24];
+char tempQuit[24];
+char tempEdit[24];
+char tempSet[24];
+char tempResid[24];
+char tempMesg[24];
tinit()
{
register char *cp;
- mktemp(strcpy(tempMail, "/tmp/RsXXXXXX"));
- mktemp(strcpy(tempResid, "/tmp/RqXXXXXX"));
- mktemp(strcpy(tempQuit, "/tmp/RmXXXXXX"));
- mktemp(strcpy(tempEdit, "/tmp/ReXXXXXX"));
- mktemp(strcpy(tempSet, "/tmp/RxXXXXXX"));
- mktemp(strcpy(tempMesg, "/tmp/RxXXXXXX"));
+ strcpy(tempMail, _PATH_TMP);
+ mktemp(strcat(tempMail, "/RsXXXXXX"));
+ strcpy(tempResid, _PATH_TMP);
+ mktemp(strcat(tempResid, "/RqXXXXXX"));
+ strcpy(tempQuit, _PATH_TMP);
+ mktemp(strcat(tempQuit, "/RmXXXXXX"));
+ strcpy(tempEdit, _PATH_TMP);
+ mktemp(strcat(tempEdit, "/ReXXXXXX"));
+ strcpy(tempSet, _PATH_TMP);
+ mktemp(strcat(tempSet, "/RxXXXXXX"));
+ strcpy(tempMesg, _PATH_TMP);
+ mktemp(strcat(tempMesg, "/RxXXXXXX"));
/*
* It's okay to call savestr in here because main will
*/
#ifndef lint
-static char sccsid[] = "@(#)v7.local.c 5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)v7.local.c 5.8 (Berkeley) %G%";
#endif /* not lint */
/*
char *buf;
{
- strcpy(copy("/usr/spool/mail/", buf), user);
+ strcpy(copy(_PATH_MBOX, buf), user);
}
/*
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 5.10 (Berkeley) %G%
+# @(#)Makefile 5.11 (Berkeley) %G%
#
CFLAGS= -O
LIBC= /lib/libc.a
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g kmem -m 2755 netstat ${DESTDIR}/usr/ucb/netstat
+ install -s -o bin -g kmem -m 2755 netstat ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 netstat.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
install: ${MAN}
install -s -o bin -g bin -m 755 ptx ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
+ install -c -o bin -g bin -m 444 eign ${DESTDIR}/usr/share/dict
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
#ifndef lint
-static char *sccsid = "@(#)ptx.c 4.4 (Berkeley) %G%";
+static char *sccsid = "@(#)ptx.c 4.5 (Berkeley) %G%";
#endif /* not lint */
/* permuted title index
Ptx reads the input file and permutes on words in it.
It excludes all words in the ignore file.
Alternately it includes words in the only file.
- if neither is given it excludes the words in /usr/lib/eign.
+ if neither is given it excludes the words in _PATH_EIGN.
The width of the output line can be changed to num
characters. If omitted 72 is default unless troff than 100.
#include <stdio.h>
#include <ctype.h>
#include <signal.h>
-#define DEFLTX "/usr/lib/eign"
+#include "pathnames.h"
+
#define TILDE 0177
-#define SORT "/usr/bin/sort"
#define N 30
#define MAX N*BUFSIZ
#define LMAX 200
char *outfile;
FILE *outptr = stdout;
-char sortfile[] = "/tmp/ptxsXXXXX"; /* output of sort program */
+char sortfile[] = _PATH_TMP; /* output of sort program */
char nofold[] = {'-', 'd', 't', TILDE, 0};
char fold[] = {'-', 'd', 'f', 't', TILDE, 0};
char *sortopt = nofold;
/* argument decoding */
- xfile = DEFLTX;
+ xfile = _PATH_EIGN;
argv++;
while(argc>1 && **argv == '-') {
switch (*++*argv){
diag("Cannot fork",empty);
case 0: /* child */
- execl(SORT, SORT, sortopt, "+0", "-1", "+1",
+ execl(_PATH_SORT, "sort", sortopt, "+0", "-1", "+1",
sortfile, "-o", sortfile, 0);
default: /* parent */
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o root -g bin -m 4755 quota ${DESTDIR}/usr/ucb
+ install -s -o root -g bin -m 4755 quota ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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%
#
LIBC= /lib/libc.a
-RDIST= /usr/ucb/rdist
+RDIST= /usr/bin/rdist
CFLAGS= -g
SRCS= docmd.c expand.c gram.y lookup.c main.c server.c
OBJS= docmd.o expand.o gram.o lookup.o main.o server.o
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)main.c 5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 5.4 (Berkeley) %G%";
#endif /* not lint */
#include "defs.h"
*/
char *distfile = NULL;
-char tmpfile[] = "/tmp/rdistXXXXXX";
+char tmpfile[] = _PATH_TMP;
char *tmpname = &tmpfile[5];
int debug; /* debugging flag */
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 renice ${DESTDIR}/etc
+ install -s -o bin -g bin -m 755 renice ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o root -g bin -m 4755 rlogin ${DESTDIR}/usr/ucb/rlogin
+ install -s -o root -g bin -m 4755 rlogin ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 rlogin.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 ruptime ${DESTDIR}/usr/ucb/ruptime
+ install -s -o bin -g bin -m 755 ruptime ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ruptime.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)ruptime.c 5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)ruptime.c 5.6 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
struct whod awhod;
#define WHDRSIZE (sizeof (awhod) - sizeof (awhod.wd_we))
-#define RWHODIR "/usr/spool/rwho"
#define down(h) (now - (h)->hs_wd->wd_recvtime > 11 * 60)
time_t now;
exit(1);
}
- if (chdir(RWHODIR) || (dirp = opendir(".")) == NULL) {
- perror(RWHODIR);
+ if (chdir(_PATH_RWHODIR) || (dirp = opendir(".")) == NULL) {
+ perror(_PATH_RWHODIR);
exit(1);
}
while (dp = readdir(dirp)) {
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 rwho ${DESTDIR}/etc/rwho
+ install -s -o bin -g bin -m 755 rwho ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 rwho.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)rwho.c 5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)rwho.c 5.4 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
int nusers;
#define WHDRSIZE (sizeof (wd) - sizeof (wd.wd_we))
-#define RWHODIR "/usr/spool/rwho"
/*
* this macro should be shared with ruptime.
*/
fprintf(stderr, "usage: rwho [-a]\n");
exit(1);
}
- if (chdir(RWHODIR) || (dirp = opendir(".")) == NULL) {
- perror(RWHODIR);
+ if (chdir(_PATH_RWHODIR) || (dirp = opendir(".")) == NULL) {
+ perror(_PATH_RWHODIR);
exit(1);
}
mp = myutmp;
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 script ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 script ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)script.c 5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)script.c 5.8 (Berkeley) %G%";
#endif /* not lint */
/*
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/file.h>
+#include <sys/signal.h>
#include <stdio.h>
-#include <signal.h>
+#include <paths.h>
char *shell;
FILE *fscript;
shell = getenv("SHELL");
if (shell == NULL)
- shell = "/bin/sh";
+ shell = _PATH_BSHELL;
getmaster();
printf("Script started, file is %s\n", fname);
int t;
/***
- t = open("/dev/tty", O_RDWR);
+ t = open(_PATH_TTY, O_RDWR);
if (t >= 0) {
(void) ioctl(t, TIOCNOTTY, (char *)0);
(void) close(t);
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 soelim ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 soelim ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 tcopy ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 tcopy ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)tcopy.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)tcopy.c 5.12 (Berkeley) %G%";
#endif /* not lint */
-#include <stdio.h>
-#include <signal.h>
-#include <sys/file.h>
#include <sys/types.h>
+#include <sys/signal.h>
+#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
#include <sys/errno.h>
+#include <stdio.h>
+#include "pathnames.h"
#define MAXREC (64 * 1024)
#define NOCOUNT (-2)
-#undef DEFTAPE
-#define DEFTAPE "/dev/rmt0"
-
int filen, guesslen, maxblk = MAXREC;
long lastrec, record, size, tsize;
case 0:
if (op != READ)
usage();
- inf = DEFTAPE;
+ inf = _PATH_DEFTAPE;
break;
case 1:
if (op != READ)
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#)Makefile 1.12 (Berkeley) %G%
+# @(#)Makefile 1.13 (Berkeley) %G%
#
# The following is the telnet makefile. The sources are down one level
mkdep ${CFLAGS} `make clist`
install: FRC
- install -s -o bin -g bin -m 755 telnet ${DESTDIR}/usr/ucb/telnet
+ install -s -o bin -g bin -m 755 telnet ${DESTDIR}/usr/bin
lint: FRC ${SRCS}
lint ${CFLAGS} `make clist`
ctags `make hclist`
FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-commands.o: Source/commands.c /usr/include/sys/types.h
-commands.o: /usr/include/sys/socket.h /usr/include/netinet/in.h
-commands.o: /usr/include/signal.h /usr/include/machine/trap.h
-commands.o: /usr/include/netdb.h /usr/include/ctype.h
-commands.o: /usr/include/arpa/telnet.h Source/ring.h Source/externs.h
-commands.o: /usr/include/stdio.h /usr/include/setjmp.h Source/defines.h
-commands.o: Source/types.h
-main.o: Source/main.c /usr/include/sys/types.h Source/ring.h Source/externs.h
-main.o: /usr/include/stdio.h /usr/include/setjmp.h Source/defines.h
-network.o: Source/network.c /usr/include/sys/types.h /usr/include/sys/socket.h
-network.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
-network.o: /usr/include/arpa/telnet.h Source/ring.h Source/defines.h
-network.o: Source/externs.h /usr/include/stdio.h /usr/include/setjmp.h
-network.o: Source/fdset.h
-ring.o: Source/ring.c /usr/include/stdio.h /usr/include/errno.h
-ring.o: /usr/include/sys/types.h /usr/include/sys/ioctl.h
-ring.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-ring.o: /usr/include/sys/socket.h Source/ring.h Source/general.h
-sys_bsd.o: Source/sys_bsd.c /usr/include/sys/ioctl.h
-sys_bsd.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-sys_bsd.o: /usr/include/sys/types.h /usr/include/sys/time.h /usr/include/time.h
-sys_bsd.o: /usr/include/sys/socket.h /usr/include/signal.h
-sys_bsd.o: /usr/include/machine/trap.h /usr/include/errno.h Source/ring.h
-sys_bsd.o: Source/fdset.h Source/defines.h Source/externs.h
-sys_bsd.o: /usr/include/stdio.h /usr/include/setjmp.h Source/types.h
-sys_dos.o: Source/sys_dos.c
-telnet.o: Source/telnet.c /usr/include/sys/types.h /usr/include/curses.h
-telnet.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-telnet.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-telnet.o: /usr/include/arpa/telnet.h /usr/include/strings.h Source/ring.h
-telnet.o: Source/defines.h Source/externs.h /usr/include/stdio.h
-telnet.o: /usr/include/setjmp.h Source/types.h Source/general.h
-telnet.o: /usr/include/varargs.h
-terminal.o: Source/terminal.c /usr/include/arpa/telnet.h
-terminal.o: /usr/include/sys/types.h Source/ring.h Source/externs.h
-terminal.o: /usr/include/stdio.h /usr/include/setjmp.h Source/types.h
-tn3270.o: Source/tn3270.c Source/fdset.h
-utilities.o: Source/utilities.c /usr/include/arpa/telnet.h
-utilities.o: /usr/include/sys/types.h /usr/include/ctype.h Source/ring.h
-utilities.o: Source/externs.h /usr/include/stdio.h /usr/include/setjmp.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
# 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
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 tftp ${DESTDIR}/usr/ucb/tftp
+ install -s -o bin -g bin -m 755 tftp ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 tftp.0 ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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%
#
# make file for intermachine communications package
#
install: ${MAN}
cd aculib; make ${MFLAGS} install
- install -s -o uucp -g dialer -m 4710 tip ${DESTDIR}/usr/bin/tip
+ install -s -o uucp -g dialer -m 4710 tip ${DESTDIR}/usr/bin
rm -f ${DESTDIR}/usr/bin/cu
ln ${DESTDIR}/usr/bin/tip ${DESTDIR}/usr/bin/cu
install -c -o bin -g bin -m 444 tip.0 ${DESTDIR}/usr/man/cat1
*/
#ifndef lint
-static char sccsid[] = "@(#)cmds.c 5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmds.c 5.10 (Berkeley) %G%";
#endif /* not lint */
#include "tip.h"
+#include "pathnames.h"
+
/*
* tip
*
if ((pid = vfork()) == 0) {
Shell = value(SHELL);
if (Shell == NOSTR)
- Shell = "/bin/sh";
+ Shell = _PATH_BSHELL;
close(pivec[0]);
close(1);
dup(pivec[1]);
*/
#ifndef lint
-static char sccsid[] = "@(#)remcap.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)remcap.c 5.3 (Berkeley) %G%";
#endif /* not lint */
/*
*/
#include <sys/file.h>
#include <ctype.h>
+#include "pathnames.h"
#ifndef BUFSIZ
#define BUFSIZ 1024
#endif
#define MAXHOP 32 /* max number of tc= indirections */
-#define SYSREMOTE "/etc/remote" /* system remote file */
#define tgetent rgetent
#define tnchktc rnchktc
#define tgetnum rgetnum
#define tgetflag rgetflag
#define tgetstr rgetstr
-#define E_TERMCAP RM = SYSREMOTE
+#define E_TERMCAP RM = _PATH_REMOTE
#define V_TERMCAP "REMOTE"
#define V_TERM "HOST"
int rc1, rc2;
remotefile = cp = getenv(V_TERMCAP);
- if (cp == (char *)0 || strcmp(cp, SYSREMOTE) == 0) {
- remotefile = cp = SYSREMOTE;
+ if (cp == (char *)0 || strcmp(cp, _PATH_REMOTE) == 0) {
+ remotefile = cp = _PATH_REMOTE;
return (getent(bp, name, cp));
} else {
if ((rc1 = getent(bp, name, cp)) != 1)
*bp = '\0';
- remotefile = cp = SYSREMOTE;
+ remotefile = cp = _PATH_REMOTE;
rc2 = getent(lbuf, name, cp);
if (rc1 != 1 && rc2 != 1)
return (rc2);
return (0);
}
if (getent(tcbuf, tcname, remotefile) != 1) {
- if (strcmp(remotefile, SYSREMOTE) == 0)
+ if (strcmp(remotefile, _PATH_REMOTE) == 0)
return (0);
- else if (getent(tcbuf, tcname, SYSREMOTE) != 1)
+ else if (getent(tcbuf, tcname, _PATH_REMOTE) != 1)
return (0);
}
for (q = tcbuf; *q++ != ':'; )
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)tip.c 5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)tip.c 5.9 (Berkeley) %G%";
#endif /* not lint */
/*
* cu phone-number [-s speed] [-l line] [-a acu]
*/
#include "tip.h"
+#include "pathnames.h"
/*
* Baud rate mapping table
* in the right order, so force it here
*/
if ((PH = getenv("PHONES")) == NOSTR)
- PH = "/etc/phones";
+ PH = _PATH_PHONES;
vinit(); /* init variables */
setparity("even"); /* set the parity table */
if ((i = speed(number(value(BAUDRATE)))) == NULL) {
*/
#ifndef lint
-static char sccsid[] = "@(#)uucplock.c 5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)uucplock.c 5.4 (Berkeley) %G%";
#endif /* not lint */
#include <sys/types.h>
#include <sys/file.h>
#include <sys/dir.h>
#include <errno.h>
-
-/* pick the directory naming scheme you are using */
-
-#define LOCKDIRNAME "/usr/spool/uucp/LCK..%s" /**/
-/* #define LOCKDIRNAME "/usr/spool/uucp/LCK/LCK..%s" /**/
+#include "pathnames.h"
/*
* uucp style locking routines
{
extern int errno;
int fd, pid;
- char tbuf[sizeof(LOCKDIRNAME) + MAXNAMLEN];
+ char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
off_t lseek();
- (void)sprintf(tbuf, LOCKDIRNAME, ttyname);
+ (void)sprintf(tbuf, _PATH_LOCKDIRNAME, ttyname);
fd = open(tbuf, O_RDWR|O_CREAT|O_EXCL, 0660);
if (fd < 0) {
/*
uu_unlock(ttyname)
char *ttyname;
{
- char tbuf[sizeof(LOCKDIRNAME) + MAXNAMLEN];
+ char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
- (void)sprintf(tbuf, LOCKDIRNAME, ttyname);
+ (void)sprintf(tbuf, _PATH_LOCKDIRNAME, ttyname);
return(unlink(tbuf));
}
*/
#ifndef lint
-static char sccsid[] = "@(#)vars.c 5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)vars.c 5.4 (Berkeley) %G%";
#endif /* not lint */
#include "tip.h"
+#include "pathnames.h"
/*
* Definition of variables
{ "host", STRING|IREMOTE|INIT, READ<<PUBLIC,
"ho", (char *)&HO },
{ "log", STRING|INIT, (READ|WRITE)<<ROOT,
- NOSTR, "/usr/adm/aculog" },
+ NOSTR, _PATH_ACULOG },
{ "phones", STRING|INIT|IREMOTE, READ<<PUBLIC,
NOSTR, (char *)&PH },
{ "prompt", CHAR, (READ|WRITE)<<PUBLIC,
{ "verbose", BOOL, (READ|WRITE)<<PUBLIC,
"verb", (char *)TRUE },
{ "SHELL", STRING|ENVIRON|INIT, (READ|WRITE)<<PUBLIC,
- NULL, "/bin/sh" },
+ NULL, _PATH_BSHELL },
{ "HOME", STRING|ENVIRON, (READ|WRITE)<<PUBLIC,
NOSTR, NOSTR },
{ "echocheck", BOOL, (READ|WRITE)<<PUBLIC,
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 clear ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 clear ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 tset ${DESTDIR}/usr/ucb/tset
- rm -f ${DESTDIR}/usr/ucb/reset
- ln ${DESTDIR}/usr/ucb/tset ${DESTDIR}/usr/ucb/reset
+ install -s -o bin -g bin -m 755 tset ${DESTDIR}/usr/bin
+ rm -f ${DESTDIR}/usr/bin/reset
+ ln ${DESTDIR}/usr/bin/tset ${DESTDIR}/usr/bin/reset
install -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 vacation ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 vacation ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)vacation.c 5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)vacation.c 5.14 (Berkeley) %G%";
#endif /* not lint */
/*
#include <tzfile.h>
#include <stdio.h>
#include <ctype.h>
+#include "pathnames.h"
/*
* VACATION -- return a message to the sender when on vacation.
syslog(LOG_NOTICE, "vacation: no ~%s/%s file.\n", myname, VMSG);
myexit(1);
}
- execl("/usr/lib/sendmail", "sendmail", "-f", myname, from, NULL);
- syslog(LOG_ERR, "vacation: can't exec /usr/lib/sendmail.\n");
+ execl(_PATH_SENDMAIL, "sendmail", "-f", myname, from, NULL);
+ syslog(LOG_ERR, "vacation: can't exec %s.\n", _PATH_SENDMAIL);
myexit(1);
}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 whois ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 whois ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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 -R
LIBC= /lib/libc.a
mkdep ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 window ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 window ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-# install -c -o bin -g bin -m 755 windowrc ${DESTDIR}/usr/local/lib
lint: ${SRCS}
lint ${CFLAGS} ${SRCS}
*/
#ifndef lint
-static char sccsid[] = "@(#)main.c 3.35 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 3.36 (Berkeley) %G%";
#endif /* not lint */
#include "defs.h"
#include <sys/signal.h>
+#include <paths.h>
#include <stdio.h>
#include "string.h"
#include "char.h"
#include "local.h"
-#include "pathnames.h"
#define next(a) (*++*(a) ? *(a) : (*++(a) ? *(a) : (char *)usage()))
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 yes ${DESTDIR}/usr/ucb
+ install -s -o bin -g bin -m 755 yes ${DESTDIR}/usr/bin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
lint: ${SRCS}
# 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
mkdep -p ${CFLAGS} ${SRCS}
install: ${MAN}
- install -s -o bin -g bin -m 755 sa ${DESTDIR}/etc
+ install -s -o bin -g bin -m 755 sa ${DESTDIR}/usr/sbin
install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
lint: ${SRCS}
* 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_USRACCT "/usr/adm/usracct"
-#define _PATH_SAVACCT "/usr/adm/savacct"
-#define _PATH_ACCT "/usr/adm/acct"
+#define _PATH_USRACCT "/var/account/usracct"
+#define _PATH_SAVACCT "/var/account/savacct"
+#define _PATH_ACCT "/var/account/acct"
projects / unix-history / commitdiff