]> git.pld-linux.org Git - packages/systemd.git/commitdiff
- up to 169 but rel 0.1 - new configure options are broken and don't make any effect
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Thu, 19 May 2011 18:35:26 +0000 (18:35 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    udev-uClibc.patch -> 1.5

udev-uClibc.patch

index a575c810c780163aa2c6eb00abdcff766958d58f..69012f326d8f3a1ef83df73f991967b375c585f9 100644 (file)
@@ -243,21 +243,24 @@ diff -ur udev-150/udev/udevadm-info.c udev-150-uclibc/udev/udevadm-info.c
  #include <sys/types.h>
  #include <sys/poll.h>
  #include <sys/socket.h>
-@@ -184,11 +185,18 @@
+@@ -185,13 +185,21 @@
        conn->refcount = 1;
        conn->uctrl = uctrl;
  
 +#ifdef __UCLIBC__
 +      conn->sock = accept(uctrl->sock, NULL, NULL);
 +#else
-       conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC);
+       conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
 +#endif
        if (conn->sock < 0) {
+               if (errno != EINTR)
+                       err(uctrl->udev, "unable to receive ctrl connection: %m\n");
                free(conn);
                return NULL;
        }
 +#ifdef __UCLIBC__
 +      fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
++      fcntl(conn->sock, F_SETFL, O_NONBLOCK);
 +#endif
  
        /* enable receiving of the sender credentials */
This page took 0.242669 seconds and 4 git commands to generate.