*
* Version $Id$
*/
-
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2002-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
return add_commas(buf, buf);
}
+/*
+ * Edit an integer into "human-readable" format with four or fewer
+ * significant digits followed by a suffix that indicates the scale
+ * factor. The buf array inherits a 27 byte minimim length
+ * requirement from edit_unit64_with_commas(), although the output
+ * string is limited to eight characters.
+ */
+char *edit_uint64_with_suffix(uint64_t val, char *buf)
+{
+ int commas = 0;
+ char *c, mbuf[50];
+ char *suffix[] =
+ { "", "K", "M", "G", "T", "P", "E", "Z", "Y", "FIX ME" };
+ int suffixes = sizeof(suffix) / sizeof(*suffix);
+
+ edit_uint64_with_commas(val, mbuf);
+
+ if ((c = strchr(mbuf, ',')) != NULL) {
+ commas++;
+ *c++ = '.';
+ while ((c = strchr(c, ',')) != NULL) {
+ commas++;
+ *c++ = '\0';
+ }
+ mbuf[5] = '\0'; // drop this to get '123.456 TB' rather than '123.4 TB'
+ }
+
+ if (commas >= suffixes)
+ commas = suffixes - 1;
+ bsnprintf(buf, 27, "%s %s", mbuf, suffix[commas]);
+ return buf;
+}
+
/*
* Edit an integer number, the supplied buffer
* must be at least 27 bytes long. The incoming number
/*
* Convert a string duration to utime_t (64 bit seconds)
- * Returns 0: if error
- 1: if OK, and value stored in value
+ * Returns false: if error
+ true: if OK, and value stored in value
*/
-int duration_to_utime(char *str, utime_t *value)
+bool duration_to_utime(char *str, utime_t *value)
{
int i, mod_len;
double val, total = 0.0;
* to months. These "kludges" make it compatible with pre 1.31
* Baculas.
*/
- static const char *mod[] = {"n", "seconds", "months", "minutes",
+ static const char *mod[] = {"n", "seconds", "months", "minutes", "mins",
"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,
+ 3600, 3600*24, 3600*24*7, 3600*24*91, 3600*24*365};
while (*str) {
if (!get_modifier(str, num_str, sizeof(num_str), mod_str, sizeof(mod_str))) {
- return 0;
+ return false;
}
/* Now find the multiplier corresponding to the modifier */
mod_len = strlen(mod_str);
if (mod_len == 0) {
- i = 1; /* assume seconds */
+ i = 1; /* default to seconds */
} else {
for (i=0; mod[i]; i++) {
if (strncasecmp(mod_str, mod[i], mod_len) == 0) {
}
}
if (mod[i] == NULL) {
- i = 1; /* no modifier, assume secs */
+ return false;
}
}
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 false;
}
total += val * mult[i];
}
*value = (utime_t)total;
- return 1;
+ return true;
}
/*
/*
* Convert a size in bytes to uint64_t
- * Returns 0: if error
- 1: if OK, and value stored in value
+ * Returns false: if error
+ true: if OK, and value stored in value
*/
-int size_to_uint64(char *str, int str_len, uint64_t *value)
+bool size_to_uint64(char *str, int str_len, uint64_t *value)
{
int i, mod_len;
double val;
}
/* Now find the multiplier corresponding to the modifier */
mod_len = strlen(mod_str);
- for (i=0; mod[i]; i++) {
- if (strncasecmp(mod_str, mod[i], mod_len) == 0) {
- break;
+ if (mod_len == 0) {
+ i = 0; /* default with no modifier = 1 */
+ } else {
+ for (i=0; mod[i]; i++) {
+ if (strncasecmp(mod_str, mod[i], mod_len) == 0) {
+ break;
+ }
+ }
+ if (mod[i] == NULL) {
+ return false;
}
- }
- if (mod[i] == NULL) {
- i = 0; /* no modifier found, assume 1 */
}
Dmsg2(900, "str=%s: mult=%d\n", str, mult[i]);
errno = 0;
val = strtod(num_str, NULL);
if (errno != 0 || val < 0) {
- return 0;
+ return false;
}
- *value = (utime_t)(val * mult[i]);
- return 1;
+ *value = (utime_t)(val * mult[i]);
+ return true;
}
/*