diff options
| author | Wanlong Gao <gaowanlong@cn.fujitsu.com> | 2012-01-09 20:53:24 +0800 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-01-10 15:41:35 +0000 |
| commit | 13a7415595e97c14fa8bdfb330cfdc239d2c233f (patch) | |
| tree | 9573459f94659c75bb9ba89b94c2535f4d054aba | |
| parent | ae41a597178ece16e976fa9bdd0319745ad1e87a (diff) | |
| download | libguestfs-13a7415595e97c14fa8bdfb330cfdc239d2c233f.tar.gz libguestfs-13a7415595e97c14fa8bdfb330cfdc239d2c233f.tar.xz libguestfs-13a7415595e97c14fa8bdfb330cfdc239d2c233f.zip | |
launch: move the filename checking to a wrapper
Move the filename's comma character checking to a wrapper.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
(cherry picked from commit e0c309379556ad50d43a08b4aa4ec0146d2b60d8)
| -rw-r--r-- | src/launch.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/launch.c b/src/launch.c index 588ace11..fa95857a 100644 --- a/src/launch.c +++ b/src/launch.c @@ -277,6 +277,16 @@ valid_format_iface (const char *str) 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) @@ -287,10 +297,8 @@ guestfs__add_drive_opts (guestfs_h *g, const char *filename, char *name; int use_cache_off; - if (strchr (filename, ',') != NULL) { - error (g, _("filename cannot contain ',' (comma) character")); + if (check_path(g, filename) == -1) return -1; - } readonly = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK ? optargs->readonly : 0; @@ -398,10 +406,8 @@ guestfs__add_drive_ro_with_if (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; - } if (access (filename, F_OK) == -1) { perrorf (g, "%s", filename); |