|
 |
603f99 |
autofs-5.1.3 - add function construct_argv()
|
|
|
603f99 |
|
|
|
603f99 |
From: Ian Kent <raven@themaw.net>
|
|
|
603f99 |
|
|
|
603f99 |
Add a function to decompose a string into a program path and an
|
|
|
603f99 |
arguments vector ready for an execv(3) invocation.
|
|
|
603f99 |
|
|
|
603f99 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
603f99 |
---
|
|
|
603f99 |
CHANGELOG | 1
|
|
|
603f99 |
include/parse_subs.h | 1
|
|
|
603f99 |
lib/parse_subs.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
603f99 |
3 files changed, 82 insertions(+)
|
|
|
603f99 |
|
|
|
603f99 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
603f99 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
603f99 |
@@ -280,6 +280,7 @@
|
|
|
603f99 |
- remove path restriction of amd external mount.
|
|
|
603f99 |
- add function umount_amd_ext_mount().
|
|
|
603f99 |
- add function ext_mount_inuse().
|
|
|
603f99 |
+- add function construct_argv().
|
|
|
603f99 |
|
|
|
603f99 |
25/07/2012 autofs-5.0.7
|
|
|
603f99 |
=======================
|
|
|
603f99 |
--- autofs-5.0.7.orig/include/parse_subs.h
|
|
|
603f99 |
+++ autofs-5.0.7/include/parse_subs.h
|
|
|
603f99 |
@@ -125,6 +125,7 @@ char *sanitize_path(const char *, int, u
|
|
|
603f99 |
char *merge_options(const char *, const char *);
|
|
|
603f99 |
int expandamdent(const char *, char *, const struct substvar *);
|
|
|
603f99 |
int expand_selectors(struct autofs_point *, const char *, char **, struct substvar *);
|
|
|
603f99 |
+int construct_argv(char *, char **, char ***);
|
|
|
603f99 |
void free_map_type_info(struct map_type_info *);
|
|
|
603f99 |
struct map_type_info *parse_map_type_info(const char *);
|
|
|
603f99 |
|
|
|
603f99 |
--- autofs-5.0.7.orig/lib/parse_subs.c
|
|
|
603f99 |
+++ autofs-5.0.7/lib/parse_subs.c
|
|
|
603f99 |
@@ -1191,6 +1191,86 @@ int expand_selectors(struct autofs_point
|
|
|
603f99 |
return len;
|
|
|
603f99 |
}
|
|
|
603f99 |
|
|
|
603f99 |
+/* Get next space seperated argument, arguments containing
|
|
|
603f99 |
+ * space characters may be single quoted.
|
|
|
603f99 |
+ */
|
|
|
603f99 |
+static char *next_arg(char *str, char **next)
|
|
|
603f99 |
+{
|
|
|
603f99 |
+ char *start;
|
|
|
603f99 |
+ char *ptr;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ if (!*str)
|
|
|
603f99 |
+ return NULL;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ start = ptr = str;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ /* The amd map format parser should ensure there
|
|
|
603f99 |
+ * are matching single quotes.
|
|
|
603f99 |
+ */
|
|
|
603f99 |
+ if (*start == 39) {
|
|
|
603f99 |
+ start++;
|
|
|
603f99 |
+ ptr++;
|
|
|
603f99 |
+ while (*ptr && *ptr != 39)
|
|
|
603f99 |
+ ptr++;
|
|
|
603f99 |
+ } else {
|
|
|
603f99 |
+ while (*ptr && *ptr != ' ')
|
|
|
603f99 |
+ ptr++;
|
|
|
603f99 |
+ }
|
|
|
603f99 |
+
|
|
|
603f99 |
+ if (*ptr)
|
|
|
603f99 |
+ *ptr++ = 0;
|
|
|
603f99 |
+ *next = ptr;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ return start;
|
|
|
603f99 |
+}
|
|
|
603f99 |
+
|
|
|
603f99 |
+/* Construct program path name plus argument array for use with
|
|
|
603f99 |
+ * execv(3).
|
|
|
603f99 |
+ */
|
|
|
603f99 |
+int construct_argv(char *str, char **prog, char ***argv)
|
|
|
603f99 |
+{
|
|
|
603f99 |
+ char *program = NULL;
|
|
|
603f99 |
+ char *start, *next;
|
|
|
603f99 |
+ char **args, *arg;
|
|
|
603f99 |
+ int argc;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ start = str;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ args = malloc(sizeof(char *));
|
|
|
603f99 |
+ if (!args)
|
|
|
603f99 |
+ return -1;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ args[0] = NULL;
|
|
|
603f99 |
+ argc = 0;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ next = NULL;
|
|
|
603f99 |
+ program = next_arg(str, &next;;
|
|
|
603f99 |
+ if (!program) {
|
|
|
603f99 |
+ free(args);
|
|
|
603f99 |
+ return -1;
|
|
|
603f99 |
+ }
|
|
|
603f99 |
+
|
|
|
603f99 |
+ start = next;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ while (1) {
|
|
|
603f99 |
+ if (!*next)
|
|
|
603f99 |
+ break;
|
|
|
603f99 |
+ arg = next_arg(start, &next;;
|
|
|
603f99 |
+ if (arg) {
|
|
|
603f99 |
+ argc++;
|
|
|
603f99 |
+ args = add_argv(argc, args, arg);
|
|
|
603f99 |
+ if (!args)
|
|
|
603f99 |
+ return -1;
|
|
|
603f99 |
+ }
|
|
|
603f99 |
+ start = next;
|
|
|
603f99 |
+ }
|
|
|
603f99 |
+
|
|
|
603f99 |
+ *prog = program;
|
|
|
603f99 |
+ *argv = args;
|
|
|
603f99 |
+
|
|
|
603f99 |
+ return argc;
|
|
|
603f99 |
+}
|
|
|
603f99 |
+
|
|
|
603f99 |
void free_map_type_info(struct map_type_info *info)
|
|
|
603f99 |
{
|
|
|
603f99 |
if (info->type)
|