From 08c060cf381b2b8ee5a54d84322cb373a5b2fa6b Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Fri, 25 Aug 2006 23:02:33 +0000 Subject: Add skip_dev_dir() to process command line VGs. --- tools/vgmerge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools/vgmerge.c') diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 2331bb98..73b7fa81 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -231,7 +231,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, int vgmerge(struct cmd_context *cmd, int argc, char **argv) { - char *vg_name_to; + char *vg_name_to, *vg_name_from; int opt = 0; int ret = 0, ret_max = 0; @@ -240,12 +240,14 @@ int vgmerge(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } - vg_name_to = argv[0]; + vg_name_to = skip_dev_dir(cmd, argv[0]); argc--; argv++; for (; opt < argc; opt++) { - ret = _vgmerge_single(cmd, vg_name_to, argv[opt]); + vg_name_from = skip_dev_dir(cmd, argv[opt]); + + ret = _vgmerge_single(cmd, vg_name_to, vg_name_from); if (ret > ret_max) ret_max = ret; } -- cgit