Change copyright as per agreement with FSFE

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

diff --git a/bacula/src/lib/edit.c b/bacula/src/lib/edit.c
index 4192ece51ef0650cc2da371c4f77772bfdc1ea26..f419ab47f8950065b17822dfcfeec8e467a6e673 100644 (file)
--- a/bacula/src/lib/edit.c
+++ b/bacula/src/lib/edit.c
@@ -1,36 +1,26 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2002-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.
-   This program is Free Software; you can redistribute it and/or
-   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 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 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.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2016 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *   edit.c  edit string to ascii, and ascii to internal
  *
  *    Kern Sibbald, December MMII
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
@@ -51,9 +41,23 @@ uint64_t str_to_uint64(char *str)
    if (*p == '+') {
       p++;
    }
-   while (B_ISDIGIT(*p)) {
-      value = B_TIMES10(value) + *p - '0';
-      p++;
+   if (*p == '0' && *(p+1) == 'x') {
+      p = p + 2; /* skip 0x */
+
+      while (B_ISXDIGIT(*p)) {
+         if (B_ISDIGIT(*p)) {
+            value = (value<<4) + (*p - '0');
+
+         } else {
+            value = (value<<4) + (tolower(*p) - 'a' + 10);
+         }
+         p++;
+      }
+   } else {
+      while (B_ISDIGIT(*p)) {
+         value = B_TIMES10(value) + *p - '0';
+         p++;
+      }
    }
    return value;
 }
@@ -332,7 +336,7 @@ char *edit_utime(utime_t val, char *buf, int buf_len)
    return buf;
 }
 
-static bool strunit_to_uint64(char *str, int str_len, uint64_t *value, 
+static bool strunit_to_uint64(char *str, int str_len, uint64_t *value,
                               const char **mod)
 {
    int i, mod_len;
@@ -394,7 +398,7 @@ bool size_to_uint64(char *str, int str_len, uint64_t *value)
 bool speed_to_uint64(char *str, int str_len, uint64_t *value)
 {
    /* first item * not used */
-   static const char *mod[]  = {"*", "k/s", "kb/s", "m/s", "mb/s",  NULL}; 
+   static const char *mod[]  = {"*", "k/s", "kb/s", "m/s", "mb/s",  NULL};
    return strunit_to_uint64(str, str_len, value, mod);
 }
 
@@ -406,6 +410,10 @@ bool is_a_number(const char *n)
 {
    bool digit_seen = false;
 
+   if (n == NULL) {
+      return false;
+   }
+
    if( *n == '-' || *n == '+' ) {
       n++;
    }
@@ -430,8 +438,11 @@ bool is_a_number(const char *n)
  */
 bool is_a_number_list(const char *n)
 {
-   bool previous_digit = false; 
+   bool previous_digit = false;
    bool digit_seen = false;
+   if (n == NULL) {
+      return false;
+   }
    while (*n) {
       if (B_ISDIGIT(*n)) {
          previous_digit=true;
@@ -443,7 +454,7 @@ bool is_a_number_list(const char *n)
       }
       n++;
    }
-   return digit_seen && *n==0; 
+   return digit_seen && *n==0;
 }
 
 /*
@@ -452,6 +463,9 @@ bool is_a_number_list(const char *n)
 bool is_an_integer(const char *n)
 {
    bool digit_seen = false;
+   if (n == NULL) {
+      return false;
+   }
    while (B_ISDIGIT(*n)) {
       digit_seen = true;
       n++;