+/*
+ 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.
+*/
/*
* scan.c -- scanning routines for Bacula
*
* Kern Sibbald, MM separated from util.c MMIII
*
- * Version $Id$
*/
-/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2000-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"
void strip_trailing_junk(char *cmd)
{
char *p;
- p = cmd + strlen(cmd) - 1;
/* strip trailing junk from command */
- while ((p >= cmd) && (*p == '\n' || *p == '\r' || *p == ' '))
+ p = cmd - 1 + strlen(cmd);
+ while ((p >= cmd) && (B_ISSPACE(*p) || *p == '\n' || *p == '\r')) {
*p-- = 0;
+ }
}
/* Strip any trailing newline characters from the string */
void strip_trailing_newline(char *cmd)
{
char *p;
- p = cmd + strlen(cmd) - 1;
-
- while ((p >= cmd) && (*p == '\n' || *p == '\r'))
- *p-- = 0;
+ p = cmd - 1 + strlen(cmd);
+ while ((p >= cmd) && (*p == '\n' || *p == '\r')) *p-- = 0;
}
/* Strip any trailing slashes from a directory path */
void strip_trailing_slashes(char *dir)
{
char *p;
- p = dir + strlen(dir) - 1;
/* strip trailing slashes */
- while (p >= dir && IsPathSeparator(*p))
- *p-- = 0;
+ p = dir -1 + strlen(dir);
+ while (p >= dir && IsPathSeparator(*p)) *p-- = 0;
}
/*
* Called with pointer to pointer to command line. This
* pointer is updated to point to the remainder of the
* command line.
- *
+ *
* Returns pointer to next argument -- don't store the result
* in the pointer you passed as an argument ...
* The next argument is terminated by a space unless within
* quotes. Double quote characters (unless preceded by a \) are
* stripped.
- *
+ *
*/
char *next_arg(char **s)
{
* This routine parses the input command line.
* It makes a copy in args, then builds an
* argc, argk, but no argv (values).
- * This routine is useful for scanning command lines where the data
+ * This routine is useful for scanning command lines where the data
* is a filename and no keywords are expected. If we scan a filename
* for keywords, any = in the filename will be interpreted as the
* end of a keyword, and this is not good.
*
* argc = count of arguments
* argk[i] = argument keyword (part preceding =)
- * argv[i] = NULL
+ * argv[i] = NULL
*
* example: arg1 arg2=abc arg3=
*
/*
* Extremely simple sscanf. Handles only %(u,d,ld,qd,qu,lu,lld,llu,c,nns)
+ *
+ * Note, BIG is the default maximum length when no length
+ * has been specified for %s. If it is not big enough, then
+ * simply add a length such as %10000s.
*/
const int BIG = 1000;
int bsscanf(const char *buf, const char *fmt, ...)
int max_len = BIG;
uint64_t value;
bool error = false;
+ bool negative;
va_start(ap, fmt);
while (*fmt && !error) {
switch_top:
switch (*fmt++) {
case 'u':
- case 'd':
value = 0;
while (B_ISDIGIT(*buf)) {
value = B_TIMES10(value) + *buf++ - '0';
// Dmsg0(000, "Store 32 bit int\n");
} else {
*((uint64_t *)vp) = (uint64_t)value;
+// Dmsg0(000, "Store 64 bit int\n");
+ }
+ count++;
+ l = 0;
+ break;
+ case 'd':
+ value = 0;
+ if (*buf == '-') {
+ negative = true;
+ buf++;
+ } else {
+ negative = false;
+ }
+ while (B_ISDIGIT(*buf)) {
+ value = B_TIMES10(value) + *buf++ - '0';
+ }
+ if (negative) {
+ value = -value;
+ }
+ vp = (void *)va_arg(ap, void *);
+// Dmsg2(000, "val=%lld at 0x%lx\n", value, (long unsigned)vp);
+ if (l == 0) {
+ *((int *)vp) = (int)value;
+ } else if (l == 1) {
+ *((int32_t *)vp) = (int32_t)value;
+// Dmsg0(000, "Store 32 bit int\n");
+ } else {
+ *((int64_t *)vp) = (int64_t)value;
// Dmsg0(000, "Store 64 bit int\n");
}
count++;
projects / bacula / bacula / blobdiff