From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michele Ballabio Subject: [PATCH 6/9 - v2] builtin-init-db.c: use parse_options() Date: Fri, 25 Jul 2008 10:15:18 +0200 Message-ID: <200807251015.18143.barra_cuda@katamail.com> References: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com> <4888AAB2.5050007@free.fr> <200807242207.02195.barra_cuda@katamail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, gitster@pobox.com To: Olivier Marin X-From: git-owner@vger.kernel.org Fri Jul 25 10:10:08 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KMIN6-00072p-FB for gcvg-git-2@gmane.org; Fri, 25 Jul 2008 10:09:52 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752170AbYGYIIx (ORCPT ); Fri, 25 Jul 2008 04:08:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751908AbYGYIIw (ORCPT ); Fri, 25 Jul 2008 04:08:52 -0400 Received: from smtp.katamail.com ([62.149.157.154]:41134 "HELO smtp1.pc.aruba.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1751907AbYGYIIu (ORCPT ); Fri, 25 Jul 2008 04:08:50 -0400 Received: (qmail 10034 invoked by uid 89); 25 Jul 2008 08:08:34 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on smtp2-pc X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50,RDNS_NONE autolearn=no version=3.2.3 Received: from unknown (HELO host200-56-dynamic.104-80-r.retail.telecomitalia.it) (barra?cuda@katamail.com@80.104.56.200) by smtp2-pc with SMTP; 25 Jul 2008 08:08:33 -0000 User-Agent: KMail/1.9.9 In-Reply-To: <200807242207.02195.barra_cuda@katamail.com> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Michele Ballabio --- On Thursday 24 July 2008, Michele Ballabio wrote: > +static int parse_opt_shared_cb(const struct option *opt, const char *arg, > + int unset) > +{ > + *(int *)(opt->value) = unset ? PERM_UMASK : git_config_perm("arg", arg); > + return 0; > +} > Did it this way (and changed help strings). builtin-init-db.c | 57 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 21 deletions(-) diff --git a/builtin-init-db.c b/builtin-init-db.c index 38b4fcb..42c2e20 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -6,6 +6,7 @@ #include "cache.h" #include "builtin.h" #include "exec_cmd.h" +#include "parse-options.h" #ifndef DEFAULT_GIT_TEMPLATE_DIR #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates" @@ -353,8 +354,18 @@ static int guess_repository_type(const char *git_dir) return 1; } -static const char init_db_usage[] = -"git init [-q | --quiet] [--bare] [--template=] [--shared[=]]"; +static const char * const init_db_usage[] = { + "git init [-q | --quiet] [--bare] [--template=] [--shared[=]]", + NULL +}; + +static int parse_opt_shared_cb(const struct option *opt, const char *arg, + int unset) +{ + *(int *)(opt->value) = unset ? PERM_UMASK : + git_config_perm("arg", arg); + return 0; +} /* * If you want to, you can share the DB area with any number of branches. @@ -367,25 +378,29 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) const char *git_dir; const char *template_dir = NULL; unsigned int flags = 0; - int i; - - for (i = 1; i < argc; i++, argv++) { - const char *arg = argv[1]; - if (!prefixcmp(arg, "--template=")) - template_dir = arg+11; - else if (!strcmp(arg, "--bare")) { - static char git_dir[PATH_MAX+1]; - is_bare_repository_cfg = 1; - setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, - sizeof(git_dir)), 0); - } else if (!strcmp(arg, "--shared")) - shared_repository = PERM_GROUP; - else if (!prefixcmp(arg, "--shared=")) - shared_repository = git_config_perm("arg", arg+9); - else if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet")) - flags |= INIT_DB_QUIET; - else - usage(init_db_usage); + int bare = 0; + + const struct option options[] = { + OPT_STRING(0, "template", &template_dir, "path", + "path to the template directory"), + OPT_BOOLEAN(0, "bare", &bare, "set up a bare repository"), + { OPTION_CALLBACK, 0, "shared", &shared_repository, + "permissions", "set up a shared repository", + PARSE_OPT_OPTARG, parse_opt_shared_cb, PERM_GROUP }, + OPT_BIT('q', "quiet", &flags, "be quiet", INIT_DB_QUIET), + OPT_END() + }; + + argc = parse_options(argc, argv, options, init_db_usage, 0); + + if (argc > 0) + usage_with_options(init_db_usage, options); + + if (bare) { + static char git_dir[PATH_MAX+1]; + is_bare_repository_cfg = 1; + setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, + sizeof(git_dir)), 0); } /* -- 1.5.6.3