mirror of
git://slackware.nl/current.git
synced 2025-01-18 22:27:20 +01:00
b76270bf9e
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
--- eject.c 15 Jul 2006 23:28:28 -0000 1.10
|
|
+++ eject.c 2007-02-14 13:57:52.000000000 +0100
|
|
@@ -379,6 +379,30 @@ static int FileExists(const char *name,
|
|
|
|
|
|
/*
|
|
+ * Linux mangles spaces in mount points by changing them to an octal string
|
|
+ * of '\040'. So lets scan the mount point and fix it up by replacing all
|
|
+ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable
|
|
+ * string as input as we mangle in place. Some of this was taken from the
|
|
+ * util-linux package.
|
|
+ */
|
|
+#define octalify(a) ((a) & 7)
|
|
+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3]))
|
|
+#define isoctal(a) (((a) & ~7) == '0')
|
|
+static char *DeMangleMount(char *s)
|
|
+{
|
|
+ char *tmp = s;
|
|
+ while ((tmp = strchr(tmp, '\\')) != NULL) {
|
|
+ if (tmp[1] == '0' && isoctal(tmp[2]) && isoctal(tmp[3])) {
|
|
+ tmp[0] = tooctal(tmp);
|
|
+ memmove(tmp+1, tmp+4, strlen(tmp)-3);
|
|
+ }
|
|
+ ++tmp;
|
|
+ }
|
|
+ return s;
|
|
+}
|
|
+
|
|
+
|
|
+/*
|
|
* Given name, such as foo, see if any of the following exist:
|
|
*
|
|
* foo (if foo starts with '.' or '/')
|
|
@@ -890,6 +914,8 @@ static int MountedDevice(const char *nam
|
|
if (rc >= 2) {
|
|
int mtabmaj, mtabmin;
|
|
GetMajorMinor(s1, &mtabmaj, &mtabmin);
|
|
+ DeMangleMount(s1);
|
|
+ DeMangleMount(s2);
|
|
if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
|
|
((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
|
|
FCLOSE(fp);
|
|
@@ -935,6 +961,8 @@ static int MountableDevice(const char *n
|
|
|
|
while (fgets(line, sizeof(line), fp) != 0) {
|
|
rc = sscanf(line, "%1023s %1023s", s1, s2);
|
|
+ DeMangleMount(s1);
|
|
+ DeMangleMount(s2);
|
|
if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
|
|
FCLOSE(fp);
|
|
*deviceName = strdup(s1);
|