+ Use the mnttab(4) interface instead of mntent. + C++ syntax cleanups to appease the SunPro compiler. + Use MAXPATHLEN instead of NAME_MAX which can be unimplemented on strict POSIX systems. + Use POSIX inttypes.h if BSD types are not available. + RPC includes and C++ namespace fixes. + Use dirent(3) instead of older sys/dir.h interface. + Avoid `sun' namespace collision. Patch based on the work of Robert Lillack and others, described in http://mail-index.netbsd.org/tech-pkg/2004/08/20/0005.html and tested with SunPro and gcc.
67 lines
2.3 KiB
Text
67 lines
2.3 KiB
Text
$NetBSD: patch-ao,v 1.4 2004/11/19 12:35:22 sketch Exp $
|
|
|
|
--- src/fam-mntent.h.orig Sun May 12 19:15:01 2002
|
|
+++ src/fam-mntent.h
|
|
@@ -0,0 +1,62 @@
|
|
+/*
|
|
+ * mntent
|
|
+ * fam-mntent.h - compatability header for BSD
|
|
+ *
|
|
+ * Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
|
|
+ * All rights reserved.
|
|
+ *
|
|
+ * Redistribution and use in source and binary forms, with or without
|
|
+ * modification, are permitted provided that the following conditions
|
|
+ * are met:
|
|
+ * 1. Redistributions of source code must retain the above copyright
|
|
+ * notice, this list of conditions and the following disclaimer.
|
|
+ * 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.
|
|
+ *
|
|
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
+ * SUCH DAMAGE.
|
|
+ */
|
|
+
|
|
+#if defined(HAVE_MNTENT_H)
|
|
+#include <mntent.h>
|
|
+#elif defined(HAVE_SYS_MNTTAB_H)
|
|
+#include <stdio.h>
|
|
+#include <unistd.h>
|
|
+#include <sys/mntent.h>
|
|
+#include <sys/mnttab.h>
|
|
+#define MOUNTED MNTTAB
|
|
+#else
|
|
+#ifndef _MNTENT_H
|
|
+#define _MNTENT_H
|
|
+#include <stdio.h>
|
|
+
|
|
+#define MOUNTED "dummy"
|
|
+
|
|
+#define MNTTYPE_NFS "nfs"
|
|
+
|
|
+struct mntent {
|
|
+ char *mnt_fsname;
|
|
+ char *mnt_dir;
|
|
+ char *mnt_type;
|
|
+ char *mnt_opts;
|
|
+ int mnt_freq;
|
|
+ int mnt_passno;
|
|
+};
|
|
+
|
|
+#define setmntent(x,y) ((FILE *)0x1)
|
|
+struct mntent *getmntent __P ((FILE *fp));
|
|
+char *hasmntopt __P ((const struct mntent *mnt, const char *option));
|
|
+#define endmntent(x) ((int)1)
|
|
+
|
|
+#endif /* _MNTENT_H */
|
|
+#endif /* HAVE_MNTENT_H */
|