diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /extra/eject | |
parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'extra/eject')
-rw-r--r-- | extra/eject/eject-2.1.5-handle-spaces.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/extra/eject/eject-2.1.5-handle-spaces.patch b/extra/eject/eject-2.1.5-handle-spaces.patch deleted file mode 100644 index 692368fa5..000000000 --- a/extra/eject/eject-2.1.5-handle-spaces.patch +++ /dev/null @@ -1,57 +0,0 @@ -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; - } - } |