When invoking the mysql script, pass in $*

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

diff --git a/bacula/src/lib/scan.c b/bacula/src/lib/scan.c
index 376e3fd3930cd749c8ad63af8743f2a8d795f93a..34c31d2d2b674dec9a571be39c092bd9c863f30a 100644 (file)
--- a/bacula/src/lib/scan.c
+++ b/bacula/src/lib/scan.c
@@ -59,17 +59,17 @@ void strip_trailing_slashes(char *dir)
  *          1 on success
  *          new address in passed parameter 
  */
-int skip_spaces(char **msg)
+bool skip_spaces(char **msg)
 {
    char *p = *msg;
    if (!p) {
-      return 0;
+      return false;
    }
-   while (*p && *p == ' ') {
+   while (*p && B_ISSPACE(*p)) {
       p++;
    }
    *msg = p;
-   return *p ? 1 : 0;
+   return *p ? true : false;
 }
 
 /*
@@ -78,18 +78,18 @@ int skip_spaces(char **msg)
  *          1 on success
  *          new address in passed parameter 
  */
-int skip_nonspaces(char **msg)
+bool skip_nonspaces(char **msg)
 {
    char *p = *msg;
 
    if (!p) {
-      return 0;
+      return false;
    }
-   while (*p && *p != ' ') {
+   while (*p && !B_ISSPACE(*p)) {
       p++;
    }
    *msg = p;
-   return *p ? 1 : 0;
+   return *p ? true : false;
 }
 
 /* folded search for string - case insensitive */
@@ -188,18 +188,15 @@ char *next_arg(char **s)
  *  argv[2] = 
  */
 
-int parse_args(POOLMEM *cmd, POOLMEM *args, int *argc, 
+int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc, 
               char **argk, char **argv, int max_args) 
 {
    char *p, *q, *n;
-   int len;
 
-   len = strlen(cmd) + 1;
-   args = check_pool_memory_size(args, len);
-   bstrncpy(args, cmd, len);
-   strip_trailing_junk(args);
+   pm_strcpy(args, cmd);
+   strip_trailing_junk(*args);
+   p = *args;
    *argc = 0;
-   p = args;
    /* Pick up all arguments */
    while (*argc < max_args) {
       n = next_arg(&p);   
@@ -232,10 +229,10 @@ int parse_args(POOLMEM *cmd, POOLMEM *args, int *argc,
       }
       argv[i] = p;                   /* save ptr to value or NULL */
    }
-   return 1;
 #ifdef xxxx
-   for (i=0; i<argc; i++) {
-      Dmsg3(000, "Arg %d: kw=%s val=%s\n", i, argk[i], argv[i]?argv[i]:"NULL");
+   for (int i=0; i < *argc; i++) {
+      Pmsg3(000, "Arg %d: kw=%s val=%s\n", i, argk[i], argv[i]?argv[i]:"NULL");
    }
 #endif
+   return 1;
 }