diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-18 14:09:42 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-18 14:09:42 +0200 |
commit | 0982af0e4b5622aaae02f43925fe1152006f878e (patch) | |
tree | 38f7971d08e822fa0a4ffcb5e432b7da993da497 /libre/lirc-libre/lircd-handle-large-config.patch | |
parent | 38389505b5f8809743855ead04f7feb9a37a9cc8 (diff) | |
parent | 014b5d0a1ee98ba0466f067f605b9637f2a14b2f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nautilus-actions/PKGBUILD
extra/libdrm/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-dbd-mysql/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-libpng/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/bind/PKGBUILD
testing/dmraid/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'libre/lirc-libre/lircd-handle-large-config.patch')
-rw-r--r-- | libre/lirc-libre/lircd-handle-large-config.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch new file mode 100644 index 000000000..85bc20518 --- /dev/null +++ b/libre/lirc-libre/lircd-handle-large-config.patch @@ -0,0 +1,39 @@ +From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 +From: Jarod Wilson <jarod@redhat.com> +Date: Wed, 6 Apr 2011 11:04:12 -0400 +Subject: [PATCH] lircd: handle larger config files in write_socket better + +Pointed out by Michael Zanetti on list, irsend LIST has issues with long +config files, which didn't exist in maintainer mode, as we were using a +do while loop to make sure we spit out everything. Just use that loop +all the time. + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + daemons/lircd.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/daemons/lircd.c b/daemons/lircd.c +index 6c21a3a..ddcca05 100644 +--- a/daemons/lircd.c ++++ b/daemons/lircd.c +@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) + int done, todo = len; + + while (todo) { +-#ifdef SIM_REC + do { + done = write(fd, buf, todo); +- } +- while (done < 0 && errno == EAGAIN); +-#else +- done = write(fd, buf, todo); +-#endif ++ } while (done < 0 && errno == EAGAIN); ++ + if (done <= 0) + return (done); + buf += done; +-- +1.7.0.1 + |