fix wide printf forms ignoring width for %lc format specifier

[musl] / src / network / recvmsg.c

diff --git a/src/network/recvmsg.c b/src/network/recvmsg.c
index ead16f9..0364162 100644 (file)
--- a/src/network/recvmsg.c
+++ b/src/network/recvmsg.c
@@ -1,14 +1,68 @@
 #include <sys/socket.h>
+#include <limits.h>
+#include <time.h>
+#include <sys/time.h>
+#include <string.h>
 #include "syscall.h"
-#include "socketcall.h"
-#include "libc.h"
+
+hidden void __convert_scm_timestamps(struct msghdr *, socklen_t);
+
+void __convert_scm_timestamps(struct msghdr *msg, socklen_t csize)
+{
+       if (SCM_TIMESTAMP == SCM_TIMESTAMP_OLD) return;
+       if (!msg->msg_control || !msg->msg_controllen) return;
+
+       struct cmsghdr *cmsg, *last=0;
+       long tmp;
+       long long tvts[2];
+       int type = 0;
+
+       for (cmsg=CMSG_FIRSTHDR(msg); cmsg; cmsg=CMSG_NXTHDR(msg, cmsg)) {
+               if (cmsg->cmsg_level==SOL_SOCKET) switch (cmsg->cmsg_type) {
+               case SCM_TIMESTAMP_OLD:
+                       if (type) break;
+                       type = SCM_TIMESTAMP;
+                       goto common;
+               case SCM_TIMESTAMPNS_OLD:
+                       type = SCM_TIMESTAMPNS;
+               common:
+                       memcpy(&tmp, CMSG_DATA(cmsg), sizeof tmp);
+                       tvts[0] = tmp;
+                       memcpy(&tmp, CMSG_DATA(cmsg) + sizeof tmp, sizeof tmp);
+                       tvts[1] = tmp;
+                       break;
+               }
+               last = cmsg;
+       }
+       if (!last || !type) return;
+       if (CMSG_SPACE(sizeof tvts) > csize-msg->msg_controllen) {
+               msg->msg_flags |= MSG_CTRUNC;
+               return;
+       }
+       msg->msg_controllen += CMSG_SPACE(sizeof tvts);
+       cmsg = CMSG_NXTHDR(msg, last);
+       cmsg->cmsg_level = SOL_SOCKET;
+       cmsg->cmsg_type = type;
+       cmsg->cmsg_len = CMSG_LEN(sizeof tvts);
+       memcpy(CMSG_DATA(cmsg), &tvts, sizeof tvts);
+}
 
 ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
 {
-       unsigned long args[] = { fd, (unsigned long)msg, flags };
        ssize_t r;
-       CANCELPT_BEGIN;
-       r = syscall2(__NR_socketcall, SYS_RECVMSG, (long)args);
-       CANCELPT_END;
+       socklen_t orig_controllen = msg->msg_controllen;
+#if LONG_MAX > INT_MAX
+       struct msghdr h, *orig = msg;
+       if (msg) {
+               h = *msg;
+               h.__pad1 = h.__pad2 = 0;
+               msg = &h;
+       }
+#endif
+       r = socketcall_cp(recvmsg, fd, msg, flags, 0, 0, 0);
+       if (r >= 0) __convert_scm_timestamps(msg, orig_controllen);
+#if LONG_MAX > INT_MAX
+       if (orig) *orig = h;
+#endif
        return r;
 }