From owner-svn-soc-all@freebsd.org Mon May 30 06:35:48 2016 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 8C9EEB54E1C for ; Mon, 30 May 2016 06:35:48 +0000 (UTC) (envelope-from yuanxunzhang@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 80A621711 for ; Mon, 30 May 2016 06:35:48 +0000 (UTC) (envelope-from yuanxunzhang@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u4U6Zmwn055162 for ; Mon, 30 May 2016 06:35:48 GMT (envelope-from yuanxunzhang@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u4U6ZlmV055159 for svn-soc-all@FreeBSD.org; Mon, 30 May 2016 06:35:47 GMT (envelope-from yuanxunzhang@FreeBSD.org) Date: Mon, 30 May 2016 06:35:47 GMT Message-Id: <201605300635.u4U6ZlmV055159@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to yuanxunzhang@FreeBSD.org using -f From: yuanxunzhang@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r304185 - soc2016/yuanxunzhang/head/usr.sbin/eaps 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.22 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: Mon, 30 May 2016 06:35:48 -0000 Author: yuanxunzhang Date: Mon May 30 06:35:47 2016 New Revision: 304185 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=304185 Log: update eaps commands modules Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c ============================================================================== --- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon May 30 06:12:44 2016 (r304184) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon May 30 06:35:47 2016 (r304185) @@ -53,13 +53,18 @@ * eaps - display, and configure eaps */ -static void -usage(const char *cp) -{ - if (cp != NULL) - warnx("bad keyword: %s", cp); - errx(EX_USAGE, "usage: eaps command [args]"); -} +static struct keytab { + const char *kt_cp; + int kt_i; +} const keywords[] = { +#include "keywords.h" + {0, 0} +}; + +int keyword(const char *); +static void createdomain(int, char **); +static void deletedomain(int, char **); +static void usage(void); int main(int argc, char **argv) @@ -71,8 +76,30 @@ if (*argv != NULL) switch (keyword(*argv)) { case K_CREATE: + createdomain(argc, argv); + case K_DELETE: + deletedomain(argc, argv); + exit(0); } usage(*argv); return rtn; +} + +static void +usage(const char *cp) +{ + if (cp != NULL) + warnx("bad keyword: %s", cp); + errx(EX_USAGE, "usage: eaps command [args]"); +} + +int +keyword(const char *cp) +{ + const struct keytab *kt = keywords; + + while (kt->kt_cp != NULL && strcmp(kt->kt_cp, cp) != 0) + kt++; + return (kt->kt_i); } \ No newline at end of file