[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22294 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22294 - gnunet/src/util |
Date: |
Tue, 26 Jun 2012 15:10:45 +0200 |
Author: grothoff
Date: 2012-06-26 15:10:45 +0200 (Tue, 26 Jun 2012)
New Revision: 22294
Modified:
gnunet/src/util/server.c
Log:
-fix error message for unix paths starting with 0-termination
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2012-06-26 13:01:54 UTC (rev 22293)
+++ gnunet/src/util/server.c 2012-06-26 13:10:45 UTC (rev 22294)
@@ -478,10 +478,17 @@
"bind", port,
(AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6");
else if (AF_UNIX == serverAddr->sa_family)
+ {
+ const struct sockaddr_un *un = (const struct sockaddr_un *) serverAddr;
+ unsigned int off = 0;
+
+ if ('\0' == un->sun_path[0])
+ off = 1; /* some UNIXPATHs start with 0 */
LOG (GNUNET_ERROR_TYPE_WARNING,
- _("`%s' failed for `%s': address already in use\n"), "bind",
- ((const struct sockaddr_un *) serverAddr)->sun_path);
-
+ _("`%s' failed for `%.*s': address already in use\n"), "bind",
+ (int) ((sizeof (un->sun_path) - off)),
+ (&un->sun_path[off]));
+ }
}
GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
errno = eno;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22294 - gnunet/src/util,
gnunet <=