summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-09-02 18:17:08 +0000
committerobrien <obrien@FreeBSD.org>2001-09-02 18:17:08 +0000
commitf7e67c0496504776fb8dd152c72639dfd080d7da (patch)
tree14652609592271888d806fbb2d49246cc652a26e
parent1be4f4c0a2bad6e77a17ace2db389dc5e868afbb (diff)
downloadFreeBSD-src-f7e67c0496504776fb8dd152c72639dfd080d7da.zip
FreeBSD-src-f7e67c0496504776fb8dd152c72639dfd080d7da.tar.gz
We are returning to the stock (6.0.7) file now.
The vendor sources are now POSIX [me harder] compliant.
-rw-r--r--contrib/amd/amd/get_args.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/amd/amd/get_args.c b/contrib/amd/amd/get_args.c
index a5f5a4b..0f52218 100644
--- a/contrib/amd/amd/get_args.c
+++ b/contrib/amd/amd/get_args.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-1999 Erez Zadok
+ * Copyright (c) 1997-2001 Erez Zadok
* 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.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: get_args.c,v 1.4 1999/09/30 21:01:31 ezk Exp $
+ * $Id: get_args.c,v 1.7.2.1 2001/01/10 03:23:05 ezk Exp $
* $FreeBSD$
*
*/
@@ -86,7 +86,7 @@ get_version_string(void)
vers = xmalloc(2048 + wire_buf_len);
sprintf(vers, "%s\n%s\n%s\n%s\n",
- "Copyright (c) 1997-1999 Erez Zadok",
+ "Copyright (c) 1997-2001 Erez Zadok",
"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.");
@@ -335,6 +335,9 @@ get_args(int argc, char *argv[])
if (debug_flags & D_MTAB)
dlog("-D mtab option ignored");
# endif /* DEBUG */
+# ifdef MNTTAB_FILE_NAME
+ mnttab_file_name = MNTTAB_FILE_NAME;
+# endif /* MNTTAB_FILE_NAME */
#endif /* not MOUNT_TABLE_ON_FILE */
if (switch_to_logfile(gopt.logfile, orig_umask) != 0)
OpenPOWER on IntegriCloud