/*
Bacula® - The Network Backup Solution
- Copyright (C) 2004-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2004-2011 Free Software Foundation Europe e.V.
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.
+ modify it under the terms of version three of the GNU Affero 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
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
+ You should have received a copy of the GNU Affero 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.
+ 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.
*
* Kern Sibbald, July MMIV
*
- * Version $Id$
*
*/
const char *berrno::bstrerror()
{
+ *m_buf = 0;
#ifdef HAVE_WIN32
- if (berrno_ & b_errno_win32) {
- return (const char *)buf_;
+ if (m_berrno & b_errno_win32) {
+ format_win32_message();
+ return (const char *)m_buf;
}
#else
int stat = 0;
- if (berrno_ & b_errno_exit) {
- stat = (berrno_ & ~b_errno_exit); /* remove bit */
+ 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 */
} else {
/* Maybe an execvp failure */
if (stat >= 200) {
if (stat < 200 + num_execvp_errors) {
- berrno_ = execvp_errors[stat - 200];
+ m_berrno = execvp_errors[stat - 200];
} else {
return _("Unknown error during program execvp");
}
} else {
- Mmsg(buf_, _("Child exited with code %d"), stat);
- return buf_;
+ Mmsg(m_buf, _("Child exited with code %d"), stat);
+ return m_buf;
}
- /* If we drop out here, berrno_ is set to an execvp errno */
+ /* 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 (b_strerror(berrno_, buf_, 1024) < 0) {
+ if (b_strerror(m_berrno, m_buf, 1024) < 0) {
return _("Invalid errno. No error message possible.");
}
- return buf_;
+ return m_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);
- }
+ FormatMessageA(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(&m_buf, (const char *)msg);
+ LocalFree(msg);
#endif
}