diff options
| author | obrien <obrien@FreeBSD.org> | 1999-01-13 20:04:00 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-01-13 20:04:00 +0000 |
| commit | 44885905a041e4fad7e29a53f111f6fb16402d07 (patch) | |
| tree | b1a90e3c85c48712843356ffffdb58a8e388e44f /contrib/amd/fsinfo | |
| parent | 650a536e8ff28f166a48818f45c026ae9990d1c5 (diff) | |
| download | FreeBSD-src-44885905a041e4fad7e29a53f111f6fb16402d07.zip FreeBSD-src-44885905a041e4fad7e29a53f111f6fb16402d07.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/amd/fsinfo')
| -rw-r--r-- | contrib/amd/fsinfo/fsinfo.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c index abb1c50..345aae2 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 1.1.1.1 1998/08/23 22:07:20 obrien Exp $ + * $Id: fsinfo.c,v 1.2 1998/08/23 22:52:08 obrien 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 /* |
