Attachment 709415 Details for Bug 917678 – proposed patch

[patch] proposed patch

util-linux-ng-2.17-mount-fstab-symlinks.patch (text/plain), 973 bytes, created by Karel Zak on 2013-03-13 08:51:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karel Zak

Created: 2013-03-13 08:51:49 UTC

Size: 973 bytes

patch

obsolete

>diff -up util-linux-ng-2.17.2/mount/fstab.c.kzak util-linux-ng-2.17.2/mount/fstab.c
>--- util-linux-ng-2.17.2/mount/fstab.c.kzak	2013-03-13 09:34:57.669889657 +0100
>+++ util-linux-ng-2.17.2/mount/fstab.c	2013-03-13 09:35:16.358017756 +0100
>@@ -370,11 +370,13 @@ getfs_by_dir (const char *dir) {
> 	struct mntentchn *mc, *mc0;
> 	char *cdir;
> 
>+	/* original paths */
> 	mc0 = fstab_head();
> 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
> 		if (streq(mc->m.mnt_dir, dir))
> 			return mc;
> 
>+	/* canonicalize @dir */
> 	cdir = canonicalize(dir);
> 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
> 		if (streq(mc->m.mnt_dir, cdir)) {
>@@ -382,6 +384,18 @@ getfs_by_dir (const char *dir) {
> 			return mc;
> 		}
> 	}
>+
>+	/* canonicalize all paths */
>+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
>+		char *dr = canonicalize(mc->m.mnt_dir);
>+		int ok = streq(dr, cdir);
>+		free(dr);
>+		if (ok) {
>+			free(cdir);
>+			return mc;
>+		}
>+	}
>+
> 	free(cdir);
> 	return NULL;
> }

Actions: View | Diff

Attachments on bug 917678: 709415