diff options
author | obrien <obrien@FreeBSD.org> | 1999-01-13 19:23:16 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1999-01-13 19:23:16 +0000 |
commit | c9384f1d982e4695904ef82271714a049cd32827 (patch) | |
tree | 61bf33c6051ae2a19db07aea7c3c0ed78913fe61 /contrib/amd/fsinfo | |
parent | c6e3533e1e31cbf25e04688d244a8fc2af2e1972 (diff) | |
download | FreeBSD-src-c9384f1d982e4695904ef82271714a049cd32827.zip FreeBSD-src-c9384f1d982e4695904ef82271714a049cd32827.tar.gz |
Virgin import of AMD (am-utils) v6.0
Diffstat (limited to 'contrib/amd/fsinfo')
-rw-r--r-- | contrib/amd/fsinfo/fsi_analyze.c | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsi_data.h | 13 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsi_dict.c | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsi_gram.y | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsi_lex.l | 6 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsi_util.c | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsinfo.8 | 2 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsinfo.c | 13 | ||||
-rw-r--r-- | contrib/amd/fsinfo/fsinfo.h | 5 | ||||
-rw-r--r-- | contrib/amd/fsinfo/wr_atab.c | 6 | ||||
-rw-r--r-- | contrib/amd/fsinfo/wr_bparam.c | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/wr_dumpset.c | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/wr_exportfs.c | 4 | ||||
-rw-r--r-- | contrib/amd/fsinfo/wr_fstab.c | 4 |
14 files changed, 40 insertions, 37 deletions
diff --git a/contrib/amd/fsinfo/fsi_analyze.c b/contrib/amd/fsinfo/fsi_analyze.c index de29913..7d897b80 100644 --- a/contrib/amd/fsinfo/fsi_analyze.c +++ b/contrib/amd/fsinfo/fsi_analyze.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_analyze.c,v 5.2.2.1 1992/02/09 15:09:41 jsp beta $ + * $Id: fsi_analyze.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_data.h b/contrib/amd/fsinfo/fsi_data.h index 07b7b9e..68d12ac 100644 --- a/contrib/amd/fsinfo/fsi_data.h +++ b/contrib/amd/fsinfo/fsi_data.h @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_data.h,v 5.2.2.1 1992/02/09 15:09:53 jsp beta $ + * $Id: fsi_data.h,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ * */ @@ -89,11 +89,10 @@ struct host { ioloc *h_ioloc; fsmount *h_netroot, *h_netswap; #define HF_HOST 0 - char *h_hostname; /* The full name of the host */ - char *h_lochost; /* The name of the host with local domains * - * * * stripped */ - char *h_hostpath; /* The filesystem path to the host (cf * * * - * compute_hostpath) */ + char *h_hostname; /* The full name of the host */ + char *h_lochost; /* The name of the host with local domains stripped */ + char *h_hostpath; /* The filesystem path to the host (cf + compute_hostpath) */ #define HF_ETHER 1 qelem *h_ether; #define HF_CONFIG 2 diff --git a/contrib/amd/fsinfo/fsi_dict.c b/contrib/amd/fsinfo/fsi_dict.c index f9e686a..7c4c482 100644 --- a/contrib/amd/fsinfo/fsi_dict.c +++ b/contrib/amd/fsinfo/fsi_dict.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_dict.c,v 5.2.2.1 1992/02/09 15:09:43 jsp beta $ + * $Id: fsi_dict.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_gram.y b/contrib/amd/fsinfo/fsi_gram.y index b325c77..50ca4d6 100644 --- a/contrib/amd/fsinfo/fsi_gram.y +++ b/contrib/amd/fsinfo/fsi_gram.y @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_gram.y,v 5.2.2.1 1992/02/09 15:09:35 jsp beta $ + * $Id: fsi_gram.y,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_lex.l b/contrib/amd/fsinfo/fsi_lex.l index 98b1976..bd81817 100644 --- a/contrib/amd/fsinfo/fsi_lex.l +++ b/contrib/amd/fsinfo/fsi_lex.l @@ -18,7 +18,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -39,7 +39,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_lex.l,v 5.2.2.1 1992/02/09 15:09:36 jsp beta $ + * $Id: fsi_lex.l,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ * */ @@ -97,7 +97,7 @@ static int yylineno; #endif /* ECHO */ /* - * There are some things that need to be defined only if useing GNU flex. + * There are some things that need to be defined only if using GNU flex. * These must not be defined if using standard lex */ #ifdef FLEX_SCANNER diff --git a/contrib/amd/fsinfo/fsi_util.c b/contrib/amd/fsinfo/fsi_util.c index d69c459..2c3cbcc 100644 --- a/contrib/amd/fsinfo/fsi_util.c +++ b/contrib/amd/fsinfo/fsi_util.c @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -35,7 +35,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_util.c,v 5.2.2.1 1992/02/09 15:09:39 jsp beta $ + * $Id: fsi_util.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8 index 5a4eec5..f4735c2 100644 --- a/contrib/amd/fsinfo/fsinfo.8 +++ b/contrib/amd/fsinfo/fsinfo.8 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 -.\" $Id: fsinfo.8,v 1.2 1994/06/13 20:50:18 mycroft Exp $ +.\" $Id: fsinfo.8,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ .\" .TH FSINFO 8 "June 28, 1993" .SH NAME diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c index e2632bf..05dabf0 100644 --- a/contrib/amd/fsinfo/fsinfo.c +++ b/contrib/amd/fsinfo/fsinfo.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsinfo.c,v 5.2.2.1 1992/02/09 15:09:33 jsp beta $ + * $Id: fsinfo.c,v 1.2 1998/12/27 06:25:21 ezk Exp $ * */ @@ -58,8 +58,8 @@ char **g_argv; char *autodir = "/a"; char *progname; -char *username; char hostname[MAXHOSTNAMELEN + 1]; +char *username; char idvbuf[1024]; dict *dict_of_hosts; dict *dict_of_volnames; @@ -80,9 +80,12 @@ char *fstab_pref; char *mount_pref; /* dummy variables */ -int orig_umask, foreground, debug_flags; +#if 0 pid_t mypid; serv_state amd_state; +int foreground, orig_umask; +int debug_flags; +#endif /* @@ -109,7 +112,7 @@ fsi_get_args(int c, char *v[]) if (!progname) progname = "fsinfo"; - while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != EOF) + while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != -1) switch (ch) { diff --git a/contrib/amd/fsinfo/fsinfo.h b/contrib/amd/fsinfo/fsinfo.h index c02b673..50224bb 100644 --- a/contrib/amd/fsinfo/fsinfo.h +++ b/contrib/amd/fsinfo/fsinfo.h @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsinfo.h,v 5.2.2.1 1992/02/09 15:09:51 jsp beta $ + * $Id: fsinfo.h,v 1.2 1998/12/27 06:25:21 ezk Exp $ * */ @@ -109,6 +109,7 @@ extern void domain_strip(char *otherdom, char *localdom); */ #ifndef yywrap extern int yywrap(void); +# define yywrap() 1 #endif /* not yywrap */ extern int yyparse(void); extern int write_atab(qelem *q); diff --git a/contrib/amd/fsinfo/wr_atab.c b/contrib/amd/fsinfo/wr_atab.c index be870c0..474ba44 100644 --- a/contrib/amd/fsinfo/wr_atab.c +++ b/contrib/amd/fsinfo/wr_atab.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_atab.c,v 5.2.2.1 1992/02/09 15:09:44 jsp beta $ + * $Id: wr_atab.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $ * */ @@ -129,7 +129,7 @@ write_amount_info(FILE *af, automount *ap, int sk) fsi_mount *mp = (fsi_mount *) dd->dd_data; /* * If the mount point and the exported volname are the - * same then this filesystem will be recognised by + * same then this filesystem will be recognized by * the restart code - so we don't need to put out a * special rule for it. */ diff --git a/contrib/amd/fsinfo/wr_bparam.c b/contrib/amd/fsinfo/wr_bparam.c index fb4479c..de2f55e 100644 --- a/contrib/amd/fsinfo/wr_bparam.c +++ b/contrib/amd/fsinfo/wr_bparam.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_bparam.c,v 5.2.2.1 1992/02/09 15:09:46 jsp beta $ + * $Id: wr_bparam.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_dumpset.c b/contrib/amd/fsinfo/wr_dumpset.c index b33858d..f1e027a 100644 --- a/contrib/amd/fsinfo/wr_dumpset.c +++ b/contrib/amd/fsinfo/wr_dumpset.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_dumpset.c,v 5.2.2.1 1992/02/09 15:09:47 jsp beta $ + * $Id: wr_dumpset.c,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_exportfs.c b/contrib/amd/fsinfo/wr_exportfs.c index 56d9bd5..eb46be5 100644 --- a/contrib/amd/fsinfo/wr_exportfs.c +++ b/contrib/amd/fsinfo/wr_exportfs.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_exportfs.c,v 5.2.2.1 1992/02/09 15:09:48 jsp beta $ + * $Id: wr_exportfs.c,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_fstab.c b/contrib/amd/fsinfo/wr_fstab.c index 49cbfc4..f03e1e3 100644 --- a/contrib/amd/fsinfo/wr_fstab.c +++ b/contrib/amd/fsinfo/wr_fstab.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * 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: + * must display the following acknowledgment: * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_fstab.c,v 5.2.2.1 1992/02/09 15:09:49 jsp beta $ + * $Id: wr_fstab.c,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $ * */ |