New upstream version 2.3.3+dfsg.upstream/2.3.3+dfsg

16 files changed, 48 insertions, 73 deletions

diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h
index c062d6f..940a2e3 100644
--- a/src/lib/arch/Arch.h
+++ b/src/lib/arch/Arch.h
@@ -54,9 +54,7 @@
 #    include "arch/unix/ArchConsoleUnix.h"
 #    include "arch/unix/ArchDaemonUnix.h"
 #    include "arch/unix/ArchLogUnix.h"
-#    if HAVE_PTHREAD
-#        include "arch/unix/ArchMultithreadPosix.h"
-#    endif
+#    include "arch/unix/ArchMultithreadPosix.h"
 #    include "arch/unix/ArchNetworkBSD.h"
 #    include "arch/unix/ArchSleepUnix.h"
 #    include "arch/unix/ArchStringUnix.h"
diff --git a/src/lib/arch/ArchDaemonNone.h b/src/lib/arch/ArchDaemonNone.h
index fd59758..e02405f 100644
--- a/src/lib/arch/ArchDaemonNone.h
+++ b/src/lib/arch/ArchDaemonNone.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include "arch/IArchDaemon.h"
+#include <string>
 
 #define ARCH_DAEMON ArchDaemonNone
 
@@ -46,5 +47,5 @@ public:
     virtual bool        isDaemonInstalled(const char* name);
     virtual void        installDaemon();
     virtual void        uninstallDaemon();
-    virtual std::string    commandLine() const;
+    virtual std::string commandLine() const;
 };
diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h
index a4983d3..23a34f2 100644
--- a/src/lib/arch/IArchDaemon.h
+++ b/src/lib/arch/IArchDaemon.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
-#include "base/String.h"
+#include <string>
 
 //! Interface for architecture dependent daemonizing
 /*!
@@ -122,7 +122,7 @@ public:
     /*!
     Gets the command line with which the application was started.
     */
-    virtual std::string    commandLine() const = 0;
+    virtual std::string commandLine() const = 0;
 
     //@}
 };
diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h
index 8a925b4..997c8ae 100644
--- a/src/lib/arch/IArchTaskBarReceiver.h
+++ b/src/lib/arch/IArchTaskBarReceiver.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "base/String.h"
 #include "common/IInterface.h"
+#include <string>
 
 class IScreen;
 class INode;
@@ -88,9 +88,9 @@ public:
     to set the tooltip is left to sublclasses.  Getting and setting
     the icon must be thread safe.
     */
-    virtual std::string    getToolTip() const = 0;
+    virtual std::string getToolTip() const = 0;
 
-    virtual void updateStatus(INode*, const String& errorMsg) = 0;
+    virtual void updateStatus(INode*, const std::string& errorMsg) = 0;
 
     virtual void cleanup() {}
 
diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h
index 457c620..8484d06 100644
--- a/src/lib/arch/XArch.h
+++ b/src/lib/arch/XArch.h
@@ -20,7 +20,7 @@
 
 #include "common/common.h"
 #include "common/stdstring.h"
-#include "common/stdexcept.h"
+#include <stdexcept>
 
 //! Generic thread exception
 /*!
@@ -56,7 +56,7 @@ string for that error code.
 class XArchEval {
 public:
     XArchEval() { }
-    virtual ~XArchEval() _NOEXCEPT { }
+    virtual ~XArchEval() noexcept { }
     
     virtual std::string    eval() const = 0;
 };
@@ -66,7 +66,7 @@ class XArch : public std::runtime_error {
 public:
     XArch(XArchEval* adopted) : std::runtime_error(adopted->eval()) { delete adopted; }
     XArch(const std::string& msg) : std::runtime_error(msg) { }
-    virtual ~XArch() _NOEXCEPT { }
+    virtual ~XArch() noexcept { }
 };
 
 // Macro to declare XArch derived types
diff --git a/src/lib/arch/unix/ArchInternetUnix.cpp b/src/lib/arch/unix/ArchInternetUnix.cpp
index fd1e135..76966dc 100644
--- a/src/lib/arch/unix/ArchInternetUnix.cpp
+++ b/src/lib/arch/unix/ArchInternetUnix.cpp
@@ -28,8 +28,8 @@ class CurlFacade {
 public:
     CurlFacade();
     ~CurlFacade();
-    String                get(const String& url);
-    String                urlEncode(const String& url);
+    std::string get(const std::string& url);
+    std::string urlEncode(const std::string& url);
 
 private:
     CURL*                m_curl;
@@ -39,15 +39,13 @@ private:
 // ArchInternetUnix
 //
 
-String
-ArchInternetUnix::get(const String& url)
+std::string ArchInternetUnix::get(const std::string& url)
 {
     CurlFacade curl;
     return curl.get(url);
 }
 
-String
-ArchInternetUnix::urlEncode(const String& url)
+std::string ArchInternetUnix::urlEncode(const std::string& url)
 {
     CurlFacade curl;
     return curl.urlEncode(url);
@@ -87,8 +85,7 @@ CurlFacade::~CurlFacade()
     curl_global_cleanup();
 }
 
-String
-CurlFacade::get(const String& url)
+std::string CurlFacade::get(const std::string& url)
 {
     curl_easy_setopt(m_curl, CURLOPT_URL, url.c_str());
     curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curlWriteCallback);
@@ -110,8 +107,7 @@ CurlFacade::get(const String& url)
     return result;
 }
 
-String
-CurlFacade::urlEncode(const String& url)
+std::string CurlFacade::urlEncode(const std::string& url)
 {
     char* resultCStr = curl_easy_escape(m_curl, url.c_str(), 0);
 
diff --git a/src/lib/arch/unix/ArchInternetUnix.h b/src/lib/arch/unix/ArchInternetUnix.h
index 2413d8f..66de656 100644
--- a/src/lib/arch/unix/ArchInternetUnix.h
+++ b/src/lib/arch/unix/ArchInternetUnix.h
@@ -19,10 +19,10 @@
 
 #define ARCH_INTERNET ArchInternetUnix
 
-#include "base/String.h"
+#include <string>
 
 class ArchInternetUnix {
 public:
-    String                get(const String& url);
-    String                urlEncode(const String& url);
+    std::string get(const std::string& url);
+    std::string urlEncode(const std::string& url);
 };
diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
index c9ddc6c..4866edc 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -36,17 +36,6 @@
 
 #define SIGWAKEUP SIGUSR1
 
-#if !HAVE_PTHREAD_SIGNAL
-    // boy, is this platform broken.  forget about pthread signal
-    // handling and let signals through to every process.  barrier
-    // will not terminate cleanly when it gets SIGTERM or SIGINT.
-#    define pthread_sigmask sigprocmask
-#    define pthread_kill(tid_, sig_) kill(0, (sig_))
-#    define sigwait(set_, sig_)
-#    undef HAVE_POSIX_SIGWAIT
-#    define HAVE_POSIX_SIGWAIT 1
-#endif
-
 static
 void
 setSignalSet(sigset_t* sigset)
@@ -344,9 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
     // can't tell the difference.
     if (!m_newThreadCalled) {
         m_newThreadCalled = true;
-#if HAVE_PTHREAD_SIGNAL
         startSignalHandler();
-#endif
     }
 
     // note that the child thread will wait until we release this mutex
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 2a9259c..496c988 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -690,7 +690,6 @@ ArchNetworkBSD::nameToAddr(const std::string& name)
     // allocate address
     ArchNetAddressImpl* addr = new ArchNetAddressImpl;
 
-    char ipstr[INET6_ADDRSTRLEN];
     struct addrinfo hints;
     struct addrinfo *p;
     int ret;
diff --git a/src/lib/arch/unix/XArchUnix.h b/src/lib/arch/unix/XArchUnix.h
index ae62f4c..93d6d62 100644
--- a/src/lib/arch/unix/XArchUnix.h
+++ b/src/lib/arch/unix/XArchUnix.h
@@ -24,7 +24,7 @@
 class XArchEvalUnix : public XArchEval {
 public:
     XArchEvalUnix(int error) : m_error(error) { }
-    virtual ~XArchEvalUnix() _NOEXCEPT { }
+    virtual ~XArchEvalUnix() noexcept { }
 
     virtual std::string    eval() const;
 
diff --git a/src/lib/arch/win32/ArchInternetWindows.cpp b/src/lib/arch/win32/ArchInternetWindows.cpp
index 7f69c7f..8a28fde 100644
--- a/src/lib/arch/win32/ArchInternetWindows.cpp
+++ b/src/lib/arch/win32/ArchInternetWindows.cpp
@@ -18,6 +18,7 @@
 #include "arch/win32/ArchInternetWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "arch/Arch.h"
+#include "base/String.h"
 #include "common/Version.h"
 
 #include <sstream>
@@ -25,19 +26,19 @@
 #include <Shlwapi.h>
 
 struct WinINetUrl {
-    String                m_scheme;
-    String                m_host;
-    String                m_path;
+    std::string m_scheme;
+    std::string m_host;
+    std::string m_path;
     INTERNET_PORT        m_port;
     DWORD                m_flags;
 };
 
 class WinINetRequest {
 public:
-    WinINetRequest(const String& url);
+    WinINetRequest(const std::string& url);
     ~WinINetRequest();
 
-    String                send();
+    std::string send();
     void                openSession();
     void                connect();
     void                openRequest();
@@ -54,15 +55,13 @@ private:
 // ArchInternetWindows
 //
 
-String
-ArchInternetWindows::get(const String& url)
+std::string ArchInternetWindows::get(const std::string& url)
 {
     WinINetRequest request(url);
     return request.send();
 }
 
-String
-ArchInternetWindows::urlEncode(const String& url)
+std::string ArchInternetWindows::urlEncode(const std::string& url)
 {
     TCHAR buffer[1024];
     DWORD bufferSize = sizeof(buffer);
@@ -71,7 +70,7 @@ ArchInternetWindows::urlEncode(const String& url)
         throw XArch(new XArchEvalWindows());
     }
 
-    String result(buffer);
+    std::string result(buffer);
 
     // the win32 url encoding funcitons are pretty useless (to us) and only
     // escape "unsafe" chars, but not + or =, so we need to replace these
@@ -86,9 +85,9 @@ ArchInternetWindows::urlEncode(const String& url)
 // WinINetRequest
 //
 
-static WinINetUrl parseUrl(const String& url);
+static WinINetUrl parseUrl(const std::string& url);
 
-WinINetRequest::WinINetRequest(const String& url) :
+WinINetRequest::WinINetRequest(const std::string& url) :
     m_session(NULL),
     m_connect(NULL),
     m_request(NULL),
@@ -112,8 +111,7 @@ WinINetRequest::~WinINetRequest()
     }
 }
 
-String
-WinINetRequest::send()
+std::string WinINetRequest::send()
 {
     if (m_used) {
         throw XArch("class is one time use.");
@@ -124,7 +122,7 @@ WinINetRequest::send()
     connect();
     openRequest();
     
-    String headers("Content-Type: text/html");
+    std::string headers("Content-Type: text/html");
     if (!HttpSendRequest(m_request, headers.c_str(), (DWORD)headers.length(), NULL, NULL)) {
         throw XArch(new XArchEvalWindows());
     }
@@ -142,8 +140,7 @@ WinINetRequest::send()
     return result.str();
 }
 
-void
-WinINetRequest::openSession()
+void WinINetRequest::openSession()
 {
     std::stringstream userAgent;
     userAgent << "Barrier ";
@@ -200,8 +197,7 @@ WinINetRequest::openRequest()
 // nb: i tried to use InternetCrackUrl here, but couldn't quite get that to
 // work. here's some (less robust) code to split the url into components.
 // this works fine with simple urls, but doesn't consider the full url spec.
-static WinINetUrl
-parseUrl(const String& url)
+static WinINetUrl parseUrl(const std::string& url)
 {
     WinINetUrl parsed;
 
@@ -215,7 +211,7 @@ parseUrl(const String& url)
     parsed.m_port = INTERNET_DEFAULT_HTTP_PORT;
     parsed.m_flags = 0;
 
-    if (parsed.m_scheme.find("https") != String::npos) {
+    if (parsed.m_scheme.find("https") != std::string::npos) {
         parsed.m_port = INTERNET_DEFAULT_HTTPS_PORT;
         parsed.m_flags = INTERNET_FLAG_SECURE;
     }
diff --git a/src/lib/arch/win32/ArchInternetWindows.h b/src/lib/arch/win32/ArchInternetWindows.h
index bab8d3c..3ef5747 100644
--- a/src/lib/arch/win32/ArchInternetWindows.h
+++ b/src/lib/arch/win32/ArchInternetWindows.h
@@ -19,10 +19,10 @@
 
 #define ARCH_INTERNET ArchInternetWindows
 
-#include "base/String.h"
+#include <string>
 
 class ArchInternetWindows {
 public:
-    String                get(const String& url);
-    String                urlEncode(const String& url);
+    std::string get(const std::string& url);
+    std::string urlEncode(const std::string& url);
 };
diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp
index 924afa2..2c022b1 100644
--- a/src/lib/arch/win32/ArchMiscWindows.cpp
+++ b/src/lib/arch/win32/ArchMiscWindows.cpp
@@ -431,7 +431,7 @@ ArchMiscWindows::wakeupDisplay()
 bool
 ArchMiscWindows::wasLaunchedAsService() 
 {
-    String name;
+    std::string name;
     if (!getParentProcessName(name)) {
         LOG((CLOG_ERR "cannot determine if process was launched as service"));
         return false;
@@ -440,8 +440,7 @@ ArchMiscWindows::wasLaunchedAsService()
     return (name == SERVICE_LAUNCHER);
 }
 
-bool
-ArchMiscWindows::getParentProcessName(String &name) 
+bool ArchMiscWindows::getParentProcessName(std::string &name)
 {    
     PROCESSENTRY32 parentEntry;
     if (!getParentProcessEntry(parentEntry)){
@@ -521,4 +520,4 @@ ArchMiscWindows::setInstanceWin32(HINSTANCE instance)
 {
     assert(instance != NULL);
     s_instanceWin32 = instance;
-}
\ No newline at end of file
+}
diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h
index 0ecd79d..91cd8f5 100644
--- a/src/lib/arch/win32/ArchMiscWindows.h
+++ b/src/lib/arch/win32/ArchMiscWindows.h
@@ -21,7 +21,6 @@
 #include "common/common.h"
 #include "common/stdstring.h"
 #include "common/stdset.h"
-#include "base/String.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -163,7 +162,7 @@ public:
     static bool wasLaunchedAsService();
 
     //! Returns true if we got the parent process name.
-    static bool getParentProcessName(String &name);
+    static bool getParentProcessName(std::string &name);
 
     static HINSTANCE instanceWin32();
 
diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp
index eeec0e1..e116eda 100644
--- a/src/lib/arch/win32/XArchWindows.cpp
+++ b/src/lib/arch/win32/XArchWindows.cpp
@@ -25,7 +25,7 @@
 //
 
 std::string
-XArchEvalWindows::eval() const throw()
+XArchEvalWindows::eval() const noexcept
 {
     char* cmsg;
     if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
@@ -51,7 +51,7 @@ XArchEvalWindows::eval() const throw()
 //
 
 std::string
-XArchEvalWinsock::eval() const throw()
+XArchEvalWinsock::eval() const noexcept
 {
     // built-in windows function for looking up error message strings
     // may not look up network error messages correctly.  we'll have
diff --git a/src/lib/arch/win32/XArchWindows.h b/src/lib/arch/win32/XArchWindows.h
index 10106b1..4fb2a23 100644
--- a/src/lib/arch/win32/XArchWindows.h
+++ b/src/lib/arch/win32/XArchWindows.h
@@ -30,7 +30,7 @@ public:
     XArchEvalWindows(DWORD error) : m_error(error) { }
     virtual ~XArchEvalWindows() { }
 
-    virtual std::string    eval() const;
+    virtual std::string    eval() const noexcept;
 
 private:
     DWORD                m_error;
@@ -42,7 +42,7 @@ public:
     XArchEvalWinsock(int error) : m_error(error) { }
     virtual ~XArchEvalWinsock() { }
 
-    virtual std::string    eval() const;
+    virtual std::string    eval() const noexcept;
 
 private:
     int                    m_error;