GetDLLSuffix: Remove the leading dot from LTDL_SHLIB_EXT.

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

diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h
index 4ef38963ffdfcb156dbe9fed74b56372def0e7f0..c15866f3d90adaa83affcfb00ac3e4db72935f3d 100644 (file)
--- a/lib/System/Unix/Unix.h
+++ b/lib/System/Unix/Unix.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// 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 is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -20,6 +20,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Config/config.h"     // Get autoconf configuration settings
+#include "llvm/System/Errno.h"
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
@@ -66,57 +67,21 @@
 # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif
 
-inline bool GetErrno(const std::string &prefix, std::string *ErrDest,
-                     int errnum = -1) {
-  char buffer[MAXPATHLEN];
-  
-  if (ErrDest == 0) return true;
-  
-  buffer[0] = 0;
+/// This function builds an error message into \p ErrMsg using the \p prefix
+/// string and the Unix error number given by \p errnum. If errnum is -1, the
+/// default then the value of errno is used.
+/// @brief Make an error message
+///
+/// If the error number can be converted to a string, it will be
+/// separated from prefix by ": ".
+static inline bool MakeErrMsg(
+  std::string* ErrMsg, const std::string& prefix, int errnum = -1) {
+  if (!ErrMsg)
+    return true;
   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
-  *ErrDest = prefix + ": " + buffer;
+  *ErrMsg = prefix + ": " + llvm::sys::StrError(errnum);
   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