- specified patches should be included, it will be reviewed later, NFY

[packages/util-linux.git] / mount-2.12pre-symlink_20030809.diff

--- util-linux-2.12pre/mount/sundries.h_ORIG	2002-11-01 02:00:50.000000000 +0100
+++ util-linux-2.12pre/mount/sundries.h	2003-08-09 14:31:41.000000000 +0200
@@ -17,7 +17,8 @@
 extern int verbose;
 extern int sloppy;
 
-#define streq(s, t)	(strcmp ((s), (t)) == 0)
+#define streq(s, t)      (strcmp ((s), (t)) == 0)
+#define streqn(s, t, n)  (strncmp((s), (t), (n)) == 0)
 
 /* Functions in sundries.c that are used in mount.c and umount.c  */ 
 void block_signals (int how);
--- util-linux-2.12pre/mount/fstab.h_ORIG	2000-12-03 00:13:47.000000000 +0100
+++ util-linux-2.12pre/mount/fstab.h	2003-08-09 13:52:48.000000000 +0200
@@ -1,17 +1,10 @@
 #include <mntent.h>
-#define _PATH_FSTAB	"/etc/fstab"
-#ifdef _PATH_MOUNTED
-#define MOUNTED_LOCK	_PATH_MOUNTED "~"
-#define MOUNTED_TEMP	_PATH_MOUNTED ".tmp"
-#else
-#define MOUNTED_LOCK	"/etc/mtab~"
-#define MOUNTED_TEMP	"/etc/mtab.tmp"
-#endif
-#define LOCK_TIMEOUT	10
-
-int mtab_is_writable(void);
-int mtab_does_not_exist(void);
-int mtab_is_a_symlink(void);
+#define _PATH_FSTAB             "/etc/fstab"
+#define PATH_PROC               "/proc/"
+#define PATH_PROC_MOUNTS        PATH_PROC "mounts"
+#define MTAB_LOCK_SUFFIX        "~"
+#define MTAB_TEMP_SUFFIX        ".tmp"
+#define LOCK_TIMEOUT        10
 
 struct mntentchn {
 	struct mntentchn *nxt, *prev;
@@ -31,6 +24,10 @@
 struct mntentchn *getfsvolspec (const char *label);
 
 #include <mntent.h>
+
+void get_mtab_info (void);
+int mtab_is_writable(void);
+int mtab_does_not_exist(void);
 void lock_mtab (void);
 void unlock_mtab (void);
 void update_mtab (const char *special, struct mntent *with);
--- util-linux-2.12pre/mount/fstab.c_ORIG	2003-07-05 22:16:05.000000000 +0200
+++ util-linux-2.12pre/mount/fstab.c	2003-08-09 14:31:30.000000000 +0200
@@ -1,7 +1,10 @@