+/*
+ 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$
*/
-/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2002-2006 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 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
- 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.
-*/
#include "bacula.h"
#include <math.h>
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;
}
return buf;
}
-/*
- * Convert a size in bytes to uint64_t
- * Returns false: if error
- true: if OK, and value stored in value
- */
-bool size_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;
double val;
char mod_str[20];
char num_str[50];
- static const char *mod[] = {"*", "k", "kb", "m", "mb", "g", "gb", NULL}; /* first item * not used */
const int64_t mult[] = {1, /* byte */
1024, /* kilobyte */
1000, /* kb kilobyte */
return true;
}
+/*
+ * Convert a size in bytes to uint64_t
+ * Returns false: if error
+ true: if OK, and value stored in value
+ */
+bool size_to_uint64(char *str, int str_len, uint64_t *value)
+{
+ /* first item * not used */
+ static const char *mod[] = {"*", "k", "kb", "m", "mb", "g", "gb", NULL};
+ return strunit_to_uint64(str, str_len, value, mod);
+}
+
+/*
+ * Convert a speed in bytes/s to uint64_t
+ * Returns false: if error
+ true: if OK, and value stored in 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};
+ return strunit_to_uint64(str, str_len, value, mod);
+}
+
/*
* Check if specified string is a number or not.
* Taken from SQLite, cool, thanks.
{
bool digit_seen = false;
+ if (n == NULL) {
+ return false;
+ }
+
if( *n == '-' || *n == '+' ) {
n++;
}
}
/*
- * Check if specified string is a list of number or not
+ * Check if specified string is a list of numbers or not
*/
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;
}
n++;
}
- return digit_seen && *n==0;
+ return digit_seen && *n==0;
}
/*
bool is_an_integer(const char *n)
{
bool digit_seen = false;
+ if (n == NULL) {
+ return false;
+ }
while (B_ISDIGIT(*n)) {
digit_seen = true;
n++;
* Check if the Volume name has legal characters
* If ua is non-NULL send the message
*/
-bool is_name_valid(char *name, POOLMEM **msg)
+bool is_name_valid(const char *name, POOLMEM **msg)
{
int len;
- char *p;
+ const char *p;
/* Special characters to accept */
const char *accept = ":.-_ ";
+ /* No name is invalid */
+ if (!name) {
+ if (msg) {
+ Mmsg(msg, _("Empty name not allowed.\n"));
+ }
+ return false;
+ }
/* Restrict the characters permitted in the Volume name */
for (p=name; *p; p++) {
if (B_ISALPHA(*p) || B_ISDIGIT(*p) || strchr(accept, (int)(*p))) {
}
return false;
}
- len = strlen(name);
+ len = p - name;
if (len >= MAX_NAME_LENGTH) {
if (msg) {
Mmsg(msg, _("Name too long.\n"));
projects / bacula / bacula / blobdiff