Fix bat crash due to alignment diff in bat and core code

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

diff --git a/bacula/src/lib/berrno.h b/bacula/src/lib/berrno.h
index e6b6923872de2fed476e176fcf9dc90f49f74a18..eb4253de7c1ab20de1a1bc0ad00c5a501dad33aa 100644 (file)
--- a/bacula/src/lib/berrno.h
+++ b/bacula/src/lib/berrno.h
@@ -1,31 +1,44 @@
 /*
- *   Version $Id$
- */
+   Bacula® - The Network Backup Solution
 
-/*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Copyright (C) 2004-2009 Free Software Foundation Europe e.V.
 
-   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.
+   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 and included
+   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
+   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.
-
-   Kern Sibbald, July MMIV
+   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 Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ *   Version $Id$
+ *
+ * Kern Sibbald, July MMIV
+ *
  */
 
+/*
+ * Extra bits set to interpret errno value differently from errno
+ */
 #ifdef HAVE_WIN32
 #define b_errno_win32  (1<<29)        /* user reserved bit */
+#else
+#define b_errno_win32  0              /* On Unix/Linix system */
 #endif
 #define b_errno_exit   (1<<28)        /* child exited, exit code returned */
 #define b_errno_signal (1<<27)        /* child died, signal code returned */
@@ -38,42 +51,47 @@
  *  for editing the message. strerror() does the actual editing, and
  *  it is thread safe.
  *
- * If bit 29 in berrno_ is set then it is a Win32 error, and we
- *  must to a GetLastError() to get the error code for formatting.
- * If bit 29 in berrno_ is not set, then it is a Unix errno.
+ * If bit 29 in m_berrno is set then it is a Win32 error, and we
+ *  must do a GetLastError() to get the error code for formatting.
+ * If bit 29 in m_berrno is not set, then it is a Unix errno.
  *
  */
 class berrno : public SMARTALLOC {
-   POOLMEM *buf_;
-   int berrno_;
+   POOLMEM *m_buf;
+   int m_berrno;
+   void format_win32_message();
 public:
    berrno(int pool=PM_EMSG);
    ~berrno();
-   const char *strerror();
-   const char *strerror(int errnum);
+   const char *bstrerror();
+   const char *bstrerror(int errnum);
    void set_errno(int errnum);
+   int code() { return m_berrno & ~(b_errno_exit|b_errno_signal); }
+   int code(int stat) { return stat & ~(b_errno_exit|b_errno_signal); }
 };
 
 /* Constructor */
 inline berrno::berrno(int pool)
 {
-   berrno_ = errno;
-   buf_ = get_pool_memory(pool);
+   m_berrno = errno;
+   m_buf = get_pool_memory(pool);
+   *m_buf = 0;
+   errno = m_berrno;
 }
 
 inline berrno::~berrno()
 {
-   free_pool_memory(buf_);
+   free_pool_memory(m_buf);
 }
 
-inline const char *berrno::strerror(int errnum)
+inline const char *berrno::bstrerror(int errnum)
 {
-   berrno_ = errnum;
-   return berrno::strerror();
+   m_berrno = errnum;
+   return berrno::bstrerror();
 }
 
 
 inline void berrno::set_errno(int errnum)
 {
-   berrno_ = errnum;
+   m_berrno = errnum;
 }