+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2007 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.
+
+ 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., 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.
+*/
/*
*
* Configuration parser for Director Run Configuration
*
* Version $Id$
*/
-/*
- Copyright (C) 2000-2005 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- 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
- the file LICENSE for additional details.
-
- */
#include "bacula.h"
#include "dird.h"
+#if defined(_MSC_VER)
+extern "C" { // work around visual compiler mangling variables
+ extern URES res_all;
+}
+#else
extern URES res_all;
+#endif
extern struct s_jl joblevels[];
/* Forward referenced subroutines */
};
struct s_keyw {
- const char *name; /* keyword */
+ const char *name; /* keyword */
enum e_state state; /* parser state */
int code; /* state value */
};
switch (RunFields[i].token) {
case 's': /* Data spooling */
token = lex_get_token(lc, T_NAME);
- if (strcasecmp(lc->str, "yes") == 0) {
+ if (strcasecmp(lc->str, "yes") == 0 || strcasecmp(lc->str, "true") == 0) {
lrun.spool_data = true;
lrun.spool_data_set = true;
- } else if (strcasecmp(lc->str, "no") == 0) {
+ } else if (strcasecmp(lc->str, "no") == 0 || strcasecmp(lc->str, "false") == 0) {
lrun.spool_data = false;
lrun.spool_data_set = true;
} else {
break;
case 'W': /* Write part after job */
token = lex_get_token(lc, T_NAME);
- if (strcasecmp(lc->str, "yes") == 0) {
+ if (strcasecmp(lc->str, "yes") == 0 || strcasecmp(lc->str, "true") == 0) {
lrun.write_part_after_job = true;
lrun.write_part_after_job_set = true;
- } else if (strcasecmp(lc->str, "no") == 0) {
+ } else if (strcasecmp(lc->str, "no") == 0 || strcasecmp(lc->str, "false") == 0) {
lrun.write_part_after_job = false;
lrun.write_part_after_job_set = true;
} else {
set_defaults();
for ( ; token != T_EOL; (token = lex_get_token(lc, T_ALL))) {
- int len, pm = 0;
+ int len;
+ bool pm = false;
switch (token) {
case T_NUMBER:
state = s_mday;
code = atoi(lc->str+1);
if (code < 0 || code > 53) {
scan_err0(lc, _("Week number out of range (0-53)"));
+ /* NOT REACHED */
}
state = s_woy; /* week of year */
break;
len = strlen(p);
if (len > 2 && p[len-1] == 'm') {
if (p[len-2] == 'a') {
- pm = 0;
+ pm = false;
} else if (p[len-2] == 'p') {
- pm = 1;
+ pm = true;
} else {
scan_err0(lc, _("Bad time specification."));
/* NOT REACHED */
}
} else {
- pm = 0;
+ pm = false;
}
code2 = atoi(p); /* pick up minutes */
+ /*
+ * Note, according to NIST, 12am and 12pm are ambiguous and
+ * can be defined to anything. However, 12:01am is the same
+ * as 00:01 and 12:01pm is the same as 12:01, so we define
+ * 12am as 00:00 and 12pm as 12:00.
+ */
if (pm) {
/* Convert to 24 hour time */
- if (code == 12) {
- code -= 12;
- } else {
+ if (code != 12) {
code += 12;
}
+ /* am */
+ } else if (code == 12) {
+ code -= 12;
}
if (code < 0 || code > 23 || code2 < 0 || code2 > 59) {
scan_err0(lc, _("Bad time specification."));