From: Karel Zak <kzak@redhat.com>
Date: Wed, 10 Mar 2010 22:59:33 +0000 (+0100)
Subject: swapon: use unmangle() for filenames from /proc/swaps
X-Git-Tag: v2.18-rc1~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf71ef0797c42f4b1754ec8756819c633a0d0d73;p=thirdparty%2Futil-linux.git

swapon: use unmangle() for filenames from /proc/swaps

linux kernel encodes all garbage in filenames by mangle() function. We
need to unmagle() to get the real filenames.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/Makefile.am b/mount/Makefile.am
index c5f58aa3f3..7694030622 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -37,7 +37,8 @@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 umount_LDADD = $(ldadd_common)
 
 swapon_SOURCES = swapon.c swap_constants.h ../lib/linux_version.c \
-	../lib/blkdev.c ../lib/fsprobe.c ../lib/canonicalize.c
+	../lib/blkdev.c ../lib/fsprobe.c ../lib/canonicalize.c \
+	../lib/mangle.c
 swapon_CFLAGS = $(cflags_common)
 swapon_LDADD = $(ldadd_common)
 
diff --git a/mount/swapon.c b/mount/swapon.c
index 9f702ecb8c..501254bc54 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -22,6 +22,7 @@
 #include "fsprobe.h"
 #include "pathnames.h"
 #include "swapheader.h"
+#include "mangle.h"
 
 #define PATH_MKSWAP	"/sbin/mkswap"
 
@@ -173,7 +174,7 @@ read_proc_swaps(void) {
 			break;
 		swapFiles = q;
 
-		swapFiles[numSwaps++] = strdup(line);
+		swapFiles[numSwaps++] = unmangle(line);
 	}
 	fclose(swaps);
 }