Change copyright as per agreement with FSFE

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

diff --git a/bacula/src/lib/berrno.c b/bacula/src/lib/berrno.c
index 23bb6feb476fa2ac3382b20acba87bea856f32be..747337db2c4298b2aff4cd9d7289730b1c27e9af 100644 (file)
--- a/bacula/src/lib/berrno.c
+++ b/bacula/src/lib/berrno.c
@@ -1,35 +1,33 @@
+/*
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2016 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
+*/
 /*
  *  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.
  *
  *   Kern Sibbald, July MMIV
  *
- *   Version $Id$
  *
  */
-/*
-   Copyright (C) 2004 Kern Sibbald and John Walker
-
-   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.
-
-   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.
-
- */
 
 #include "bacula.h"
 
@@ -39,59 +37,65 @@ extern int num_execvp_errors;
 extern int execvp_errors[];
 #endif
 
-const char *berrno::strerror()
+const char *berrno::bstrerror()
 {
-   int stat = 0;
+   *m_buf = 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);
-      return (const char *)buf_;
+   if (m_berrno & (b_errno_win32 | b_errno_WSA)) {
+      format_win32_message();
+      return (const char *)m_buf;
    }
 #else
-   if (berrno_ & b_errno_exit) {
-      stat = (berrno_ & ~b_errno_exit);       /* remove bit */
+   int stat = 0;
+
+   if (m_berrno & b_errno_exit) {
+      stat = (m_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) {
+               m_berrno = execvp_errors[stat - 200];
+            } else {
+               return _("Unknown error during program execvp");
+            }
+         } else {
+            Mmsg(m_buf, _("Child exited with code %d"), stat);
+            return m_buf;
+         }
+         /* If we drop out here, m_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));
-      return buf_;
+   if (m_berrno & b_errno_signal) {
+      stat = (m_berrno & ~b_errno_signal);        /* remove bit */
+      Mmsg(m_buf, _("Child died from signal %d: %s"), stat, get_signal_name(stat));
+      return m_buf;
    }
 #endif
    /* Normal errno */
-   if (bstrerror(berrno_, buf_, 1024) < 0) {
-      return "Invalid errno. No error message possible.";
+   if (b_strerror(m_berrno, m_buf, sizeof_pool_memory(m_buf)) < 0) {
+      return _("Invalid errno. No error message possible.");
    }
-   return buf_;
+   return m_buf;
 }
 
+void berrno::format_win32_message()
+{
+#ifdef HAVE_WIN32
+   LPVOID msg;
+   FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+       FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+       NULL,
+       m_berrno & b_errno_WSA ? WSAGetLastError() : GetLastError(),
+       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+       (LPTSTR)&msg,
+       0,
+       NULL);
+   pm_strcpy(&m_buf, (const char *)msg);
+   LocalFree(msg);
+#endif
+}
 
 #ifdef TEST_PROGRAM