From 0ce67e2263241147c6c8f4be6501a41127c45e77 Mon Sep 17 00:00:00 2001 From: mycroft Date: Mon, 13 Jun 1994 19:49:28 +0000 Subject: [PATCH] Some files go away... --- usr.sbin/amd/fsinfo/Makefile | 15 ++--- usr.sbin/amd/fsinfo/conf/csg_sun3 | 2 +- usr.sbin/amd/fsinfo/conf/csg_vax | 2 +- .../fsinfo/conf/hosts/flamingo.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk | 2 +- .../fsinfo/conf/hosts/obsidian.doc.ic.ac.uk | 2 +- .../fsinfo/conf/hosts/pelican.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/fsi_analyze.c | 12 ++-- usr.sbin/amd/fsinfo/fsi_data.h | 12 ++-- usr.sbin/amd/fsinfo/fsi_dict.c | 12 ++-- usr.sbin/amd/fsinfo/fsi_gram.y | 12 ++-- usr.sbin/amd/fsinfo/fsi_lex.l | 14 ++-- usr.sbin/amd/fsinfo/fsi_util.c | 12 ++-- usr.sbin/amd/fsinfo/fsinfo.c | 18 +++-- usr.sbin/amd/fsinfo/fsinfo.h | 12 ++-- usr.sbin/amd/fsinfo/wr_atab.c | 12 ++-- usr.sbin/amd/fsinfo/wr_bparam.c | 12 ++-- usr.sbin/amd/fsinfo/wr_dumpset.c | 12 ++-- usr.sbin/amd/fsinfo/wr_exportfs.c | 12 ++-- usr.sbin/amd/fsinfo/wr_fstab.c | 12 ++-- usr.sbin/amd/include/am.h | 14 ++-- usr.sbin/amd/include/config.h | 12 ++-- usr.sbin/amd/include/fstype.h | 12 ++-- usr.sbin/amd/include/uwait.h | 12 ++-- usr.sbin/amd/mk-amd-map/Makefile | 9 +-- usr.sbin/amd/mk-amd-map/mk-amd-map.c | 66 ++++++++++++++----- usr.sbin/amd/rpcx/amq_svc.c | 15 ++--- usr.sbin/amd/rpcx/nfs_prot_svc.c | 12 ++-- usr.sbin/amd/text/COPYRIGHT | 2 +- usr.sbin/amd/text/INSTALL | 2 +- usr.sbin/amd/text/README | 6 +- usr.sbin/amd/text/amd.start.ex | 12 ++-- 38 files changed, 208 insertions(+), 169 deletions(-) diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile index 596088f5594d..50f4642b7e93 100644 --- a/usr.sbin/amd/fsinfo/Makefile +++ b/usr.sbin/amd/fsinfo/Makefile @@ -1,7 +1,7 @@ -# %W% (Berkeley) %G% +# @(#)Makefile 8.1 (Berkeley) 6/28/93 PROG= fsinfo -NOMAN= true +MAN8= fsinfo.0 SRCS= fsinfo.c fsi_gram.c fsi_lex.c \ fsi_util.c fsi_analyze.c fsi_dict.c \ wr_atab.c wr_bparam.c wr_dumpset.c \ @@ -10,21 +10,18 @@ CLEANFILES= \ fsi_gram.c y.tab.c fsi_gram.h y.tab.h \ fsi_lex.c lex.yy.c y.output CFLAGS+=-I. -CFLAGS+=-I${.CURDIR}/../config CFLAGS+=-I${.CURDIR}/../include -CFLAGS+=-DOS_HDR=\"os-${OS}.h\" - -LDADD+= -ll -DPADD+= ${LIBL} +CFLAGS+=-I${.CURDIR}/../config +CFLAGS+=-DOS_HDR=\"os-bsd44.h\" fsi_lex.o fsinfo.o: fsi_gram.h -fsi_gram.c fsi_gram.h: ${.CURDIR}/fsi_gram.y +fsi_gram.c fsi_gram.h: ../fsinfo/fsi_gram.y @echo "# expect 2 shift/reduce conflicts" ${YACC} -d ${.CURDIR}/fsi_gram.y mv y.tab.c fsi_gram.c mv y.tab.h fsi_gram.h -fsi_lex.c: ${.CURDIR}/fsi_lex.l +fsi_lex.c: ../fsinfo/fsi_lex.l ${LEX} ${.CURDIR}/fsi_lex.l mv lex.yy.c fsi_lex.c diff --git a/usr.sbin/amd/fsinfo/conf/csg_sun3 b/usr.sbin/amd/fsinfo/conf/csg_sun3 index 02de762a531b..17dcdb74d87e 100644 --- a/usr.sbin/amd/fsinfo/conf/csg_sun3 +++ b/usr.sbin/amd/fsinfo/conf/csg_sun3 @@ -1,4 +1,4 @@ -// $Id: csg_sun3,v 1.1 1993/11/27 21:20:26 mycroft Exp $ +// $Id: csg_sun3,v 1.2 1994/06/13 19:49:44 mycroft Exp $ // standard setups for DoC tsuns. // note that no /var/spool/rwho is mounted as we now expect amd to do this as /vol/rwho diff --git a/usr.sbin/amd/fsinfo/conf/csg_vax b/usr.sbin/amd/fsinfo/conf/csg_vax index 1d8864b5aac1..9b06ddfd59c0 100644 --- a/usr.sbin/amd/fsinfo/conf/csg_vax +++ b/usr.sbin/amd/fsinfo/conf/csg_vax @@ -1,4 +1,4 @@ -// $Id: csg_vax,v 1.1 1993/11/27 21:20:30 mycroft Exp $ +// $Id: csg_vax,v 1.2 1994/06/13 19:49:45 mycroft Exp $ // csg vax config - really just for {s,r}vax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk index 77cda94da463..9b9e2e0cc0d9 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for flamingo -// $Id: flamingo.doc.ic.ac.uk,v 1.1 1993/11/27 21:20:49 mycroft Exp $ +// $Id: flamingo.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:47 mycroft Exp $ host flamingo.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk index e278310151de..00795c057781 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for gould -// $Id: gould.doc.ic.ac.uk,v 1.1 1993/11/27 21:20:55 mycroft Exp $ +// $Id: gould.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:49 mycroft Exp $ host gould.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk index 57c457ca63b8..7d179571bae9 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: ivax.doc.ic.ac.uk,v 1.1 1993/11/27 21:20:57 mycroft Exp $ +// $Id: ivax.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:50 mycroft Exp $ // ivax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk index 07eadfea233f..72056f5f2996 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: obsidian.doc.ic.ac.uk,v 1.1 1993/11/27 21:20:59 mycroft Exp $ +// $Id: obsidian.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:51 mycroft Exp $ // conf for obsidian #define FSTYPE_UFS hfs diff --git a/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk index d15db02d2b6e..fdad21740917 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for pelican -// $Id: pelican.doc.ic.ac.uk,v 1.1 1993/11/27 21:21:00 mycroft Exp $ +// $Id: pelican.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:53 mycroft Exp $ host pelican.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk index 8dda019598a9..e7821b2e2f62 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: rvax.doc.ic.ac.uk,v 1.1 1993/11/27 21:21:01 mycroft Exp $ +// $Id: rvax.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:55 mycroft Exp $ // rvax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk index 582c29f10f9e..d5f456163940 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: sky.doc.ic.ac.uk,v 1.1 1993/11/27 21:21:03 mycroft Exp $ +// $Id: sky.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:56 mycroft Exp $ // sky #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk index 596447634d0c..0be853208bca 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: svax.doc.ic.ac.uk,v 1.1 1993/11/27 21:21:05 mycroft Exp $ +// $Id: svax.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:57 mycroft Exp $ // svax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk index 1d7dfc5ba29f..af5998d334d3 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for tsunfs -// $Id: tsunfs.doc.ic.ac.uk,v 1.1 1993/11/27 21:21:52 mycroft Exp $ +// $Id: tsunfs.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:58 mycroft Exp $ host tsunfs.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk index 3f3be2282967..91ef5e8ae9aa 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: whoops.doc.ic.ac.uk,v 1.1 1993/11/27 21:21:53 mycroft Exp $ +// $Id: whoops.doc.ic.ac.uk,v 1.2 1994/06/13 19:49:59 mycroft Exp $ // sm's bastardised csg_sun3 // note that no /var/spool/rwho is mounted as we now expect amd to do this as /vol/rwho diff --git a/usr.sbin/amd/fsinfo/fsi_analyze.c b/usr.sbin/amd/fsinfo/fsi_analyze.c index db1bea75b445..d3edf392cdad 100644 --- a/usr.sbin/amd/fsinfo/fsi_analyze.c +++ b/usr.sbin/amd/fsinfo/fsi_analyze.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsi_analyze.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_analyze.c,v 1.1 1993/11/27 21:20:00 mycroft Exp $ + * $Id: fsi_analyze.c,v 1.2 1994/06/13 19:49:29 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_data.h b/usr.sbin/amd/fsinfo/fsi_data.h index f35f8734ce5c..bf0c84473fe3 100644 --- a/usr.sbin/amd/fsinfo/fsi_data.h +++ b/usr.sbin/amd/fsinfo/fsi_data.h @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsi_data.h 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_data.h,v 1.1 1993/11/27 21:20:04 mycroft Exp $ + * $Id: fsi_data.h,v 1.2 1994/06/13 19:49:30 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_dict.c b/usr.sbin/amd/fsinfo/fsi_dict.c index f475b3dc8837..17710d1dd518 100644 --- a/usr.sbin/amd/fsinfo/fsi_dict.c +++ b/usr.sbin/amd/fsinfo/fsi_dict.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsi_dict.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_dict.c,v 1.1 1993/11/27 21:20:07 mycroft Exp $ + * $Id: fsi_dict.c,v 1.2 1994/06/13 19:49:31 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_gram.y b/usr.sbin/amd/fsinfo/fsi_gram.y index 270883f8828d..745803a81495 100644 --- a/usr.sbin/amd/fsinfo/fsi_gram.y +++ b/usr.sbin/amd/fsinfo/fsi_gram.y @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsi_gram.y 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_gram.y,v 1.1 1993/11/27 21:20:09 mycroft Exp $ + * $Id: fsi_gram.y,v 1.2 1994/06/13 19:49:32 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_lex.l b/usr.sbin/amd/fsinfo/fsi_lex.l index 258677407091..466732cd736a 100644 --- a/usr.sbin/amd/fsinfo/fsi_lex.l +++ b/usr.sbin/amd/fsinfo/fsi_lex.l @@ -2,8 +2,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -18,8 +18,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -36,9 +36,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsi_lex.l 8.2 (Berkeley) 2/17/94 * - * $Id: fsi_lex.l,v 1.1 1993/11/27 21:20:11 mycroft Exp $ + * $Id: fsi_lex.l,v 1.2 1994/06/13 19:49:33 mycroft Exp $ * */ @@ -163,9 +163,9 @@ struct r { \\r { *optr++ = '\r'; /* escape */ } \\n { *optr++ = '\n'; /* escape */ } \\f { *optr++ = '\f'; /* escape */ } +"\\ " { *optr++ = ' '; /* force space */ } \\. { yyerror("Unknown \\ sequence"); } ([ \t]|"\\\n"){2,} { char *p = yytext-1; while (p = strchr(p+1, '\n')) yylineno++; } -"\\ " { *optr++ = ' '; /* force space */ } \" { BEGIN F; quoted = 0; *optr = '\0'; yylval.s = strdup(ostr); diff --git a/usr.sbin/amd/fsinfo/fsi_util.c b/usr.sbin/amd/fsinfo/fsi_util.c index 34c1739f9a71..f7d73fbd7afc 100644 --- a/usr.sbin/amd/fsinfo/fsi_util.c +++ b/usr.sbin/amd/fsinfo/fsi_util.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,8 +14,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -32,9 +32,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsi_util.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_util.c,v 1.1 1993/11/27 21:20:13 mycroft Exp $ + * $Id: fsi_util.c,v 1.2 1994/06/13 19:49:35 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsinfo.c b/usr.sbin/amd/fsinfo/fsinfo.c index 042215dcd23d..fb876a9eabd3 100644 --- a/usr.sbin/amd/fsinfo/fsinfo.c +++ b/usr.sbin/amd/fsinfo/fsinfo.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,12 +35,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsinfo.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsinfo.c,v 1.1 1993/11/27 21:20:14 mycroft Exp $ + * $Id: fsinfo.c,v 1.2 1994/06/13 19:49:36 mycroft Exp $ * */ +#ifndef lint +static char copyright[] = +"@(#) Copyright (c) 1989, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + /* * fsinfo */ diff --git a/usr.sbin/amd/fsinfo/fsinfo.h b/usr.sbin/amd/fsinfo/fsinfo.h index a9a6732ee818..c2515610acf2 100644 --- a/usr.sbin/amd/fsinfo/fsinfo.h +++ b/usr.sbin/amd/fsinfo/fsinfo.h @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fsinfo.h 8.1 (Berkeley) 6/6/93 * - * $Id: fsinfo.h,v 1.1 1993/11/27 21:20:15 mycroft Exp $ + * $Id: fsinfo.h,v 1.2 1994/06/13 19:49:37 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_atab.c b/usr.sbin/amd/fsinfo/wr_atab.c index 90a3eb6f7e7e..f1412979110c 100644 --- a/usr.sbin/amd/fsinfo/wr_atab.c +++ b/usr.sbin/amd/fsinfo/wr_atab.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)wr_atab.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_atab.c,v 1.1 1993/11/27 21:20:17 mycroft Exp $ + * $Id: wr_atab.c,v 1.2 1994/06/13 19:49:38 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_bparam.c b/usr.sbin/amd/fsinfo/wr_bparam.c index 67d229b897a9..d0462457d25b 100644 --- a/usr.sbin/amd/fsinfo/wr_bparam.c +++ b/usr.sbin/amd/fsinfo/wr_bparam.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)wr_bparam.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_bparam.c,v 1.1 1993/11/27 21:20:18 mycroft Exp $ + * $Id: wr_bparam.c,v 1.2 1994/06/13 19:49:39 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_dumpset.c b/usr.sbin/amd/fsinfo/wr_dumpset.c index f6eb2e75f812..ad4370530880 100644 --- a/usr.sbin/amd/fsinfo/wr_dumpset.c +++ b/usr.sbin/amd/fsinfo/wr_dumpset.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)wr_dumpset.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_dumpset.c,v 1.1 1993/11/27 21:20:19 mycroft Exp $ + * $Id: wr_dumpset.c,v 1.2 1994/06/13 19:49:40 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_exportfs.c b/usr.sbin/amd/fsinfo/wr_exportfs.c index 44464f3b2770..f78b38ec491d 100644 --- a/usr.sbin/amd/fsinfo/wr_exportfs.c +++ b/usr.sbin/amd/fsinfo/wr_exportfs.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)wr_exportfs.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_exportfs.c,v 1.1 1993/11/27 21:20:20 mycroft Exp $ + * $Id: wr_exportfs.c,v 1.2 1994/06/13 19:49:41 mycroft Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_fstab.c b/usr.sbin/amd/fsinfo/wr_fstab.c index ac187eb5a903..dde79d8c7926 100644 --- a/usr.sbin/amd/fsinfo/wr_fstab.c +++ b/usr.sbin/amd/fsinfo/wr_fstab.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)wr_fstab.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_fstab.c,v 1.1 1993/11/27 21:20:21 mycroft Exp $ + * $Id: wr_fstab.c,v 1.2 1994/06/13 19:49:42 mycroft Exp $ * */ diff --git a/usr.sbin/amd/include/am.h b/usr.sbin/amd/include/am.h index 70684dc1a7b5..e36fb952ead9 100644 --- a/usr.sbin/amd/include/am.h +++ b/usr.sbin/amd/include/am.h @@ -1,8 +1,8 @@ /* * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)am.h 5.6 (Berkeley) 6/6/93 * - * $Id: am.h,v 1.1 1993/11/27 21:21:56 mycroft Exp $ + * $Id: am.h,v 1.2 1994/06/13 19:50:03 mycroft Exp $ * */ @@ -49,7 +49,7 @@ #include #include #include -#include +#include "nfs_prot.h" #ifdef MNTENT_HDR #include MNTENT_HDR #endif /* MNTENT_HDR */ diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h index 407c49c53fb9..782613e79817 100644 --- a/usr.sbin/amd/include/config.h +++ b/usr.sbin/amd/include/config.h @@ -1,8 +1,8 @@ /* * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)config.h 8.1 (Berkeley) 6/6/93 * - * $Id: config.h,v 1.1 1993/11/27 21:21:58 mycroft Exp $ + * $Id: config.h,v 1.2 1994/06/13 19:50:05 mycroft Exp $ * */ diff --git a/usr.sbin/amd/include/fstype.h b/usr.sbin/amd/include/fstype.h index 4fd189161ad1..76d2d7e88814 100644 --- a/usr.sbin/amd/include/fstype.h +++ b/usr.sbin/amd/include/fstype.h @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)fstype.h 8.1 (Berkeley) 6/6/93 * - * $Id: fstype.h,v 1.1 1993/11/27 21:22:00 mycroft Exp $ + * $Id: fstype.h,v 1.2 1994/06/13 19:50:07 mycroft Exp $ * */ diff --git a/usr.sbin/amd/include/uwait.h b/usr.sbin/amd/include/uwait.h index 2cb987241205..94a75724cf92 100644 --- a/usr.sbin/amd/include/uwait.h +++ b/usr.sbin/amd/include/uwait.h @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)uwait.h 8.1 (Berkeley) 6/6/93 * - * $Id: uwait.h,v 1.1 1993/11/27 21:22:04 mycroft Exp $ + * $Id: uwait.h,v 1.2 1994/06/13 19:50:10 mycroft Exp $ * */ diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile index cf2cb1f23e39..6db921aca373 100644 --- a/usr.sbin/amd/mk-amd-map/Makefile +++ b/usr.sbin/amd/mk-amd-map/Makefile @@ -1,10 +1,11 @@ -# %W% (Berkeley) %G% +# @(#)Makefile 8.1 (Berkeley) 6/28/93 PROG= mk-amd-map -NOMAN= true -CFLAGS+=-I${.CURDIR}/../config CFLAGS+=-I${.CURDIR}/../include -CFLAGS+=-DOS_HDR=\"os-${OS}.h\" +CFLAGS+=-I${.CURDIR}/../rpcx +CFLAGS+=-I${.CURDIR}/../config +CFLAGS+=-DOS_HDR=\"os-bsd44.h\" +MAN8= mk-amd-map.0 .include "../../Makefile.inc" .include diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c index f4f2dde2025c..8968045af516 100644 --- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c +++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 1990 Jan-Simon Pendry + * Copyright (c) 1990, 1993 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93 * - * $Id: mk-amd-map.c,v 1.1 1993/11/27 21:22:18 mycroft Exp $ + * $Id: mk-amd-map.c,v 1.2 1994/06/13 19:50:15 mycroft Exp $ */ /* @@ -46,15 +46,15 @@ #ifndef lint char copyright[] = "\ -@(#)Copyright (c) 1990 Jan-Simon Pendry\n\ +@(#)Copyright (c) 1990, 1993 Jan-Simon Pendry\n\ @(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\ -@(#)Copyright (c) 1990 The Regents of the University of California.\n\ -@(#)All rights reserved.\n"; +@(#)Copyright (c) 1990, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: mk-amd-map.c,v 1.1 1993/11/27 21:22:18 mycroft Exp $"; -static char sccsid[] = "%W% (Berkeley) %G%"; +static char rcsid[] = "$Id: mk-amd-map.c,v 1.2 1994/06/13 19:50:15 mycroft Exp $"; +static char sccsid[] = "@(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93"; #endif /* not lint */ #include "am.h" @@ -67,7 +67,11 @@ static char sccsid[] = "%W% (Berkeley) %G%"; #define HAS_DATABASE #include -#define create_database(name) dbm_open(name, O_RDWR|O_CREAT, 0444) +#ifdef DBM_SUFFIX +#define USING_DB +#endif + +#define create_database(name) dbm_open(name, O_RDWR|O_CREAT, 0644) static int store_data(db, k, v) voidp db; @@ -232,8 +236,12 @@ char *argv[]; int rc = 0; DBM *mapd; static char maptmp[] = "dbmXXXXXX"; - char maptpag[16], maptdir[16]; - char *mappag, *mapdir; + char maptpag[16]; + char *mappag; +#ifndef USING_DB + char maptdir[16]; + char *mapdir; +#endif int len; char *sl; int printit = 0; @@ -270,6 +278,20 @@ char *argv[]; if (!printit) { len = strlen(map); +#ifdef USING_DB + mappag = (char *) malloc(len + 5); + if (!mappag) { + perror("mk-amd-map: malloc"); + exit(1); + } + mktemp(maptmp); + sprintf(maptpag, "%s%s", maptmp, DBM_SUFFIX); + if (remove_file(maptpag) < 0) { + fprintf(stderr, "Can't remove existing temporary file"); + perror(maptpag); + exit(1); + } +#else mappag = (char *) malloc(len + 5); mapdir = (char *) malloc(len + 5); if (!mappag || !mapdir) { @@ -284,6 +306,7 @@ char *argv[]; perror(maptdir); exit(1); } +#endif } mapf = fopen(map, "r"); @@ -298,6 +321,8 @@ char *argv[]; if (mapd || printit) { int error = read_file(mapf, map, mapd); + if (mapd) + dbm_close(mapd); (void) fclose(mapf); if (printit) { if (error) { @@ -309,6 +334,16 @@ char *argv[]; fprintf(stderr, "Error reading source file %s\n", map); rc = 1; } else { +#ifdef USING_DB + sprintf(mappag, "%s%s", map, DBM_SUFFIX); + if (rename(maptpag, mappag) < 0) { + fprintf(stderr, "Couldn't rename %s to ", maptpag); + perror(mappag); + /* Throw away the temporary map */ + unlink(maptpag); + rc = 1; + } +#else sprintf(mappag, "%s.pag", map); sprintf(mapdir, "%s.dir", map); if (rename(maptpag, mappag) < 0) { @@ -330,6 +365,7 @@ char *argv[]; map); rc = 1; } +#endif } } } else { diff --git a/usr.sbin/amd/rpcx/amq_svc.c b/usr.sbin/amd/rpcx/amq_svc.c index 3619562e4fc6..a6021c2e3561 100644 --- a/usr.sbin/amd/rpcx/amq_svc.c +++ b/usr.sbin/amd/rpcx/amq_svc.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,15 +35,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)amq_svc.c 8.1 (Berkeley) 6/6/93 * - * $Id: amq_svc.c,v 1.1 1993/11/27 21:22:25 mycroft Exp $ + * $Id: amq_svc.c,v 1.2 1994/06/13 19:50:16 mycroft Exp $ * */ -/*#include */ #include "am.h" -#include +#include "amq.h" extern bool_t xdr_amq_mount_info_qelem(); void diff --git a/usr.sbin/amd/rpcx/nfs_prot_svc.c b/usr.sbin/amd/rpcx/nfs_prot_svc.c index feeae29bf69c..a7a243313d95 100644 --- a/usr.sbin/amd/rpcx/nfs_prot_svc.c +++ b/usr.sbin/amd/rpcx/nfs_prot_svc.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Jan-Simon Pendry at Imperial College, London. @@ -17,8 +17,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,9 +35,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% + * @(#)nfs_prot_svc.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_prot_svc.c,v 1.1 1993/11/27 21:22:29 mycroft Exp $ + * $Id: nfs_prot_svc.c,v 1.2 1994/06/13 19:50:17 mycroft Exp $ * */ diff --git a/usr.sbin/amd/text/COPYRIGHT b/usr.sbin/amd/text/COPYRIGHT index 213111b55c05..f2e96a6ccf0a 100644 --- a/usr.sbin/amd/text/COPYRIGHT +++ b/usr.sbin/amd/text/COPYRIGHT @@ -1,3 +1,3 @@ Copyright (c) 1990 Jan-Simon Pendry Copyright (c) 1990 Imperial College of Science, Technology & Medicine -Copyright (c) 1990 The Regents of the University of California. +Copyright (c) 1990, 1993 The Regents of the University of California. diff --git a/usr.sbin/amd/text/INSTALL b/usr.sbin/amd/text/INSTALL index 0e195443091b..bc15db47b9d5 100644 --- a/usr.sbin/amd/text/INSTALL +++ b/usr.sbin/amd/text/INSTALL @@ -191,4 +191,4 @@ mapping root to nobody. If anything interesting happened, eg it didn't work, please report it to me -- Jan-Simon Pendry -- as detailed in the README file. -$Id: INSTALL,v 1.1 1993/11/27 21:22:38 mycroft Exp $ +$Id: INSTALL,v 1.2 1994/06/13 19:50:20 mycroft Exp $ diff --git a/usr.sbin/amd/text/README b/usr.sbin/amd/text/README index aebff3998c15..86498e3ba3a1 100644 --- a/usr.sbin/amd/text/README +++ b/usr.sbin/amd/text/README @@ -1,10 +1,10 @@ This program is an automounter. -This automounter is a value-added, replacement for the SunOS +This automounter is a value-added, replacement for the SunOS 4 automount(8) program. Though based on that program in spirit, it contains no proprietary UN*X source code. -The version you have here is release 5.3Beta. +The version you have here is release 5.3Alpha. This program is NOT in the Public Domain - it is covered by the usual Berkeley software distribution license - but feel free @@ -34,4 +34,4 @@ being used. Thanks. The manual page (amd/amd.8) only lists the command line options. See the texinfo document doc/amdref.texinfo for a more detailed discussion. -$Id: README,v 1.1 1993/11/27 21:22:39 mycroft Exp $ +$Id: README,v 1.2 1994/06/13 19:50:21 mycroft Exp $ diff --git a/usr.sbin/amd/text/amd.start.ex b/usr.sbin/amd/text/amd.start.ex index 9fc4aaa79892..aff4b979f9a6 100644 --- a/usr.sbin/amd/text/amd.start.ex +++ b/usr.sbin/amd/text/amd.start.ex @@ -2,8 +2,8 @@ # # Copyright (c) 1989 Jan-Simon Pendry # Copyright (c) 1989 Imperial College of Science, Technology & Medicine -# Copyright (c) 1989 The Regents of the University of California. -# All rights reserved. +# Copyright (c) 1989, 1993 +# The Regents of the University of California. All rights reserved. # # This code is derived from software contributed to Berkeley by # Jan-Simon Pendry at Imperial College, London. @@ -18,8 +18,8 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. +# This product includes software developed by the University of +# California, Berkeley and its contributors. # 4. Neither the name of the University nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. @@ -36,11 +36,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# %W% (Berkeley) %G% +# @(#)amd.start.ex 8.1 (Berkeley) 6/6/93 # # Start amd # -# $Id: amd.start.ex,v 1.1 1993/11/27 21:22:44 mycroft Exp $ +# $Id: amd.start.ex,v 1.2 1994/06/13 19:50:24 mycroft Exp $ # PATH=/usr/sbin:/bin:/usr/bin:$PATH export PATH