Changeset f54b07d

Timestamp:

Feb 26, 2011, 8:10:30 PM (14 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.)

Files:

• global.c (modified) (2 diffs)
• message.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• variable.c (modified) (1 diff)

global.c

@@ -9 +9 @@
 #include "owl.h"
 
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 256
-#endif
-
 static void _owl_global_init_windows(owl_global *g);
 
 void owl_global_init(owl_global *g) {
-  struct hostent *hent;
-  char hostname[MAXHOSTNAMELEN];
   char *cd;
   const char *homedir;
 
   g_type_init();
-
-  gethostname(hostname, MAXHOSTNAMELEN);
-  hent=gethostbyname(hostname);
-  if (!hent) {
-    g->thishost=g_strdup("localhost");
-  } else {
-    g->thishost=g_strdup(hent->h_name);
-  }
 
   g->lines=LINES;
@@ -497 +483 @@
 time_t owl_global_get_idletime(const owl_global *g) {
   return(time(NULL)-g->lastinputtime);
-}
-
-const char *owl_global_get_hostname(const owl_global *g) {
-  if (g->thishost) return(g->thishost);
-  return("");
 }
 

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. */

owl.h

@@ -594 +594 @@
   int rightshift;
   volatile sig_atomic_t resizepending;
-  char *thishost;
   char *homedir;
   char *confdir;

variable.c

@@ -466 +466 @@
 int owl_variable_tty_set(owl_variable *v, const void *newval)
 {
-  owl_zephyr_set_locationinfo(owl_global_get_hostname(&g), newval);
+  owl_zephyr_set_locationinfo(g_get_host_name(), newval);
   return(owl_variable_string_set_default(v, newval));
 }