1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
|
Description: Avoid relying on max host name length
Fixes FTBFS on Debian GNU/kFreeBSD.
Author: Robert Millan <rmh.debian@aybabtu.com>
Bug-Debian: http://bugs.debian.org/542887
Last-Update: 2023-02-08
--- a/examples/echo/echo-server.cpp
+++ b/examples/echo/echo-server.cpp
@@ -3,6 +3,7 @@
#endif
#include "echo-server.h"
+#include "xgethostname.h"
#include <unistd.h>
#include <stdlib.h>
#include <signal.h>
@@ -61,9 +62,9 @@
std::map< std::string, std::string > EchoServer::Info()
{
std::map< std::string, std::string > info;
- char hostname[HOST_NAME_MAX];
+ char *hostname;
- gethostname(hostname, sizeof(hostname));
+ hostname = xgethostname ();
info["hostname"] = hostname;
info["username"] = getlogin();
--- a/examples/echo/Makefile.am
+++ b/examples/echo/Makefile.am
@@ -4,7 +4,7 @@
noinst_PROGRAMS = echo-server
-echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp
+echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp xgethostname.c
echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
echo-server-glue.h: echo-introspect.xml
--- /dev/null
+++ b/examples/echo/xgethostname.c
@@ -0,0 +1,83 @@
+/* xgethostname.c -- return current hostname with unlimited length
+
+ Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Specification. */
+#include "xgethostname.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#ifndef ENAMETOOLONG
+# define ENAMETOOLONG 0
+#endif
+
+#ifndef INITIAL_HOSTNAME_LENGTH
+# define INITIAL_HOSTNAME_LENGTH 34
+#endif
+
+/* Return the current hostname in malloc'd storage.
+ If malloc fails, exit.
+ Upon any other failure, return NULL and set errno. */
+char *
+xgethostname (void)
+{
+ char *hostname = NULL, *tmp;
+ size_t size = INITIAL_HOSTNAME_LENGTH;
+
+ while (1)
+ {
+ /* Use SIZE_1 here rather than SIZE to work around the bug in
+ SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
+ even when the name is as long as the supplied buffer. */
+ size_t size_1;
+
+ tmp = realloc (hostname, size);
+ if (! tmp)
+ {
+ perror ("realloc");
+ exit (1);
+ }
+ hostname = tmp;
+ size_1 = size - 1;
+ hostname[size_1 - 1] = '\0';
+ errno = 0;
+
+ if (gethostname (hostname, size_1) == 0)
+ {
+ if (! hostname[size_1 - 1])
+ break;
+ }
+ else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL
+ /* OSX/Darwin does this when the buffer is not large enough */
+ && errno != ENOMEM)
+ {
+ int saved_errno = errno;
+ free (hostname);
+ errno = saved_errno;
+ return NULL;
+ }
+ }
+
+ return hostname;
+}
--- /dev/null
+++ b/examples/echo/xgethostname.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *xgethostname (void);
+
+#ifdef __cplusplus
+}
+#endif
--- a/examples/echo_ecore/echo-server.cpp
+++ b/examples/echo_ecore/echo-server.cpp
@@ -3,6 +3,7 @@
#endif
#include "echo-server.h"
+#include "xgethostname.h"
#include <unistd.h>
#include <stdlib.h>
#include <signal.h>
@@ -61,9 +62,9 @@
std::map< std::string, std::string > EchoServer::Info()
{
std::map< std::string, std::string > info;
- char hostname[HOST_NAME_MAX];
+ char *hostname;
- gethostname(hostname, sizeof(hostname));
+ hostname = xgethostname ();
info["hostname"] = hostname;
info["username"] = getlogin();
--- a/examples/echo_ecore/Makefile.am
+++ b/examples/echo_ecore/Makefile.am
@@ -7,7 +7,7 @@
noinst_PROGRAMS = echo-server
endif
-echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp
+echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp xgethostname.c
echo_server_LDADD = $(top_builddir)/src/integration/ecore/libdbus-c++-ecore-1.la \
$(top_builddir)/src/libdbus-c++-1.la \
$(ecore_LIBS)
--- /dev/null
+++ b/examples/echo_ecore/xgethostname.c
@@ -0,0 +1,83 @@
+/* xgethostname.c -- return current hostname with unlimited length
+
+ Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Specification. */
+#include "xgethostname.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#ifndef ENAMETOOLONG
+# define ENAMETOOLONG 0
+#endif
+
+#ifndef INITIAL_HOSTNAME_LENGTH
+# define INITIAL_HOSTNAME_LENGTH 34
+#endif
+
+/* Return the current hostname in malloc'd storage.
+ If malloc fails, exit.
+ Upon any other failure, return NULL and set errno. */
+char *
+xgethostname (void)
+{
+ char *hostname = NULL, *tmp;
+ size_t size = INITIAL_HOSTNAME_LENGTH;
+
+ while (1)
+ {
+ /* Use SIZE_1 here rather than SIZE to work around the bug in
+ SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
+ even when the name is as long as the supplied buffer. */
+ size_t size_1;
+
+ tmp = realloc (hostname, size);
+ if (! tmp)
+ {
+ perror ("realloc");
+ exit (1);
+ }
+ hostname = tmp;
+ size_1 = size - 1;
+ hostname[size_1 - 1] = '\0';
+ errno = 0;
+
+ if (gethostname (hostname, size_1) == 0)
+ {
+ if (! hostname[size_1 - 1])
+ break;
+ }
+ else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL
+ /* OSX/Darwin does this when the buffer is not large enough */
+ && errno != ENOMEM)
+ {
+ int saved_errno = errno;
+ free (hostname);
+ errno = saved_errno;
+ return NULL;
+ }
+ }
+
+ return hostname;
+}
--- /dev/null
+++ b/examples/echo_ecore/xgethostname.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *xgethostname (void);
+
+#ifdef __cplusplus
+}
+#endif
|