From owner-p4-projects@FreeBSD.ORG  Sun Jul 10 06:36:57 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 145BC16A420; Sun, 10 Jul 2005 06:36:57 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BC41316A41C
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 06:36:56 +0000 (GMT)
	(envelope-from soc-cjones@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7804E43D46
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 06:36:56 +0000 (GMT)
	(envelope-from soc-cjones@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A6auXj034228
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 06:36:56 GMT
	(envelope-from soc-cjones@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A6auu8034225
	for perforce@freebsd.org; Sun, 10 Jul 2005 06:36:56 GMT
	(envelope-from soc-cjones@freebsd.org)
Date: Sun, 10 Jul 2005 06:36:56 GMT
Message-Id: <200507100636.j6A6auu8034225@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-cjones@freebsd.org using -f
From: soc-cjones <soc-cjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79895 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jul 2005 06:36:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=79895

Change 79895 by soc-cjones@soc-cjones_ides on 2005/07/10 06:36:22

	Fully fleshed-out userland for gvinum 'move'

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#3 edit

Differences ...

==== //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#3 (text+ko) ====

@@ -604,10 +604,71 @@
 	return;
 }
 
+/* Note that move is currently of form '[-r] target object [...]' */
 void
 gvinum_move(int argc, char **argv)
 {
-	/* NOP */
+	struct gctl_req *req;
+	int flags = 0, i, j;
+	const char *errstr;
+	char buf[20], *cmd;
+
+	if (argc) {
+		optreset = 1;
+		optind = 1;
+		cmd = argv[0];
+		while ((j = getopt(argc, argv, "r")) != -1) {
+			switch (j) {
+			case 'r':
+				flags |= GV_FLAG_R;
+				break;
+			case '?':
+			default:
+				return;
+			}
+		}
+		argc -= optind;
+		argv += optind;
+	}
+
+	req = gctl_get_handle();
+	gctl_ro_param(req, "class", -1, "VINUM");
+        gctl_ro_param(req, "verb", -1, "move");
+        gctl_ro_param(req, "cmd", -1, cmd);
+        gctl_ro_param(req, "argc", sizeof(int), &argc);
+        gctl_ro_param(req, "flags", sizeof(int), &flags);
+	if (argc) {
+		for (i = 0; i < argc; i++) {
+			snprintf(buf, sizeof(buf), "argv%d", i);
+			gctl_ro_param(req, buf, -1, argv[i]);
+		}
+	} else {
+		warnx("no destination or object(s) to move specified");
+		gctl_free(req);
+		return;
+	}
+
+	/* We incremented argv such that the 0th argument is 
+	   the destination, and arguments 1..$ are the objects. */
+        gctl_ro_param(req, "destination", -1, argv[0]);
+	if (argc > 1) {
+		for (i = 1; i < argc; i++) {
+			snprintf(buf, sizeof(buf), "object%d", i - 1);
+			gctl_ro_param(req, buf, -1, argv[i]);
+		}
+	} else { /* There isn't at least one object specified! */
+		warnx("no object(s) to move specified");
+		gctl_free(req);
+		return;
+	}
+	errstr = gctl_issue(req); 
+	if (errstr != NULL) {
+		warnx("can't move object(s):  %s", errstr);
+		gctl_free(req);
+		return;
+	}
+	gctl_free(req);
+	return;
 }
 
 void