Merge remote-tracking branch 'origin/v0.10'

Conflicts:
	src/node_os.cc

1 files changed, 16 insertions, 12 deletions

diff --git a/src/node_os.cc b/src/node_os.cc
index 614a10c96f..9b1b02deb2 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -33,10 +33,17 @@
 #endif
 
 #ifdef __POSIX__
-# include <unistd.h>  // gethostname, sysconf
+# include <netdb.h>         // MAXHOSTNAMELEN on Solaris.
+# include <unistd.h>        // gethostname, sysconf
+# include <sys/param.h>     // MAXHOSTNAMELEN on Linux and the BSDs.
 # include <sys/utsname.h>
 #endif
 
+// Add Windows fallback.
+#ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 256
+#endif
+
 namespace node {
 
 using namespace v8;
@@ -51,32 +58,29 @@ static Handle<Value> GetEndianness(const Arguments& args) {
 
 static Handle<Value> GetHostname(const Arguments& args) {
   HandleScope scope(node_isolate);
-  char s[255];
-  int r = gethostname(s, 255);
+  char buf[MAXHOSTNAMELEN + 1];
 
-  if (r < 0) {
+  if (gethostname(buf, sizeof(buf))) {
 #ifdef __POSIX__
     return ThrowException(ErrnoException(errno, "gethostname"));
 #else // __MINGW32__
     return ThrowException(ErrnoException(WSAGetLastError(), "gethostname"));
 #endif // __MINGW32__
   }
+  buf[sizeof(buf) - 1] = '\0';
 
-  return scope.Close(String::New(s));
+  return scope.Close(String::New(buf));
 }
 
 static Handle<Value> GetOSType(const Arguments& args) {
   HandleScope scope(node_isolate);
 
 #ifdef __POSIX__
-  char type[256];
   struct utsname info;
-
-  uname(&info);
-  strncpy(type, info.sysname, strlen(info.sysname));
-  type[strlen(info.sysname)] = 0;
-
-  return scope.Close(String::New(type));
+  if (uname(&info)) {
+    return ThrowException(ErrnoException(errno, "uname"));
+  }
+  return scope.Close(String::New(info.sysname));
 #else // __MINGW32__
   return scope.Close(String::New("Windows_NT"));
 #endif