kes Add dynamic dll entry point for SHGetFolderPath to Win32 code.

[bacula/bacula] / bacula / src / lib / berrno.c

diff --git a/bacula/src/lib/berrno.c b/bacula/src/lib/berrno.c
index 9354bb8ca93a8a65d824c56d12db11f02a17f241..4f673635bf5aef120bb7a0ac4e227315385b04f6 100644 (file)
--- a/bacula/src/lib/berrno.c
+++ b/bacula/src/lib/berrno.c
@@ -2,7 +2,7 @@
  *  Bacula errno handler
  *
  *    berrno is a simplistic errno handler that works for
- *     Unix, Win32, and Bacula bpipes.
+ *      Unix, Win32, and Bacula bpipes.
  *
  *    See berrno.h for how to use berrno.
  *
@@ -12,24 +12,32 @@
  *
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
- */
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #include "bacula.h"
 
@@ -41,57 +49,64 @@ extern int execvp_errors[];
 
 const char *berrno::strerror()
 {
-   int stat = 0; 
 #ifdef HAVE_WIN32
-   LPVOID msg;
-
-   if (berrno_ && b_errno_win32) {
-      FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-         FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-         NULL,
-         GetLastError(),
-         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-         (LPTSTR)&msg,
-         0,
-         NULL);
-
-      pm_strcpy(&buf_, (const char *)msg);
-      LocalFree(msg);
+   if (berrno_ & b_errno_win32) {
       return (const char *)buf_;
    }
 #else
+   int stat = 0;
+
    if (berrno_ & b_errno_exit) {
       stat = (berrno_ & ~b_errno_exit);       /* remove bit */
       if (stat == 0) {
-         return "Child exited normally.";    /* this really shouldn't happen */
+         return _("Child exited normally.");    /* this really shouldn't happen */
       } else {
-        /* Maybe an execvp failure */
-        if (stat >= 200) {
-           if (stat < 200 + num_execvp_errors) {
-              berrno_ = execvp_errors[stat - 200];
-           } else {
-               return "Unknown error during program execvp";
-           }
-        } else {
-            Mmsg(&buf_, "Child exited with code %d", stat);
-           return buf_;
-        }
-        /* If we drop out here, berrno_ is set to an execvp errno */
+         /* Maybe an execvp failure */
+         if (stat >= 200) {
+            if (stat < 200 + num_execvp_errors) {
+               berrno_ = execvp_errors[stat - 200];
+            } else {
+               return _("Unknown error during program execvp");
+            }
+         } else {
+            Mmsg(buf_, _("Child exited with code %d"), stat);
+            return buf_;
+         }
+         /* If we drop out here, berrno_ is set to an execvp errno */
       }
    }
    if (berrno_ & b_errno_signal) {
-      stat = (berrno_ & ~b_errno_signal);       /* remove bit */
-      Mmsg(&buf_, "Child died from signal %d: %s", stat, get_signal_name(stat));
+      stat = (berrno_ & ~b_errno_signal);        /* remove bit */
+      Mmsg(buf_, _("Child died from signal %d: %s"), stat, get_signal_name(stat));
       return buf_;
    }
 #endif
    /* Normal errno */
    if (bstrerror(berrno_, buf_, 1024) < 0) {
-      return "Invalid errno. No error message possible."; 
+      return _("Invalid errno. No error message possible.");
    }
    return buf_;
 }
 
+void berrno::format_win32_message()
+{
+#ifdef HAVE_WIN32
+   LPVOID msg;
+   if (berrno_ & b_errno_win32) {
+      FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+          FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+          NULL,
+          GetLastError(),
+          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+          (LPTSTR)&msg,
+          0,
+          NULL);
+
+      pm_strcpy(&buf_, (const char *)msg);
+      LocalFree(msg);
+   }
+#endif
+}
 
 #ifdef TEST_PROGRAM