 @@ -45,27 +45,27 @@ AH_BOTTOM([
 #endif /* not _CONFIG_H */
 /*
  * Local Variables:
  * mode: c
  * End:
  */
 /* End of am-utils-6.x config.h file */
 ])
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.1.1.1 $)
+AC_REVISION($Revision: 1.2 $)
 AC_COPYRIGHT([Copyright (c) 1997-2007 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
 dnl run by libtool, but must be kept here because HOST_MACROS depends on it
 AC_CANONICAL_HOST
 AMU_HOST_MACROS
 dnl ======================================================================
 dnl ######################################################################
 dnl PACKAGE NAME AND VERSION
 AC_MSG_NOTICE(*** PACKAGE NAME AND VERSION ***)
 AMU_PACKAGE_NAME($PACKAGE_NAME)
 AMU_PACKAGE_VERSION($PACKAGE_VERSION)
 @@ -1253,29 +1253,32 @@ AMU_CHECK_MNT2_NFS_OPTS(	\
 	wsize		\
 	xlatecookie	\
+	)
 dnl ======================================================================
 dnl ######################################################################
 dnl CDFS-specific mount(2) options (hex numbers) like M_*
 AC_MSG_NOTICE(*** CDFS-SPECIFIC MOUNT(2) OPTIONS ***)
 dnl if found, defines MNT2_CDFS_OPT_*
 AMU_CHECK_MNT2_CDFS_OPTS(\
 	defperm		\
 	extatt		\
 	gens		\
 	nocasetrans	\
 	nodefperm	\
 	nojoliet	\
 	norrip		\
 	noversion	\
 	rrcaseins	\
 	rrip		\
+	)
 dnl ======================================================================
 dnl ######################################################################
 dnl PCFS-specific mount(2) options (hex numbers) like M_*
 AC_MSG_NOTICE(*** PCFS-SPECIFIC MOUNT(2) OPTIONS ***)
 dnl if found, defines MNT2_PCFS_OPT_*
 AMU_CHECK_MNT2_PCFS_OPTS(\
 	longname	\
 	nowin95		\
 	shortname	\
+	)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ops_cdfs.c,v 1.1.1.1 2008/09/19 20:07:16 christos Exp $	*/
+/*	$NetBSD: ops_cdfs.c,v 1.2 2009/01/02 16:00:02 christos Exp $	*/
 /*
  * Copyright (c) 1997-2007 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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -140,40 +140,57 @@ mount_cdfs(char *mntdir, char *fs_name,
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_NODEFPERM))
     cdfs_flags |= MNT2_CDFS_OPT_NODEFPERM;
 #endif /* MNTTAB_OPT_NODEFPERM */
 #if defined(MNT2_CDFS_OPT_NOVERSION) && defined(MNTTAB_OPT_NOVERSION)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_NOVERSION))
     cdfs_flags |= MNT2_CDFS_OPT_NOVERSION;
 #endif /* defined(MNT2_CDFS_OPT_NOVERSION) && defined(MNTTAB_OPT_NOVERSION) */
 #if defined(MNT2_CDFS_OPT_RRIP) && defined(MNTTAB_OPT_RRIP)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_RRIP))
     cdfs_flags |= MNT2_CDFS_OPT_RRIP;
 #endif /* defined(MNT2_CDFS_OPT_RRIP) && defined(MNTTAB_OPT_RRIP) */
 #if defined(MNT2_CDFS_OPT_NORRIP) && defined(MNTTAB_OPT_NORRIP)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_NORRIP))
     cdfs_flags |= MNT2_CDFS_OPT_NORRIP;
 #endif /* defined(MNT2_CDFS_OPT_NORRIP) && defined(MNTTAB_OPT_NORRIP) */
 #if defined(MNT2_CDFS_OPT_GENS) && defined(MNTTAB_OPT_GENS)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_GENS))
     cdfs_flags |= MNT2_CDFS_OPT_GENS;
 #endif /* defined(MNT2_CDFS_OPT_GENS) && defined(MNTTAB_OPT_GENS) */
 #if defined(MNT2_CDFS_OPT_EXTATT) && defined(MNTTAB_OPT_EXTATT)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_EXTATT))
     cdfs_flags |= MNT2_CDFS_OPT_EXTATT;
 #endif /* defined(MNT2_CDFS_OPT_EXTATT) && defined(MNTTAB_OPT_EXTATT) */
 #if defined(MNT2_CDFS_OPT_NOCASETRANS) && defined(MNTTAB_OPT_NOCASETRANS)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_NOCASETRANS))
     cdfs_flags |= MNT2_CDFS_OPT_NOCASETRANS;
 #endif /* defined(MNT2_CDFS_OPT_NOCASETRANS) && defined(MNTTAB_OPT_NOCASETRANS) */
 #if defined(MNT2_CDFS_OPT_NOJOLIET) && defined(MNTTAB_OPT_NOJOLIET)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_NOJOLIET))
     cdfs_flags |= MNT2_CDFS_OPT_NOJOLIET;
 #endif /* defined(MNT2_CDFS_OPT_NOJOLIET) && defined(MNTTAB_OPT_NOJOLIET) */
 #if defined(MNT2_CDFS_OPT_RRCASEINS) && defined(MNTTAB_OPT_RRCASEINS)
   if (amu_hasmntopt(&mnt, MNTTAB_OPT_RRCASEINS))
     cdfs_flags |= MNT2_CDFS_OPT_RRCASEINS;
 #endif /* defined(MNT2_CDFS_OPT_RRCASEINS) && defined(MNTTAB_OPT_RRCASEINS) */
   genflags = compute_mount_flags(&mnt);
 #ifdef HAVE_FS_AUTOFS
   if (on_autofs)
     genflags |= autofs_compute_mount_flags(&mnt);
 #endif /* HAVE_FS_AUTOFS */
 #ifdef HAVE_CDFS_ARGS_T_FLAGS
   cdfs_args.flags = cdfs_flags;
 #endif /* HAVE_CDFS_ARGS_T_FLAGS */
 #ifdef HAVE_CDFS_ARGS_T_ISO_FLAGS
   cdfs_args.iso_flags = genflags | cdfs_flags;
 #endif /* HAVE_CDFS_ARGS_T_ISO_FLAGS */

 @@ -1,15 +1,15 @@
 \input texinfo          @c -*-texinfo-*-
-@c $NetBSD: am-utils.texi,v 1.1.1.1 2008/09/19 20:07:20 christos Exp $
+@c $NetBSD: am-utils.texi,v 1.2 2009/01/02 16:00:02 christos Exp $
 @c
 @c Copyright (c) 1997-2007 Erez Zadok
 @c Copyright (c) 1989 Jan-Simon Pendry
 @c Copyright (c) 1989 Imperial College of Science, Technology & Medicine
 @c Copyright (c) 1989 The Regents of the University of California.
 @c All rights reserved.
 @c
 @c This code is derived from software contributed to Berkeley by
 @c Jan-Simon Pendry at Imperial College, London.
 @c
 @c Redistribution and use in source and binary forms, with or without
 @c modification, are permitted provided that the following conditions
 @c are met:
 @@ -2191,26 +2191,31 @@ Use NFS Version 3 for this mount.
 Turn off the attribute cache.
 @item noauto
 @cindex Mount flags; noauto
 This option is used by the mount command in @samp{/etc/fstab} or
 @samp{/etc/vfstab} and means not to mount this file system when mount -a
 is used.
 @item nocache
 @cindex Mount flags; nocache
 Do not allow data to be cached from a remote server for this
 mount.
 @item nocasetrans
 @cindex Mount flags; nocasetrans
 Don't do case translation. Useful for CD-ROMS formatted as
 ISO-9660.
 @item noconn
 @cindex Mount flags; noconn
 Don't make a connection on datagram transports.
 @item nocto
 @cindex Mount flags; nocto
 No close-to-open consistency.
 @item nodefperm
 @cindex Mount flags; nodefperm
 Do not ignore the permission mode bits.  Useful for CD-ROMS formatted as
 ISO-9660.
 @@ -2218,26 +2223,30 @@ ISO-9660.
 @cindex Mount flags; nodev
 @itemx nodevs
 @cindex Mount flags; nodevs
 Don't allow local special devices on this filesystem.
 @item noexec
 @cindex Mount flags; noexec
 Don't allow program execution.
 @item noint
 @cindex Mount flags; noint
 Do not allow keyboard interrupts for this mount
 @item nojoliet
 @cindex Mount flags; nojoliet
 Turn off the Joliet extensions.  Useful for CD-ROMS formatted as ISO-9660.
 @item nolock
 @cindex Mount flags; nolock
 Do not use the NFS locking protocol
 @item nomnttab
 @cindex Mount flags; nomnttab
 This option is used internally to tell Amd that a Solaris 8 system using
 mntfs is in use.
 @item norrip
 @cindex Mount flags; norrip
 Turn off using of the Rock Ridge Interchange Protocol (RRIP) extensions
 to ISO-9660.
 @@ -2312,26 +2321,31 @@ that requires reserved ports.  It is rec
 be on.
 @item retrans=@i{n}
 @cindex Mount flags; retrans
 The number of NFS retransmits made before a user error is generated by a
 @samp{soft} mounted filesystem, and before a @samp{hard} mounted
 filesystem reports @samp{NFS server @dfn{yoyo} not responding still
 trying}.
 @item retry
 @cindex Mount flags; retry
 Set the NFS retry counter.
 @item rrcaseins
 @cindex Mount flags; rrcaseins
 Enable the Rock Ridge Interchange Protocol (RRIP) case insensitive extensions.
 Useful for CD-ROMS formatted as ISO-9660.
 @item rrip
 @cindex Mount flags; rrip
 Uses the Rock Ridge Interchange Protocol (RRIP) extensions to ISO-9660.
 @item rsize=@var{n}
 @cindex Mount flags; rsize
 The NFS read packet size.  You may need to set this if you are using
 NFS/UDP through a gateway or a slow link.
 @item rw
 @cindex Mount flags; rw
 Allow reads and writes on this filesystem.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: am_compat.h,v 1.1.1.1 2008/09/19 20:07:21 christos Exp $	*/
+/*	$NetBSD: am_compat.h,v 1.2 2009/01/02 16:00:02 christos Exp $	*/
 /*
  * Copyright (c) 1997-2007 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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -168,30 +168,44 @@
 # define MNTTAB_OPT_NOVERSION "noversion"
 #endif /* defined(MNT2_CDFS_OPT_NOVERSION) && !defined(MNTTAB_OPT_NOVERSION) */
 #if defined(MNT2_CDFS_OPT_RRIP) && !defined(MNTTAB_OPT_RRIP)
 # define MNTTAB_OPT_RRIP "rrip"
 #endif /* defined(MNT2_CDFS_OPT_RRIP) && !defined(MNTTAB_OPT_RRIP) */
 #if defined(MNT2_CDFS_OPT_NORRIP) && !defined(MNTTAB_OPT_NORRIP)
 # define MNTTAB_OPT_NORRIP "norrip"
 #endif /* defined(MNT2_CDFS_OPT_NORRIP) && !defined(MNTTAB_OPT_NORRIP) */
 #if defined(MNT2_CDFS_OPT_GENS) && !defined(MNTTAB_OPT_GENS)
 # define MNTTAB_OPT_GENS "gens"
 #endif /* defined(MNT2_CDFS_OPT_GENS) && !defined(MNTTAB_OPT_GENS) */
 #if defined(MNT2_CDFS_OPT_EXTATT) && !defined(MNTTAB_OPT_EXTATT)
 # define MNTTAB_OPT_EXTATT "extatt"
 #endif /* defined(MNT2_CDFS_OPT_EXTATT) && !defined(MNTTAB_OPT_EXTATT) */
 #if defined(MNT2_CDFS_OPT_NOJOLIET) && !defined(MNTTAB_OPT_NOJOLIET)
 # define MNTTAB_OPT_NOJOLIET "nojoliet"
 #endif /* defined(MNT2_CDFS_OPT_NOJOLIET) && !defined(MNTTAB_OPT_NOJOLIET) */
 #if defined(MNT2_CDFS_OPT_NOCASETRANS) && !defined(MNTTAB_OPT_NOCASETRANS)
 # define MNTTAB_OPT_NOCASETRANS "nocasetrans"
 #endif /* defined(MNT2_CDFS_OPT_NOCASETRANS) && !defined(MNTTAB_OPT_NOCASETRANS) */
 #if defined(MNT2_CDFS_OPT_RRCASEINS) && !defined(MNTTAB_OPT_RRCASEINS)
 # define MNTTAB_OPT_RRCASEINS "rrcaseins"
 #endif /* defined(MNT2_CDFS_OPT_RRCASEINS) && !defined(MNTTAB_OPT_RRCASEINS) */
 /*
  * Complete MNTTAB_OPT_* options based on MNT2_PCFS_OPT_* mount options.
  */
 #if defined(MNT2_PCFS_OPT_LONGNAME) && !defined(MNTTAB_OPT_LONGNAME)
 # define MNTTAB_OPT_LONGNAME "longnames"
 #endif /* defined(MNT2_PCFS_OPT_LONGNAME) && !defined(MNTTAB_OPT_LONGNAME) */
 #if defined(MNT2_PCFS_OPT_NOWIN95) && !defined(MNTTAB_OPT_NOWIN95)
 # define MNTTAB_OPT_NOWIN95 "nowin95"
 #endif /* defined(MNT2_PCFS_OPT_NOWIN95) && !defined(MNTTAB_OPT_NOWIN95) */
 #if defined(MNT2_PCFS_OPT_SHORTNAME) && !defined(MNTTAB_OPT_SHORTNAME)
 # define MNTTAB_OPT_SHORTNAME "shortnames"
 #endif /* defined(MNT2_PCFS_OPT_SHORTNAME) && !defined(MNTTAB_OPT_SHORTNAME) */

 @@ -1,13 +1,17 @@
 -01-02  Christos Zoulas <christos@zoulas.com>
 	* add nocasetrans, nojoliet, rrcaseins for cd9660 filesystems
 -09-17  Christos Zoulas <christos@zoulas.com>
 	* fix manual page section issues (sorting, non-existant)
 	* add missing forward declarations
 	* avoid null pointer derefs (coverity)
 	* more portable endian detection support
 	* implement tmpfs support
 	* use sizeof var instead of constant