socsvn commit: r329053 - soc2017/kneitinger/libbe-head/sbin/be

[kneitinger at FreeBSD.org]

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);
 }