From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 5 Oct 2017 16:21:11 +0000 (+0100)
Subject: fishdescriptor: donate: some bugfixes
X-Git-Tag: archive/debian/6.0.0~1^2~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=bbd389fe8b598d5dccdd57f71b90ddc9473149b7;ds=sidebyside

fishdescriptor: donate: some bugfixes

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/fishdescriptor/Makefile b/fishdescriptor/Makefile
index 17bb3e7..dd0dfbe 100644
--- a/fishdescriptor/Makefile
+++ b/fishdescriptor/Makefile
@@ -1,4 +1,4 @@
 fishdescriptor-donate.so:	donate.o
-	$(CC) -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
+	$(CC) -shared -Wl,-soname $(LIBCANON) -o $@ $< $(LIBS)
 
 donate.o:			donate.c
diff --git a/fishdescriptor/donate.c b/fishdescriptor/donate.c
index 49e244d..6e5dea7 100644
--- a/fishdescriptor/donate.c
+++ b/fishdescriptor/donate.c
@@ -16,11 +16,16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* return conventions: functions here return 0 on success,
- * or -1 setting errno */
+#include <stdlib.h>
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 static int fishdescriptor_sendmsg_fds(int carrier,
                                       int nfds, const int fds[]) {
+  /* return convention: like a syscall */
   struct msghdr msg = { 0 };
   struct cmsghdr *cmsg;
   size_t spaceneeded = nfds * sizeof(fds[0]);
@@ -52,20 +57,23 @@ static int fishdescriptor_sendmsg_fds(int carrier,
   return 0;
 }
 
-static int fishdescriptor_donate(const char *path, const int *fds) {
+int fishdescriptor_donate(const char *path, const int *fds) {
+  /* return convention: returns errno value */
+  /* within function: r is like syscall return, errno value is in errno */
   int r;
+  int esave = errno;
   int carrier=-1;
 
   carrier = socket(AF_UNIX, SOCK_STREAM, 0);
   if (carrier < 0) goto out;
 
   struct sockaddr_un suna;
-  memset(suna,0,&suna);
+  memset(&suna,0,sizeof(suna));
   suna.sun_family = AF_UNIX;
-  if (strlen(path) >= sizeof(suna.sun_path)) { outno = E2BIG; goto out; }
+  if (strlen(path) >= sizeof(suna.sun_path)) { errno = E2BIG; goto out; }
   strcpy(suna.sun_path, path);
 
-  int r = connect(carrier, &suna, sizeof(suna));
+  r = connect(carrier, (const struct sockaddr*)&suna, sizeof(suna));
   if (r) goto out;
 
   int nfds;
@@ -77,5 +85,7 @@ static int fishdescriptor_donate(const char *path, const int *fds) {
   r = 0;
  out:
   if (carrier >= 0) close(carrier);
+  r = !r ? 0 : !errno ? EIO : errno;
+  esave = errno;
   return r;
 }