p++;
}
while (B_ISDIGIT(*p)) {
- value = value * 10 + *p - '0';
+ value = B_TIMES10(value) + *p - '0';
p++;
}
return value;
*/
char mbuf[50];
mbuf[sizeof(mbuf)-1] = 0;
- int i = sizeof(mbuf)-2; /* edit backward */
+ int i = sizeof(mbuf)-2; /* edit backward */
if (val == 0) {
mbuf[i--] = '0';
} else {
while (val != 0) {
mbuf[i--] = "0123456789"[val%10];
- val /= 10;
+ val /= 10;
}
}
- strcpy(buf, &mbuf[i+1]);
+ bstrncpy(buf, &mbuf[i+1], 27);
return add_commas(buf, buf);
}
*/
char mbuf[50];
mbuf[sizeof(mbuf)-1] = 0;
- int i = sizeof(mbuf)-2; /* edit backward */
+ int i = sizeof(mbuf)-2; /* edit backward */
if (val == 0) {
mbuf[i--] = '0';
} else {
while (val != 0) {
mbuf[i--] = "0123456789"[val%10];
- val /= 10;
+ val /= 10;
}
}
- strcpy(buf, &mbuf[i+1]);
+ bstrncpy(buf, &mbuf[i+1], 27);
return buf;
}
char mbuf[50];
bool negative = false;
mbuf[sizeof(mbuf)-1] = 0;
- int i = sizeof(mbuf)-2; /* edit backward */
+ int i = sizeof(mbuf)-2; /* edit backward */
if (val == 0) {
mbuf[i--] = '0';
} else {
if (val < 0) {
- negative = true;
- val = -val;
+ negative = true;
+ val = -val;
}
while (val != 0) {
mbuf[i--] = "0123456789"[val%10];
- val /= 10;
+ val /= 10;
}
}
if (negative) {
mbuf[i--] = '-';
}
- strcpy(buf, &mbuf[i+1]);
+ bstrncpy(buf, &mbuf[i+1], 27);
return buf;
}
/*
- * Given a string "str", separate the integer part into
+ * Given a string "str", separate the numeric part into
* str, and the modifier into mod.
*/
static bool get_modifier(char *str, char *num, int num_len, char *mod, int mod_len)
{
int i, len, num_begin, num_end, mod_begin, mod_end;
- /*
- * Look for modifier by walking back looking for the first
- * space or digit.
- */
strip_trailing_junk(str);
len = strlen(str);
for (i=0; i<len; i++) {
if (!B_ISSPACE(str[i])) {
- break;
+ break;
}
}
num_begin = i;
/* Walk through integer part */
for ( ; i<len; i++) {
- if (!B_ISDIGIT(str[i])) {
- break;
+ if (!B_ISDIGIT(str[i]) && str[i] != '.') {
+ break;
}
}
num_end = i;
if (num_len == 0) {
return false;
}
+ /* Eat any spaces in front of modifier */
for ( ; i<len; i++) {
if (!B_ISSPACE(str[i])) {
- break;
+ break;
}
}
mod_begin = i;
for ( ; i<len; i++) {
if (!B_ISALPHA(str[i])) {
- break;
+ break;
}
}
mod_end = i;
return false;
}
bstrncpy(str, &str[mod_end], len);
+ Dmsg2(900, "num=%s mod=%s\n", num, mod);
return true;
}
/*
* Convert a string duration to utime_t (64 bit seconds)
* Returns 0: if error
- 1: if OK, and value stored in value
+ 1: if OK, and value stored in value
*/
int duration_to_utime(char *str, utime_t *value)
{
/*
* The "n" = mins and months appears before minutes so that m maps
* to months. These "kludges" make it compatible with pre 1.31
- * Baculas.
+ * Baculas.
*/
static const char *mod[] = {"n", "seconds", "months", "minutes",
"hours", "days", "weeks", "quarters", "years", NULL};
- static const int32_t mult[] = {60, 1, 60*60*24*30, 60,
- 60*60, 60*60*24, 60*60*24*7, 60*60*24*91, 60*60*24*365};
+ static const int32_t mult[] = {60, 1, 60*60*24*30, 60,
+ 60*60, 60*60*24, 60*60*24*7, 60*60*24*91, 60*60*24*365};
while (*str) {
if (!get_modifier(str, num_str, sizeof(num_str), mod_str, sizeof(mod_str))) {
- return 0;
+ return 0;
}
/* Now find the multiplier corresponding to the modifier */
mod_len = strlen(mod_str);
if (mod_len == 0) {
- i = 1; /* assume seconds */
+ i = 1; /* assume seconds */
} else {
- for (i=0; mod[i]; i++) {
- if (strncasecmp(mod_str, mod[i], mod_len) == 0) {
- break;
- }
- }
- if (mod[i] == NULL) {
- i = 1; /* no modifier, assume secs */
- }
+ for (i=0; mod[i]; i++) {
+ if (strncasecmp(mod_str, mod[i], mod_len) == 0) {
+ break;
+ }
+ }
+ if (mod[i] == NULL) {
+ i = 1; /* no modifier, assume secs */
+ }
}
Dmsg2(900, "str=%s: mult=%d\n", num_str, mult[i]);
errno = 0;
val = strtod(num_str, NULL);
if (errno != 0 || val < 0) {
- return 0;
+ return 0;
}
total += val * mult[i];
}
for (i=0; i<5; i++) {
times = (uint32_t)(val / mult[i]);
if (times > 0) {
- val = val - (utime_t)times * mult[i];
+ val = val - (utime_t)times * mult[i];
bsnprintf(mybuf, sizeof(mybuf), "%d %s%s ", times, mod[i], times>1?"s":"");
- bstrncat(buf, mybuf, buf_len);
+ bstrncat(buf, mybuf, buf_len);
}
}
if (val == 0 && strlen(buf) == 0) {
/*
* Convert a size in bytes to uint64_t
* Returns 0: if error
- 1: if OK, and value stored in value
+ 1: if OK, and value stored in value
*/
int size_to_uint64(char *str, int str_len, uint64_t *value)
{
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 */
- 1048576, /* megabyte */
- 1000000, /* mb megabyte */
- 1073741824, /* gigabyte */
- 1000000000}; /* gb gigabyte */
+ const int64_t mult[] = {1, /* byte */
+ 1024, /* kilobyte */
+ 1000, /* kb kilobyte */
+ 1048576, /* megabyte */
+ 1000000, /* mb megabyte */
+ 1073741824, /* gigabyte */
+ 1000000000}; /* gb gigabyte */
if (!get_modifier(str, num_str, sizeof(num_str), mod_str, sizeof(mod_str))) {
return 0;
mod_len = strlen(mod_str);
for (i=0; mod[i]; i++) {
if (strncasecmp(mod_str, mod[i], mod_len) == 0) {
- break;
+ break;
}
}
if (mod[i] == NULL) {
- i = 0; /* no modifier found, assume 1 */
+ i = 0; /* no modifier found, assume 1 */
}
Dmsg2(900, "str=%s: mult=%d\n", str, mult[i]);
errno = 0;
}
if (digit_seen && (*n == 'e' || *n == 'E')
&& (B_ISDIGIT(n[1]) || ((n[1]=='-' || n[1] == '+') && B_ISDIGIT(n[2])))) {
- n += 2; /* skip e- or e+ or e digit */
+ n += 2; /* skip e- or e+ or e digit */
while (B_ISDIGIT(*n)) { n++; }
}
return digit_seen && *n==0;
/* Restrict the characters permitted in the Volume name */
for (p=name; *p; p++) {
if (B_ISALPHA(*p) || B_ISDIGIT(*p) || strchr(accept, (int)(*p))) {
- continue;
+ continue;
}
if (msg) {
Mmsg(msg, _("Illegal character \"%c\" in name.\n"), *p);
*q-- = *p--;
for ( ; nc; nc--) {
for (i=0; i < 3; i++) {
- *q-- = *p--;
+ *q-- = *p--;
}
*q-- = ',';
}
strcpy(buf, str[i]);
if (!duration_to_utime(buf, &val)) {
printf("Error return from duration_to_utime for in=%s\n", str[i]);
- continue;
+ continue;
}
edit_utime(val, outval);
printf("in=%s val=%" lld " outval=%s\n", str[i], val, outval);
projects / bacula / bacula / blobdiff