summaryrefslogtreecommitdiff
path: root/amd/ops_ufs.c
diff options
context:
space:
mode:
Diffstat (limited to 'amd/ops_ufs.c')
-rw-r--r--amd/ops_ufs.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/amd/ops_ufs.c b/amd/ops_ufs.c
index fd82a5cd2228..0d8f3068dbe5 100644
--- a/amd/ops_ufs.c
+++ b/amd/ops_ufs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-2006 Erez Zadok
+ * Copyright (c) 1997-2014 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.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* 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 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
+ * 3. 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.
*
@@ -61,7 +57,11 @@ static int ufs_umount(am_node *am, mntfs *mf);
*/
am_ops ufs_ops =
{
+#ifndef __NetBSD__
"ufs",
+#else
+ "ffs",
+#endif
ufs_match,
0, /* ufs_init */
ufs_mount,
@@ -98,7 +98,7 @@ ufs_match(am_opts *fo)
/*
* Determine magic cookie to put in mtab
*/
- return strdup(fo->opt_dev);
+ return xstrdup(fo->opt_dev);
}