From 0718fb71f7c0db77b8f4dd8e7641a66e45229afe Mon Sep 17 00:00:00 2001 From: Keith Bostic Date: Mon, 1 Feb 1988 19:34:52 -0800 Subject: [PATCH] add new Berkeley headers SCCS-vsn: usr.bin/rdist/Makefile 5.4 SCCS-vsn: usr.bin/rdist/defs.h 5.3 SCCS-vsn: usr.bin/rdist/docmd.c 5.2 SCCS-vsn: usr.bin/rdist/expand.c 5.3 SCCS-vsn: usr.bin/rdist/gram.y 5.3 SCCS-vsn: usr.bin/rdist/lookup.c 5.3 SCCS-vsn: usr.bin/rdist/main.c 5.2 SCCS-vsn: usr.bin/rdist/server.c 5.6 --- usr/src/usr.bin/rdist/Makefile | 22 ++++++++++++++-------- usr/src/usr.bin/rdist/defs.h | 12 +++++++++--- usr/src/usr.bin/rdist/docmd.c | 14 ++++++++++---- usr/src/usr.bin/rdist/expand.c | 14 ++++++++++---- usr/src/usr.bin/rdist/gram.y | 16 +++++++++++----- usr/src/usr.bin/rdist/lookup.c | 14 ++++++++++---- usr/src/usr.bin/rdist/main.c | 16 +++++++++++----- usr/src/usr.bin/rdist/server.c | 14 ++++++++++---- 8 files changed, 85 insertions(+), 37 deletions(-) diff --git a/usr/src/usr.bin/rdist/Makefile b/usr/src/usr.bin/rdist/Makefile index 85880e2dc1..274a08b988 100644 --- a/usr/src/usr.bin/rdist/Makefile +++ b/usr/src/usr.bin/rdist/Makefile @@ -1,19 +1,25 @@ # # Copyright (c) 1987 Regents of the University of California. -# All rights reserved. The Berkeley software License Agreement -# specifies the terms and conditions for redistribution. +# All rights reserved. # -# @(#)Makefile 5.3 (Berkeley) %G% +# Redistribution and use in source and binary forms are permitted +# provided that this notice is preserved and that due credit is given +# to the University of California at 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'' without express or implied warranty. +# +# @(#)Makefile 5.4 (Berkeley) %G% # LIBC= /lib/libc.a -RDIST = /usr/ucb/rdist -CFLAGS= -O -DRDIST=\"${RDIST}\" -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 +RDIST= /usr/ucb/rdist +CFLAGS= -O -DRDIST=\"${RDIST}\" +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 all: rdist -rdist: ${OBJS} ${LIBC} +rdist: ${OBJS} ${LIBC} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: FRC diff --git a/usr/src/usr.bin/rdist/defs.h b/usr/src/usr.bin/rdist/defs.h index 0bfc249762..d85f1aee94 100644 --- a/usr/src/usr.bin/rdist/defs.h +++ b/usr/src/usr.bin/rdist/defs.h @@ -1,9 +1,15 @@ /* * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * All rights reserved. * - * @(#)defs.h 5.2 (Berkeley) %G% + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. + * + * @(#)defs.h 5.3 (Berkeley) %G% */ #include diff --git a/usr/src/usr.bin/rdist/docmd.c b/usr/src/usr.bin/rdist/docmd.c index 478d07c324..7865c5934e 100644 --- a/usr/src/usr.bin/rdist/docmd.c +++ b/usr/src/usr.bin/rdist/docmd.c @@ -1,12 +1,18 @@ /* * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. */ #ifndef lint -static char sccsid[] = "@(#)docmd.c 5.1 (Berkeley) %G%"; -#endif not lint +static char sccsid[] = "@(#)docmd.c 5.2 (Berkeley) %G%"; +#endif /* not lint */ #include "defs.h" #include diff --git a/usr/src/usr.bin/rdist/expand.c b/usr/src/usr.bin/rdist/expand.c index e5617cdc7d..593f1b40d6 100644 --- a/usr/src/usr.bin/rdist/expand.c +++ b/usr/src/usr.bin/rdist/expand.c @@ -1,12 +1,18 @@ /* * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. */ #ifndef lint -static char sccsid[] = "@(#)expand.c 5.2 (Berkeley) %G%"; -#endif not lint +static char sccsid[] = "@(#)expand.c 5.3 (Berkeley) %G%"; +#endif /* not lint */ #include "defs.h" diff --git a/usr/src/usr.bin/rdist/gram.y b/usr/src/usr.bin/rdist/gram.y index 032fa82aac..f10f5b93d2 100644 --- a/usr/src/usr.bin/rdist/gram.y +++ b/usr/src/usr.bin/rdist/gram.y @@ -1,13 +1,19 @@ %{ /* - * 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) 1983 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. */ #ifndef lint -static char *sccsid = "@(#)gram.y 5.2 (Berkeley) 85/06/21"; -#endif +static char sccsid[] = "@(#)gram.y 5.3 (Berkeley) %G%"; +#endif /* not lint */ #include "defs.h" diff --git a/usr/src/usr.bin/rdist/lookup.c b/usr/src/usr.bin/rdist/lookup.c index ebd135aa6e..23ba6dbbfa 100644 --- a/usr/src/usr.bin/rdist/lookup.c +++ b/usr/src/usr.bin/rdist/lookup.c @@ -1,12 +1,18 @@ /* * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. */ #ifndef lint -static char sccsid[] = "@(#)lookup.c 5.2 (Berkeley) %G%"; -#endif not lint +static char sccsid[] = "@(#)lookup.c 5.3 (Berkeley) %G%"; +#endif /* not lint */ #include "defs.h" diff --git a/usr/src/usr.bin/rdist/main.c b/usr/src/usr.bin/rdist/main.c index 261f5d8bd2..8014379fb4 100644 --- a/usr/src/usr.bin/rdist/main.c +++ b/usr/src/usr.bin/rdist/main.c @@ -1,18 +1,24 @@ /* * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. */ #ifndef lint char copyright[] = "@(#) Copyright (c) 1983 Regents of the University of California.\n\ All rights reserved.\n"; -#endif not lint +#endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)main.c 5.1 (Berkeley) %G%"; -#endif not lint +static char sccsid[] = "@(#)main.c 5.2 (Berkeley) %G%"; +#endif /* not lint */ #include "defs.h" diff --git a/usr/src/usr.bin/rdist/server.c b/usr/src/usr.bin/rdist/server.c index 7e250935b0..6f443836f4 100644 --- a/usr/src/usr.bin/rdist/server.c +++ b/usr/src/usr.bin/rdist/server.c @@ -1,12 +1,18 @@ /* * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of California at 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'' without express or implied warranty. */ #ifndef lint -static char sccsid[] = "@(#)server.c 5.5 (Berkeley) %G%"; -#endif not lint +static char sccsid[] = "@(#)server.c 5.6 (Berkeley) %G%"; +#endif /* not lint */ #include "defs.h" -- 2.20.1