From owner-svn-soc-all@freebsd.org  Sun Nov  5 02:17:44 2017
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2CA09E5E28D
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Sun,  5 Nov 2017 02:17:44 +0000 (UTC)
 (envelope-from kneitinger@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F233686EB
 for <svn-soc-all@FreeBSD.org>; Sun,  5 Nov 2017 02:17:44 +0000 (UTC)
 (envelope-from kneitinger@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id vA52Hh4S056376
 for <svn-soc-all@FreeBSD.org>; Sun, 5 Nov 2017 02:17:43 GMT
 (envelope-from kneitinger@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id vA52HhaU056098
 for svn-soc-all@FreeBSD.org; Sun, 5 Nov 2017 02:17:43 GMT
 (envelope-from kneitinger@FreeBSD.org)
Date: Sun, 5 Nov 2017 02:17:43 GMT
Message-Id: <201711050217.vA52HhaU056098@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 kneitinger@FreeBSD.org using -f
From: kneitinger@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r329053 - soc2017/kneitinger/libbe-head/sbin/be
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Nov 2017 02:17:44 -0000

Author: kneitinger
Date: Sun Nov  5 02:17:42 2017
New Revision: 329053
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=329053

Log:
  Simplify be's destroy logic
  

Modified:
  soc2017/kneitinger/libbe-head/sbin/be/be.c

Modified: soc2017/kneitinger/libbe-head/sbin/be/be.c
==============================================================================
--- soc2017/kneitinger/libbe-head/sbin/be/be.c	Sun Nov  5 00:51:53 2017	(r329052)
+++ soc2017/kneitinger/libbe-head/sbin/be/be.c	Sun Nov  5 02:17:42 2017	(r329053)
@@ -325,8 +325,7 @@
 {
 	int opt, err;
 	bool force;
-	char *bootenv;
-	char *snapshot;
+	char *target;
 
 	force = false;
 	while ((opt = getopt(argc, argv, "F")) != -1) {
@@ -349,25 +348,10 @@
 		return (usage(false));
 	}
 
-	/* Determine bootenv name, and snapshot if provided */
-	/* TODO: Handle be snapshot destroy */
-	char *buffer = malloc((strlen(argv[0])+1) * sizeof(char));
-	strcpy(buffer, argv[0]);
-	char *delimiter;
-	if ((delimiter = strchr(buffer, '@')) != NULL) {
-		*delimiter = '\0';
-		snapshot = delimiter + sizeof(char);
-		if (strchr(snapshot, '@') != NULL) {
-			fprintf(stderr, "be destroy: invalid snapshot name\n");
-			free(buffer);
-			return (usage(false));
-		}
-	}
-	bootenv = buffer;
+	target = argv[0];
 
-	err = be_destroy(be, bootenv, 0);
+	err = be_destroy(be, target, force);
 
-	free(buffer);
 	return (err);
 }