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-09 14:08:41 +0000 |
| commit | e0c309379556ad50d43a08b4aa4ec0146d2b60d8 (patch) | |
| tree | d61e7d721c104d859ee514047e0c255741f5c763 /src/launch.c | |
| parent | be47b66c3033105a2b880dbc10bfc2b163b7eafe (diff) | |
| download | libguestfs-e0c309379556ad50d43a08b4aa4ec0146d2b60d8.tar.gz libguestfs-e0c309379556ad50d43a08b4aa4ec0146d2b60d8.tar.xz libguestfs-e0c309379556ad50d43a08b4aa4ec0146d2b60d8.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>
Diffstat (limited to 'src/launch.c')
| -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 8a64b5e7..986c459a 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) @@ -288,10 +298,8 @@ guestfs__add_drive_opts (guestfs_h *g, const char *filename, 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; - } 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) { - 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); |