noos -> popies.net

[dump.git] / compat / include / fstab.h

diff --git a/compat/include/fstab.h b/compat/include/fstab.h
index 5b00e7a4a864c5a64fd8eee7db4453c92aea8ab2..234edec870142ee72d61d1b3eb9cffdeb429b763 100644 (file)
--- a/compat/include/fstab.h
+++ b/compat/include/fstab.h
@@ -1,8 +1,11 @@
 /*
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
- *     Remy Card <card@Linux.EU.Org>, 1994, 1995, 1996
+ *     Remy Card <card@Linux.EU.Org>, 1994-1997
+ *     Stelian Pop <stelian@popies.net>, 1999-2000
+ *     Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
+ *     $Id: fstab.h,v 1.12 2002/01/16 09:32:14 stelian Exp $
  */
 
 /*
@@ -36,13 +39,13 @@
  * 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.
- *
- *     @(#)fstab.h     8.1 (Berkeley) 6/2/93
  */
 
 #ifndef _FSTAB_H_
 #define _FSTAB_H_
 
+#include <config.h>
+
 /*
  * File system table, see fstab(5).
  *
@@ -54,8 +57,15 @@
  * if type is "rq", then use concatenation of fs_file and "quotas" to locate
  * quota file.
  */
+#ifdef __linux__
+#include <mntent.h>
+#ifdef _PATH_MNTTAB
+#define _PATH_FSTAB    _PATH_MNTTAB
+#else
 #define        _PATH_FSTAB     "/etc/fstab"
-#define        FSTAB           "/etc/fstab"    /* deprecated */
+#endif
+#endif /* __linux__ */
+#define        FSTAB           _PATH_FSTAB     /* deprecated */
 
 #define FSTAB_DEF      "defaults"      /* default mount option */
 #define        FSTAB_RW        "rw"            /* read/write device */
@@ -65,7 +75,7 @@
 #define        FSTAB_XX        "ignore"        /* ignore totally */
 
 struct fstab {
-       char    *fs_spec;               /* block special device name */
+       const char *fs_spec;            /* block special device name */
        char    *fs_file;               /* file system path prefix */
        char    *fs_vfstype;            /* File system type, ufs, nfs */
        char    *fs_mntops;             /* Mount options ala -o */