Changeset f54b07d for message.c

Timestamp:

Feb 26, 2011, 8:10:30 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

9620c8d

Parents:

cb6c9e1

git-author:

David Benjamin <davidben@mit.edu> (01/04/11 11:15:08)

git-committer:

David Benjamin <davidben@mit.edu> (02/26/11 20:10:30)

Message:

Use g_get_host_name instead of gethostname and MAXHOSTNAMELEN

This lets us punt thishost from owl_global. g_get_host_name implements
the same localhost fallback, so we really don't need it.

Also, Solaris gets upset about MAXHOSTNAMELEN when you define
_XOPEN_SOURCE=500 without __EXTENSIONS__, if we ever care to get rid of
that. (That said, glib's answer to this is lame. They just hardcode 100
and even forget to NUL-terminate the buffer; POSIX is apparently
braindead and leaves truncation undefined. glibc is kind enough to give
you ENAMETOOLONG.)

File:

• message.c (modified) (2 diffs)

message.c

@@ -960 +960 @@
 void owl_message_create_from_zwrite(owl_message *m, const owl_zwrite *z, const char *body)
 {
-  int ret;
-  char hostbuff[5000];
   char *replyline;
   
@@ -991 +989 @@
   
   /* save the hostname */
-  ret=gethostname(hostbuff, MAXHOSTNAMELEN);
-  hostbuff[MAXHOSTNAMELEN]='\0';
-  if (ret) {
-    owl_message_set_hostname(m, "localhost");
-  } else {
-    owl_message_set_hostname(m, hostbuff);
-  }
+  owl_message_set_hostname(m, g_get_host_name());
 
   /* set the "isprivate" attribute if it's a private zephyr. */