eject: added a patch to handle mountpoints with spaces, from Gentoo. bumprev.

This commit is contained in:
Juan RP 2010-10-24 09:03:45 +02:00
parent 2bebdf320d
commit cdf4b8399e
4 changed files with 64 additions and 6 deletions

View File

@ -0,0 +1,57 @@
http://bugs.gentoo.org/151257
--- eject.c
+++ eject.c
@@ -370,6 +370,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 (isoctal(tmp[1]) && 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 '/')
@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam
if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
FCLOSE(fp);
- *deviceName = strdup(s1);
- *mountName = strdup(s2);
+ *deviceName = DeMangleMount(strdup(s1));
+ *mountName = DeMangleMount(strdup(s2));
return 1;
}
}
@@ -928,8 +952,8 @@ static int MountableDevice(const char *n
rc = sscanf(line, "%1023s %1023s", s1, s2);
if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
FCLOSE(fp);
- *deviceName = strdup(s1);
- *mountName = strdup(s2);
+ *deviceName = DeMangleMount(strdup(s1));
+ *mountName = DeMangleMount(strdup(s2));
return 1;
}
}

View File

@ -1,6 +1,7 @@
# Template file for 'eject'
pkgname=eject
version=2.1.5
revision=1
distfiles="http://archive.ubuntu.com/ubuntu/pool/main/e/eject/eject_$version.orig.tar.gz"
build_style=gnu_configure
short_desc="Ejects CDs and operates CD-Changers under Linux"
@ -16,5 +17,5 @@ long_desc="
You can also use eject to properly disconnect external mass-storage devices
like digital cameras or portable music players."
Add_dependency full glibc
Add_dependency run glibc
Add_dependency build gettext

View File

@ -1,6 +1,6 @@
# Template build file for 'firefox'.
pkgname=firefox
version=3.6.4
version=3.6.11
_libxul_sdkver=1.9.2
wrksrc=mozilla-${_libxul_sdkver}
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
@ -16,7 +16,7 @@ configure_args="--enable-application=browser --enable-default-toolkit=cairo-gtk2
--with-libxul-sdk=/usr/lib/xulrunner-devel-${_libxul_sdkver}"
short_desc="Lightweight gecko-based web browser"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8
checksum=16de496afb41400c8a6f5929cfc8d2c967afe30e99251d1752bc794453d28db4
long_desc="
Mozilla Firefox is a free, open-source and cross-platform web browser
for Windows, Linux, MacOS X and many other operating systems. It is

View File

@ -1,8 +1,8 @@
# Template build file for 'xulrunner'.
pkgname=xulrunner
_xulver=1.9.2
_xulpatchver=4
_ffver=3.6.4
_xulpatchver=11
_ffver=3.6.11
# Current xulrunner version is available at $wrksrc/config/milestone.txt
if [ -n "${_xulpatchver}" ]; then
version=${_xulver}.${_xulpatchver}
@ -25,7 +25,7 @@ configure_args="--enable-application=xulrunner --enable-libxul
--with-system-nspr --with-system-nss --enable-safe-browsing"
short_desc="XML User Interface Language runtime environment"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8
checksum=16de496afb41400c8a6f5929cfc8d2c967afe30e99251d1752bc794453d28db4
long_desc="
XULRunner is a runtime environment for applications using the
XML User Interface Language, XUL. It is the successor of the Gecko