* src/common/utils.c
use gethostname() instead of uname()
based on a patch by Michael Hughes
<Sylpheed-Claws_user@thehugheslogcabin.net>
+2007-06-08 [paul] 2.9.2cvs46
+
+ * src/common/utils.c
+ use gethostname() instead of uname()
+ based on a patch by Michael Hughes
+ <Sylpheed-Claws_user@thehugheslogcabin.net>
+
2007-06-07 [wwp] 2.9.2cvs45
* src/prefs_common.c
( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/ldapupdate.c; ) > 2.9.2cvs43.patchset
( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/ldapupdate.c; ) > 2.9.2cvs44.patchset
( cvs diff -u -r 1.204.2.135 -r 1.204.2.136 src/prefs_common.c; ) > 2.9.2cvs45.patchset
+( cvs diff -u -r 1.36.2.103 -r 1.36.2.104 src/common/utils.c; ) > 2.9.2cvs46.patchset
MICRO_VERSION=2
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
#include <string.h>
#include <ctype.h>
#include <errno.h>
+#include <sys/param.h>
#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
# include <wchar.h>
if (!domain_name) {
struct hostent *hp;
- struct utsname uts;
+ char hostname[256];
- if (uname(&uts) < 0) {
- perror("uname");
+ if (gethostname(hostname, sizeof(hostname)) != 0) {
+ perror("gethostname");
domain_name = "unknown";
} else {
- if ((hp = my_gethostbyname(uts.nodename)) == NULL) {
+ hostname[sizeof(hostname) - 1] = '\0';
+ if ((hp = my_gethostbyname(hostname)) == NULL) {
perror("gethostbyname");
- domain_name = g_strdup(uts.nodename);
+ domain_name = g_strdup(hostname);
} else {
domain_name = g_strdup(hp->h_name);
}
}
-
debug_print("domain name = %s\n", domain_name);
}