From owner-svn-soc-all@freebsd.org Thu Jun 22 08:10:26 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 D7741DA8FB0 for ; Thu, 22 Jun 2017 08:10:26 +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 BD213724BC for ; Thu, 22 Jun 2017 08:10:26 +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 v5M8AQqb027938 for ; Thu, 22 Jun 2017 08:10:26 GMT (envelope-from kneitinger@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id v5M8AQI6027864 for svn-soc-all@FreeBSD.org; Thu, 22 Jun 2017 08:10:26 GMT (envelope-from kneitinger@FreeBSD.org) Date: Thu, 22 Jun 2017 08:10:26 GMT Message-Id: <201706220810.v5M8AQI6027864@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: r323841 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2017 08:10:26 -0000 Author: kneitinger Date: Thu Jun 22 08:10:25 2017 New Revision: 323841 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=323841 Log: dd parser for be unjail command 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 Thu Jun 22 07:57:29 2017 (r323840) +++ soc2017/kneitinger/libbe-head/sbin/be/be.c Thu Jun 22 08:10:25 2017 (r323841) @@ -266,6 +266,8 @@ jail = argv[1]; bootenv = argv[2]; + /* jail logic goes here */ + return (0); } @@ -331,6 +333,8 @@ bootenv = argv[1]; mountpoint = argc == 3 ? argv[2] : NULL; + /* mount logic goes here */ + return (0); } @@ -354,6 +358,8 @@ src = argv[1]; dest = argv[2]; + /* rename logic goes here */ + return (0); } @@ -361,7 +367,38 @@ static int be_unjail(int argc, char *argv[]) { - return (EX_USAGE); + int opt; + char *cmd, *target; + + /* Store alias used */ + cmd = argv[0]; + + force = false; + while ((opt = getopt(argc, argv, "f")) != -1) { + switch (opt) { + case 'f': + force = true; + break; + default: + fprintf(stderr, "be %s: unknown option '-%c'\n", + cmd, optopt); + return (usage(false)); + } + } + + argc -= optind; + argv += optind; + + if (argc != 1) { + fprintf(stderr, "be %s: wrong number of arguments\n", cmd); + return (usage(false)); + } + + target = argv[0]; + + /* unjail logic goes here */ + + return (0); } @@ -398,7 +435,7 @@ mountpoint = argv[0]; - /* activate logic goes here */ + /* unmount logic goes here */ return (0); }