Module Name: src
Committed By: dholland
Date: Sat Sep 5 20:19:43 UTC 2015
Modified Files:
src/usr.sbin/syslogd: syslogd.c
Log Message:
tidy/fix printing of paths from sockaddr_un
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.121 src/usr.sbin/syslogd/syslogd.c:1.122
--- src/usr.sbin/syslogd/syslogd.c:1.121 Tue Feb 10 20:38:15 2015
+++ src/usr.sbin/syslogd/syslogd.c Sat Sep 5 20:19:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.121 2015/02/10 20:38:15 christos Exp $ */
+/* $NetBSD: syslogd.c,v 1.122 2015/09/05 20:19:43 dholland Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.121 2015/02/10 20:38:15 christos Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.122 2015/09/05 20:19:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -714,9 +714,11 @@ dispatch_read_funix(int fd, short event,
return;
}
+#define SUN_PATHLEN(su) \
+ ((su)->sun_len - (sizeof(*(su)) - sizeof((su)->sun_path)))
+
DPRINTF((D_CALL|D_EVENT|D_NET), "Unix socket (%.*s) active (%d, %d %p)"
- " with linebuf@%p, size %zu)\n", (int)(myname.sun_len
- - sizeof(myname.sun_len) - sizeof(myname.sun_family)),
+ " with linebuf@%p, size %zu)\n", (int)SUN_PATHLEN(&myname),
myname.sun_path, fd, event, ev, linebuf, linebufsize-1);
sunlen = sizeof(fromunix);
@@ -727,7 +729,7 @@ dispatch_read_funix(int fd, short event,
printline(LocalFQDN, linebuf, 0);
} else if (rv < 0 && errno != EINTR) {
logerror("recvfrom() unix `%.*s'",
- myname.sun_len, myname.sun_path);
+ (int)SUN_PATHLEN(&myname), myname.sun_path);
}
}
