Merge branch 'master' into mvw/1361

[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 f85798d8fcc9f432c7752d74395372fe7d57e239..b39eedf6bf0b12ebd284ac6dbea72d5c2a83ca3c 100644 (file)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 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.
@@ -206,11 +206,12 @@ static void init_resource(CONFIG *config, int type, RES_ITEM *items, int pass)
          } else if (items[i].handler == store_bool) {
             *(bool *)(items[i].value) = items[i].default_value != 0;
          } else if (items[i].handler == store_pint32 ||
-                    items[i].handler == store_int32) {
+                    items[i].handler == store_int32 ||
+                    items[i].handler == store_size32) {
             *(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) {
+         } else if (items[i].handler == store_size64) {
             *(uint64_t *)(items[i].value) = (uint64_t)items[i].default_value;
          } else if (items[i].handler == store_time) {
             *(utime_t *)(items[i].value) = (utime_t)items[i].default_value;
@@ -627,7 +628,7 @@ void store_int64(LEX *lc, RES_ITEM *item, int index, int pass)
 }
 
 /* Store a size in bytes */
-void store_size(LEX *lc, RES_ITEM *item, int index, int pass)
+static void store_size(LEX *lc, RES_ITEM *item, int index, int pass, bool size32)
 {
    int token;
    uint64_t uvalue;
@@ -656,7 +657,11 @@ void store_size(LEX *lc, RES_ITEM *item, int index, int pass)
          scan_err1(lc, _("expected a size number, got: %s"), lc->str);
          return;
       }
-      *(uint64_t *)(item->value) = uvalue;
+      if (size32) {
+         *(uint32_t *)(item->value) = (uint32_t)uvalue;
+      } else {
+         *(uint64_t *)(item->value) = uvalue;
+      }
       break;
    default:
       scan_err1(lc, _("expected a size, got: %s"), lc->str);
@@ -669,6 +674,18 @@ void store_size(LEX *lc, RES_ITEM *item, int index, int pass)
    Dmsg0(900, "Leave store_size\n");
 }
 
+/* Store a size in bytes */
+void store_size32(LEX *lc, RES_ITEM *item, int index, int pass)
+{
+   store_size(lc, item, index, pass, true /* 32 bit */);
+}
+
+/* Store a size in bytes */
+void store_size64(LEX *lc, RES_ITEM *item, int index, int pass)
+{
+   store_size(lc, item, index, pass, false /* not 32 bit */);
+}
+
 
 /* Store a time period in seconds */
 void store_time(LEX *lc, RES_ITEM *item, int index, int pass)
@@ -788,11 +805,11 @@ CONFIG *new_config_parser()
 void CONFIG::init(
    const char *cf,
    LEX_ERROR_HANDLER *scan_error,
-   int err_type,
+   int32_t err_type,
    void *vres_all,
-   int res_all_size,
-   int r_first,
-   int r_last,
+   int32_t res_all_size,
+   int32_t r_first,
+   int32_t r_last,
    RES_TABLE *resources,
    RES **res_head)
 {
@@ -846,16 +863,17 @@ bool CONFIG::parse_config()
 
    if (first && (errstat=rwl_init(&res_lock)) != 0) {
       berrno be;
-      Emsg1(M_ABORT, 0, _("Unable to initialize resource lock. ERR=%s\n"),
+      Jmsg1(NULL, M_ABORT, 0, _("Unable to initialize resource lock. ERR=%s\n"),
             be.bstrerror(errstat));
    }
    first = false;
 
    char *full_path = (char *)alloca(MAX_PATH + 1);
 
-   if (find_config_file(cf, full_path, MAX_PATH +1)) {
-      cf = full_path;
+   if (!find_config_file(cf, full_path, MAX_PATH +1)) {
+      Jmsg0(NULL, M_ABORT, 0, _("Config filename too long.\n"));
    }
+   cf = full_path;
 
    /* Make two passes. The first builds the name symbol table,
     * and the second picks up the items.
@@ -1022,24 +1040,29 @@ const char *get_default_configdir()
 #endif
 }
 
+/*
+ * Returns false on error
+ *         true  on OK, with full_path set to where config file should be 
+ */
 static bool
 find_config_file(const char *config_file, char *full_path, int max_path)
 {
-   if (first_path_separator(config_file) != NULL) {
-      return false;
-   }
+   int file_length = strlen(config_file) + 1;
 
-   struct stat st;
-
-   if (stat(config_file, &st) == 0) {
-      return false;
+   /* If a full path specified, use it */
+   if (first_path_separator(config_file) != NULL) {
+      if (file_length > max_path) {
+         return false;
+      }
+      bstrncpy(full_path, config_file, file_length);
+      return true;
    }
 
+   /* config_file is default file name, now find default dir */
    const char *config_dir = get_default_configdir();
    int dir_length = strlen(config_dir);
-   int file_length = strlen(config_file);
 
-   if ((dir_length + 1 + file_length + 1) > max_path) {
+   if ((dir_length + 1 + file_length) > max_path) {
       return false;
    }
 
@@ -1049,7 +1072,7 @@ find_config_file(const char *config_file, char *full_path, int max_path)
       full_path[dir_length++] = '/';
    }
 
-   memcpy(&full_path[dir_length], config_file, file_length + 1);
+   memcpy(&full_path[dir_length], config_file, file_length);
 
    return true;
 }