From owner-svn-soc-all@freebsd.org Thu Jun 22 05:16:01 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 DB9BBDA6038 for ; Thu, 22 Jun 2017 05:16:01 +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 CDDFA6A57C for ; Thu, 22 Jun 2017 05:16:01 +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 v5M5G1r7025146 for ; Thu, 22 Jun 2017 05:16:01 GMT (envelope-from kneitinger@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id v5M5G1i7025138 for svn-soc-all@FreeBSD.org; Thu, 22 Jun 2017 05:16:01 GMT (envelope-from kneitinger@FreeBSD.org) Date: Thu, 22 Jun 2017 05:16:01 GMT Message-Id: <201706220516.v5M5G1i7025138@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: r323821 - 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: Thu, 22 Jun 2017 05:16:02 -0000 Author: kneitinger Date: Thu Jun 22 05:16:00 2017 New Revision: 323821 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=323821 Log: Add parser for be create and jail commands 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 Thu Jun 22 04:40:11 2017 (r323820) +++ soc2017/kneitinger/libbe-head/usr.bin/be/be.c Thu Jun 22 05:16:00 2017 (r323821) @@ -143,7 +143,56 @@ static int be_create(int argc, char *argv[]) { - return (EX_USAGE); + int opt; + bool recursive; + char *existing; + char *bootenv; + char *snapshot; + + existing = NULL; + recursive = false; + while ((opt = getopt(argc, argv, "re:")) != -1) { + switch (opt) { + case 'e': + existing = optarg; + break; + case 'r': + recursive = true; + break; + default: + fprintf(stderr, "be create: unknown option '-%c'\n", + optopt); + return (usage(false)); + } + } + + argc -= optind; + argv += optind; + + if (argc != 1) { + fprintf(stderr, "be create: wrong number of arguments\n"); + return (usage(false)); + } + + /* 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"); + free(buffer); + return (usage(false)); + } + } + bootenv = buffer; + + /* create logic goes here */ + + free(buffer); + return (0); } @@ -201,7 +250,21 @@ static int be_jail(int argc, char *argv[]) { - return (EX_USAGE); + char *bootenv, *jail; + + if (argc < 3) { + fprintf(stderr, "be jail: not enough arguments\n"); + return (usage(false)); + } + if (argc > 3) { + fprintf(stderr, "be jail: too many arguments\n"); + return (usage(false)); + } + + jail = argv[1]; + bootenv = argv[2]; + + return (0); } @@ -322,6 +385,5 @@ exit(usage(false)); } - return (command_map[command_index].fn(argc-1, argv+1)); }