Minor fix due to recent API changes

[oota-llvm.git] / lib / System / Unix / Unix.h

diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h
index 04b86ff8774e9a5a3226d4d4e033a76bef156118..4ef38963ffdfcb156dbe9fed74b56372def0e7f0 100644 (file)
--- a/lib/System/Unix/Unix.h
+++ b/lib/System/Unix/Unix.h
@@ -1,37 +1,122 @@
 //===- llvm/System/Unix/Unix.h - Common Unix Include File -------*- C++ -*-===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
+// This file was developed by Reid Spencer and is distributed under the
 // University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 // This file defines things specific to Unix implementations.
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_SYSTEM_UNIX_UNIX_H
+#define LLVM_SYSTEM_UNIX_UNIX_H
+
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only generic UNIX code that
 //===          is guaranteed to work on all UNIX variants.
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"     // Get autoconf configuration settings
-#include <unistd.h>
+#include "llvm/Config/config.h"     // Get autoconf configuration settings
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
 #include <cerrno>
+#include <string>
+#include <algorithm>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
+
+#ifdef HAVE_ASSERT_H
 #include <assert.h>
+#endif
+
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif
+
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
 
-inline void ThrowErrno(const std::string& prefix) {
-#if defined __USE_XOPEN2K || defined __USE_MISC
-    char buffer[MAXPATHLEN];
-    strerror_r(errno,buffer, MAXPATHLEN);
-    throw prefix + ": " + buffer;
+inline bool GetErrno(const std::string &prefix, std::string *ErrDest,
+                     int errnum = -1) {
+  char buffer[MAXPATHLEN];
+  
+  if (ErrDest == 0) return true;
+  
+  buffer[0] = 0;
+  if (errnum == -1)
+    errnum = errno;
+#ifdef HAVE_STRERROR_R
+  // strerror_r is thread-safe.
+  if (errnum)
+    strerror_r(errnum, buffer, MAXPATHLEN-1);
+#elif HAVE_STRERROR
+  // Copy the thread un-safe result of strerror into
+  // the buffer as fast as possible to minimize impact
+  // of collision of strerror in multiple threads.
+  if (errnum)
+    strncpy(buffer, strerror(errnum), MAXPATHLEN-1);
+  buffer[MAXPATHLEN-1] = 0;
 #else
-    throw prefix + ": " + strerror(errno);
+  // Strange that this system doesn't even have strerror
+  // but, oh well, just use a generic message
+  sprintf(buffer, "Error #%d", errnum);
 #endif
+  *ErrDest = prefix + ": " + buffer;
+  return true;
 }
+
+inline void ThrowErrno(const std::string& prefix, int errnum = -1) {
+  char buffer[MAXPATHLEN];
+  buffer[0] = 0;
+  if (errnum == -1)
+    errnum = errno;
+#ifdef HAVE_STRERROR_R
+  // strerror_r is thread-safe.
+  if (errnum)
+    strerror_r(errnum,buffer,MAXPATHLEN-1);
+#elif HAVE_STRERROR
+  // Copy the thread un-safe result of strerror into
+  // the buffer as fast as possible to minimize impact
+  // of collision of strerror in multiple threads.
+  if (errnum)
+    strncpy(buffer,strerror(errnum),MAXPATHLEN-1);
+  buffer[MAXPATHLEN-1] = 0;
+#else
+  // Strange that this system doesn't even have strerror
+  // but, oh well, just use a generic message
+  sprintf(buffer, "Error #%d", errnum);
+#endif
+  throw prefix + ": " + buffer;
+}
+
+#endif