git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
launch: move the filename checking to a wrapper
[libguestfs.git]
/
src
/
launch.c
diff --git
a/src/launch.c
b/src/launch.c
index
8a64b5e
..
986c459
100644
(file)
--- a/
src/launch.c
+++ b/
src/launch.c
@@
-277,6
+277,16
@@
valid_format_iface (const char *str)
return 1;
}
return 1;
}
+static int
+check_path (guestfs_h *g, const char *filename)
+{
+ if (strchr (filename, ',') != NULL) {
+ error (g, _("filename cannot contain ',' (comma) character"));
+ return -1;
+ }
+ return 0;
+}
+
int
guestfs__add_drive_opts (guestfs_h *g, const char *filename,
const struct guestfs_add_drive_opts_argv *optargs)
int
guestfs__add_drive_opts (guestfs_h *g, const char *filename,
const struct guestfs_add_drive_opts_argv *optargs)
@@
-288,10
+298,8
@@
guestfs__add_drive_opts (guestfs_h *g, const char *filename,
char *abs_path = NULL;
int use_cache_off;
char *abs_path = NULL;
int use_cache_off;
- if (strchr (filename, ',') != NULL) {
- error (g, _("filename cannot contain ',' (comma) character"));
+ if (check_path(g, filename) == -1)
return -1;
return -1;
- }
readonly = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK
? optargs->readonly : 0;
readonly = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK
? optargs->readonly : 0;
@@
-408,10
+416,8
@@
guestfs__add_drive_ro_with_if (guestfs_h *g, const char *filename,
int
guestfs__add_cdrom (guestfs_h *g, const char *filename)
{
int
guestfs__add_cdrom (guestfs_h *g, const char *filename)
{
- if (strchr (filename, ',') != NULL) {
- error (g, _("filename cannot contain ',' (comma) character"));
+ if (check_path(g, filename) == -1)
return -1;
return -1;
- }
if (access (filename, F_OK) == -1) {
perrorf (g, "%s", filename);
if (access (filename, F_OK) == -1) {
perrorf (g, "%s", filename);