Re: [PATCH v5] Add systemd socket launching support

[Matthew Leach <matthew@mattleach.net>]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

Hi Paul,

Paul Eggert <eggert@cs.ucla.edu> writes:

> Is there any reason for the specific value 226 in configure.ac's
> '[libsystemd >= 226]'? Won't this code work with libsystemd 222, say?
> That's the version in Fedora 23.

There is no specific reason other than 226 is what is installed on my
system and what I have tested against.  If you are able to test on an
earlier version, this number could be reduced.

> The code tests whether st_is_socket returns a nonnegative value, but
> shouldn't it be testing whether it returns a positive value?

Indeed, you're correct, I missed that one.  The attached patch should
take care of that.

Thanks,
-- 
Matt

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Check-for-positive-return-value-from-sd_is_socket.patch --]
[-- Type: text/x-diff, Size: 924 bytes --]

From bedc8edc722a169376d34b10d87799309a5bdd33 Mon Sep 17 00:00:00 2001
From: Matthew Leach <matthew@mattleach.net>
Date: Sun, 17 Apr 2016 12:25:55 +0100
Subject: [PATCH] Check for positive return value from 'sd_is_socket'

* src/emacs.c (main): Ensure that 'sd_is_socket' returns a positive
  value, which indicates this is a valid socket.
---
 src/emacs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emacs.c b/src/emacs.c
index a51df09..5563624 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1017,7 +1017,7 @@ Try adding 'Accept=false' in the Emacs socket unit file.\n");
 
       else if (systemd_socket == 1 &&
                sd_is_socket (SD_LISTEN_FDS_START,
-                             AF_UNSPEC, SOCK_STREAM, 1) >= 0)
+                             AF_UNSPEC, SOCK_STREAM, 1) > 0)
         set_external_socket_descriptor (SD_LISTEN_FDS_START);
 #endif /* HAVE_LIBSYSTEMD */
 
-- 
2.8.0