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 plus additions
- that are listed in the file LICENSE.
+ modify it under the terms of version three of the GNU Affero 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
+ You should have received a copy of the GNU Affero 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 John Walker.
+ 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.
/*
* Return next argument from command line. Note, this
- * routine is destructive.
+ * routine is destructive because it stored 0 at the end
+ * of each argument.
+ * 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)
{
}
Dmsg1(900, "Next arg=%s\n", p);
for (n = q = p; *p ; ) {
- if (*p == '\\') {
- p++;
+ if (*p == '\\') { /* slash? */
+ p++; /* yes, skip it */
if (*p) {
*q++ = *p++;
} else {
continue;
}
if (*p == '"') { /* start or end of quote */
- if (in_quote) {
- p++; /* skip quote */
- in_quote = false;
- continue;
- }
- in_quote = true;
p++;
+ in_quote = !in_quote; /* change state */
continue;
}
- if (!in_quote && B_ISSPACE(*p)) { /* end of field */
+ if (!in_quote && B_ISSPACE(*p)) { /* end of field */
p++;
break;
}
/*
* This routine parses the input command line.
* It makes a copy in args, then builds an
- * argc, argv like list where
+ * argc, argk, argv list where:
*
* argc = count of arguments
* argk[i] = argument keyword (part preceding =)
* argk[2] = arg3
* argv[2] =
*/
-
int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc,
char **argk, char **argv, int max_args)
{
- char *p, *q, *n;
+ char *p;
+
+ parse_args_only(cmd, args, argc, argk, argv, max_args);
+
+ /* Separate keyword and value */
+ for (int i=0; i < *argc; i++) {
+ p = strchr(argk[i], '=');
+ if (p) {
+ *p++ = 0; /* terminate keyword and point to value */
+ }
+ argv[i] = p; /* save ptr to value or NULL */
+ }
+#ifdef xxx_debug
+ 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;
+}
+
+
+/*
+ * 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
+ * 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
+ *
+ * example: arg1 arg2=abc arg3=
+ *
+ * argc = c
+ * argk[0] = arg1
+ * argv[0] = NULL
+ * argk[1] = arg2=abc
+ * argv[1] = NULL
+ * argk[2] = arg3
+ * argv[2] =
+ */
+int parse_args_only(POOLMEM *cmd, POOLMEM **args, int *argc,
+ char **argk, char **argv, int max_args)
+{
+ char *p, *n;
pm_strcpy(args, cmd);
strip_trailing_junk(*args);
break;
}
}
- /* Separate keyword and value */
- for (int i=0; i < *argc; i++) {
- p = strchr(argk[i], '=');
- if (p) {
- *p++ = 0; /* terminate keyword and point to value */
- /* Unquote quoted values */
- if (*p == '"') {
- for (n = q = ++p; *p && *p != '"'; ) {
- if (*p == '\\') {
- p++;
- }
- *q++ = *p++;
- }
- *q = 0; /* terminate string */
- p = n; /* point to string */
- }
- if (strlen(p) > MAX_NAME_LENGTH-1) {
- p[MAX_NAME_LENGTH-1] = 0; /* truncate to max len */
- }
- }
- argv[i] = p; /* save ptr to value or NULL */
- }
-#ifdef xxxx
- 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;
}
+
/*
* Given a full filename, split it into its path
* and filename parts. They are returned in pool memory
projects / bacula / bacula / blobdiff