From owner-svn-soc-all@freebsd.org Wed Jun 21 08:27:35 2017 Return-Path: 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 6DD5BD89E32 for ; Wed, 21 Jun 2017 08:27:35 +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 52433ACE for ; Wed, 21 Jun 2017 08:27:35 +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 v5L8RZug077751 for ; Wed, 21 Jun 2017 08:27:35 GMT (envelope-from kneitinger@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id v5L8RYPd077690 for svn-soc-all@FreeBSD.org; Wed, 21 Jun 2017 08:27:34 GMT (envelope-from kneitinger@FreeBSD.org) Date: Wed, 21 Jun 2017 08:27:34 GMT Message-Id: <201706210827.v5L8RYPd077690@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: r323786 - soc2017/kneitinger/libbe-head/usr.bin/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jun 2017 08:27:35 -0000 Author: kneitinger Date: Wed Jun 21 08:27:33 2017 New Revision: 323786 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=323786 Log: Add parser for be destroy command Modified: soc2017/kneitinger/libbe-head/usr.bin/be/be.c Modified: soc2017/kneitinger/libbe-head/usr.bin/be/be.c ============================================================================== --- soc2017/kneitinger/libbe-head/usr.bin/be/be.c Wed Jun 21 07:14:10 2017 (r323785) +++ soc2017/kneitinger/libbe-head/usr.bin/be/be.c Wed Jun 21 08:27:33 2017 (r323786) @@ -147,7 +147,54 @@ static int be_destroy( int argc, char *argv[]) { - return(EX_USAGE); + int opt; + bool force; + char *bootenv; + char *snapshot; + + force = false; + while((opt = getopt(argc, argv, "F")) != -1) { + switch(opt) { + case 'F': + force = true; + break; + default: + fprintf(stderr, "be destroy: unknown option '-%c'\n", + optopt); + usage(false); + return(EX_USAGE); + } + } + + argc -= optind; + argv += optind; + + if(argc != 1) { + fprintf(stderr, "be destroy: wrong number of arguments\n"); + usage(false); + return(EX_USAGE); + } + + /* Determine bootenv name, and snapshot if provided */ + 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"); + usage(false); + free(buffer); + return(EX_USAGE); + } + } + bootenv = buffer; + + /* destroy logic goes here */ + + free(buffer); + return 0; } static int