From 95d39161ccef4a76269bf997a92bcc405f0523de Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 1 Mar 2011 19:58:12 -0800
Subject: [PATCH] vhd-util coalesce to a specified file

---
 tools/vhd-tools/vhd/lib/vhd-util-coalesce.c | 26 ++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/vhd-tools/vhd/lib/vhd-util-coalesce.c b/tools/vhd-tools/vhd/lib/vhd-util-coalesce.c
index 63dcf6010e0..6db9000c612 100644
--- a/tools/vhd-tools/vhd/lib/vhd-util-coalesce.c
+++ b/tools/vhd-tools/vhd/lib/vhd-util-coalesce.c
@@ -134,17 +134,23 @@ vhd_util_coalesce(int argc, char **argv)
 
 	name  = NULL;
 	pname = NULL;
+	int pflag = 0;
 	parent.file = NULL;
 
 	if (!argc || !argv)
 		goto usage;
 
 	optind = 0;
-	while ((c = getopt(argc, argv, "n:h")) != -1) {
+	while ((c = getopt(argc, argv, "n:p:h")) != -1) {
 		switch (c) {
 		case 'n':
 			name = optarg;
 			break;
+		case 'p':
+                        pflag = 1;
+			pname = optarg;
+			break;
+
 		case 'h':
 		default:
 			goto usage;
@@ -160,11 +166,13 @@ vhd_util_coalesce(int argc, char **argv)
 		return err;
 	}
 
-	err = vhd_parent_locator_get(&vhd, &pname);
-	if (err) {
-		printf("error finding %s parent: %d\n", name, err);
-		vhd_close(&vhd);
-		return err;
+    	if (pname == NULL) {
+		err = vhd_parent_locator_get(&vhd, &pname);
+		if (err) {
+			printf("error finding %s parent: %d\n", name, err);
+			vhd_close(&vhd);
+			return err;
+		}
 	}
 
 	if (vhd_parent_raw(&vhd)) {
@@ -204,7 +212,9 @@ vhd_util_coalesce(int argc, char **argv)
 	err = 0;
 
  done:
-	free(pname);
+        if (pflag==0) {
+		free(pname);
+	}
 	vhd_close(&vhd);
 	if (parent.file)
 		vhd_close(&parent);
@@ -213,6 +223,6 @@ vhd_util_coalesce(int argc, char **argv)
 	return err;
 
 usage:
-	printf("options: <-n name> [-h help]\n");
+	printf("options: <-n name> [ -p parent name] [-h help]\n");
 	return -EINVAL;
 }