kes Apply Marco van Wieringen's set of patches, cleans up Migration/Copy

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

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index 110bfec8a6e3467e0a1c4b8213f5456304dfe65a..52927627d07a7423bc08677dfe0cca86ce095f3a 100644 (file)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -20,7 +20,7 @@
    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.
@@ -69,15 +69,6 @@
 #define MAX_PATH  1024
 #endif
 
-/* Each daemon has a slightly different set of
- * resources, so it will define the following
- * global values.
- */
-extern int r_first;
-extern int r_last;
-extern RES_TABLE resources[];
-extern RES **res_head;
-
 /*
  * Define the Union of all the common resource structure definitions.
  */
@@ -93,7 +84,6 @@ extern "C" URES res_all;
 #else
 extern  URES res_all;
 #endif
-extern int res_all_size;
 
 extern brwlock_t res_lock;            /* resource lock */
 
@@ -196,12 +186,12 @@ const char *res_to_str(int rcode)
  * Initialize the static structure to zeros, then
  *  apply all the default values.
  */
-static void init_resource(PARSER *parser, int type, RES_ITEM *items, int pass)
+static void init_resource(CONFIG *config, int type, RES_ITEM *items, int pass)
 {
    int i;
    int rindex = type - r_first;
 
-   memset(parser->m_res_all, 0, parser->m_res_all_size);
+   memset(config->m_res_all, 0, config->m_res_all_size);
    res_all.hdr.rcode = type;
    res_all.hdr.refcnt = 1;
 
@@ -212,12 +202,12 @@ static void init_resource(PARSER *parser, int type, RES_ITEM *items, int pass)
             items[i].default_value);
       if (items[i].flags & ITEM_DEFAULT && items[i].default_value != 0) {
          if (items[i].handler == store_bit) {
-            *(int *)(items[i].value) |= items[i].code;
+            *(uint32_t *)(items[i].value) |= items[i].code;
          } else if (items[i].handler == store_bool) {
             *(bool *)(items[i].value) = items[i].default_value != 0;
-         } else if (items[i].handler == store_pint ||
-                    items[i].handler == store_int) {
-            *(int *)(items[i].value) = items[i].default_value;
+         } else if (items[i].handler == store_pint32 ||
+                    items[i].handler == store_int32) {
+            *(uint32_t *)(items[i].value) = items[i].default_value;
          } else if (items[i].handler == store_int64) {
             *(int64_t *)(items[i].value) = items[i].default_value;
          } else if (items[i].handler == store_size) {
@@ -600,19 +590,19 @@ void store_defs(LEX *lc, RES_ITEM *item, int index, int pass)
 
 
 /* Store an integer at specified address */
-void store_int(LEX *lc, RES_ITEM *item, int index, int pass)
+void store_int32(LEX *lc, RES_ITEM *item, int index, int pass)
 {
    lex_get_token(lc, T_INT32);
-   *(int *)(item->value) = lc->int32_val;
+   *(uint32_t *)(item->value) = lc->int32_val;
    scan_to_eol(lc);
    set_bit(index, res_all.hdr.item_present);
 }
 
 /* Store a positive integer at specified address */
-void store_pint(LEX *lc, RES_ITEM *item, int index, int pass)
+void store_pint32(LEX *lc, RES_ITEM *item, int index, int pass)
 {
    lex_get_token(lc, T_PINT32);
-   *(int *)(item->value) = lc->pint32_val;
+   *(uint32_t *)(item->value) = lc->pint32_val;
    scan_to_eol(lc);
    set_bit(index, res_all.hdr.item_present);
 }
@@ -716,9 +706,9 @@ void store_bit(LEX *lc, RES_ITEM *item, int index, int pass)
 {
    lex_get_token(lc, T_NAME);
    if (strcasecmp(lc->str, "yes") == 0 || strcasecmp(lc->str, "true") == 0) {
-      *(int *)(item->value) |= item->code;
+      *(uint32_t *)(item->value) |= item->code;
    } else if (strcasecmp(lc->str, "no") == 0 || strcasecmp(lc->str, "false") == 0) {
-      *(int *)(item->value) &= ~(item->code);
+      *(uint32_t *)(item->value) &= ~(item->code);
    } else {
       scan_err2(lc, _("Expect %s, got: %s"), "YES, NO, TRUE, or FALSE", lc->str); /* YES and NO must not be translated */
    }
@@ -754,7 +744,7 @@ void store_label(LEX *lc, RES_ITEM *item, int index, int pass)
    /* Store the label pass 2 so that type is defined */
    for (i=0; tapelabels[i].name; i++) {
       if (strcasecmp(lc->str, tapelabels[i].name) == 0) {
-         *(int *)(item->value) = tapelabels[i].token;
+         *(uint32_t *)(item->value) = tapelabels[i].token;
          i = 0;
          break;
       }
@@ -773,15 +763,15 @@ enum parse_state {
    p_resource
 };
 
-PARSER *new_parser()
+CONFIG *new_config_parser()
 {
-   PARSER *parser;
-   parser = (PARSER *)malloc(sizeof(PARSER));
-   memset(parser, 0, sizeof(PARSER));
-   return parser;
+   CONFIG *config;
+   config = (CONFIG *)malloc(sizeof(CONFIG));
+   memset(config, 0, sizeof(CONFIG));
+   return config;
 }
 
-void PARSER::init(
+void CONFIG::init(
    const char *cf,
    LEX_ERROR_HANDLER *scan_error,
    int err_type,
@@ -811,20 +801,22 @@ void PARSER::init(
  *  Note, the default behavior unless you have set an alternate
  *  scan_error handler is to die on an error.
  */
+#ifdef xxx
 int
 parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error, int err_type)
 {
    int ok;
-   PARSER *parser = new_parser();
-   parser->init(cf, scan_error, err_type, (void *)&res_all, res_all_size,    
+   CONFIG *config = new_config_parser();
+   config->init(cf, scan_error, err_type, (void *)&res_all, res_all_size,    
                 r_first, r_last, resources, res_head);
-   ok = parser->parse_config();
-   free(parser);
+   ok = config->parse_config();
+   free(config);
    return ok;
 }
+#endif
       
    
-bool PARSER::parse_config()
+bool CONFIG::parse_config()
 {
    LEX *lc = NULL;
    int token, i, pass;
@@ -979,8 +971,8 @@ bool PARSER::parse_config()
       }
       if (debug_level >= 900 && pass == 2) {
          int i;
-         for (i=r_first; i<=r_last; i++) {
-            dump_resource(i, res_head[i-r_first], prtmsg, NULL);
+         for (i=m_r_first; i<=m_r_last; i++) {
+            dump_resource(i, m_res_head[i-m_r_first], prtmsg, NULL);
          }
       }
       lc = lex_close_file(lc);
@@ -1052,6 +1044,35 @@ find_config_file(const char *config_file, char *full_path, int max_path)
  *      Free configuration resources
  *
  */
+void CONFIG::free_resources()
+{
+   for (int i=m_r_first; i<=m_r_last; i++) {
+      free_resource(m_res_head[i-m_r_first], i);
+      m_res_head[i-m_r_first] = NULL;
+   }
+}
+
+RES **CONFIG::save_resources()
+{
+   int num = m_r_last - m_r_first + 1;
+   RES **res = (RES **)malloc(num*sizeof(RES *));
+   for (int i=0; i<num; i++) {
+      res[i] = m_res_head[i];
+      m_res_head[i] = NULL;
+   }
+   return res;
+}
+
+RES **CONFIG::new_res_head()
+{
+   int size = (m_r_last - m_r_first + 1) * sizeof(RES *);
+   RES **res = (RES **)malloc(size);
+   memset(res, 0, size);
+   return res;
+}
+
+
+#ifdef xxx
 void free_config_resources()
 {
    for (int i=r_first; i<=r_last; i++) {
@@ -1078,3 +1099,4 @@ RES **new_res_head()
    memset(res, 0, size);
    return res;
 }
+#endif