summaryrefslogtreecommitdiff
path: root/src/libstddjb/ipc_recv.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
commit49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch)
tree393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/ipc_recv.c
parentfdffefb8032922ce7ffe4c00816072a8ff2148fc (diff)
downloadskalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.xz
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/ipc_recv.c')
-rw-r--r--src/libstddjb/ipc_recv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstddjb/ipc_recv.c b/src/libstddjb/ipc_recv.c
index 599bad8..5aa1c2b 100644
--- a/src/libstddjb/ipc_recv.c
+++ b/src/libstddjb/ipc_recv.c
@@ -4,16 +4,16 @@
#include <errno.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <skalibs/bytestr.h>
+#include <string.h>
#include <skalibs/error.h>
#include <skalibs/webipc.h>
-int ipc_recv (int fd, char *s, unsigned int len, char *path)
+ssize_t ipc_recv (int fd, char *s, size_t len, char *path)
{
struct sockaddr_un sa = { .sun_family = AF_UNIX } ;
socklen_t total = sizeof sa ;
char tmp[len] ;
- register int r ;
+ ssize_t r ;
do r = recvfrom(fd, tmp, len, 0, (struct sockaddr *)&sa, &total) ;
while ((r == -1) && (errno == EINTR)) ;
if (r < 0) return r ;
@@ -23,11 +23,11 @@ int ipc_recv (int fd, char *s, unsigned int len, char *path)
if (total == sizeof(sa_family_t)) path[0] = 0 ;
else
{
- unsigned int l = str_len(sa.sun_path) ;
+ size_t l = strlen(sa.sun_path) ;
if (l > IPCPATH_MAX) return (errno = EPROTO, -1) ;
- byte_copy(path, l+1, sa.sun_path) ;
+ memcpy(path, sa.sun_path, l+1) ;
}
}
- byte_copy(s, r, tmp) ;
+ memcpy(s, tmp, r) ;
return r ;
}