From: Antoine Queru <Antoine.Queru@ensimag.grenoble-inp.fr>
To: git@vger.kernel.org
Cc: william.duclot@ensimag.grenoble-inp.fr,
simon.rabourg@ensimag.grenoble-inp.fr,
francois.beutin@ensimag.grenoble-inp.fr,
Matthieu.Moy@grenoble-inp.fr,
Antoine Queru <Antoine.Queru@ensimag.grenoble-inp.fr>,
Antoine Queru <antoine.queru@grenoble-inp.fr>,
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Subject: [PATCH] upload-pack.c: use of parse-options API
Date: Wed, 18 May 2016 18:40:19 +0200 [thread overview]
Message-ID: <20160518164019.26443-1-Antoine.Queru@ensimag.grenoble-inp.fr> (raw)
Option parsing now uses the parser API instead of a local parser.
Code is now more compact.
Signed-off-by: Antoine Queru <antoine.queru@grenoble-inp.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
---
This is our first project as a warm up. It was taken from the GSoC microproject list.
upload-pack.c | 51 ++++++++++++++++-----------------------------------
1 file changed, 16 insertions(+), 35 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index dc802a0..80f65eb 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -14,8 +14,12 @@
#include "sigchain.h"
#include "version.h"
#include "string-list.h"
+#include "parse-options.h"
-static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
+static const char * const upload_pack_usage[] = {
+ N_("git upload-pack [--strict] [--timeout=<n>] <dir>"),
+ NULL
+};
/* Remember to update object flag allocation in object.h */
#define THEY_HAVE (1u << 11)
@@ -820,49 +824,26 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
int main(int argc, char **argv)
{
char *dir;
- int i;
int strict = 0;
+ struct option options[] = {
+ OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL),
+ OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL),
+ OPT_BOOL(0, "strict", &strict, NULL),
+ OPT_INTEGER(0, "timeout", &timeout, NULL),
+ OPT_END()
+ };
git_setup_gettext();
packet_trace_identity("upload-pack");
git_extract_argv0_path(argv[0]);
check_replace_refs = 0;
-
- for (i = 1; i < argc; i++) {
- char *arg = argv[i];
-
- if (arg[0] != '-')
- break;
- if (!strcmp(arg, "--advertise-refs")) {
- advertise_refs = 1;
- continue;
- }
- if (!strcmp(arg, "--stateless-rpc")) {
- stateless_rpc = 1;
- continue;
- }
- if (!strcmp(arg, "--strict")) {
- strict = 1;
- continue;
- }
- if (starts_with(arg, "--timeout=")) {
- timeout = atoi(arg+10);
- daemon_mode = 1;
- continue;
- }
- if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- }
-
- if (i != argc-1)
- usage(upload_pack_usage);
-
+ argc = parse_options(argc, (const char **)argv, NULL, options, upload_pack_usage, 0);
+ if (timeout != 0)
+ daemon_mode = 1;
setup_path();
- dir = argv[i];
+ dir = argv[0];
if (!enter_repo(dir, strict))
die("'%s' does not appear to be a git repository", dir);
--
2.8.2.403.gaa9c3f6
next reply other threads:[~2016-05-18 16:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 16:40 Antoine Queru [this message]
2016-05-18 18:08 ` [PATCH] upload-pack.c: use of parse-options API Jeff King
2016-05-19 10:10 ` Antoine Queru
2016-05-19 11:57 ` Jeff King
2016-05-19 14:36 ` Matthieu Moy
2016-05-19 15:39 ` [PATCH v2] " Antoine Queru
2016-05-19 16:10 ` Matthieu Moy
2016-05-19 16:46 ` Junio C Hamano
2016-05-20 6:55 ` Matthieu Moy
2016-05-19 16:58 ` Junio C Hamano
2016-05-20 6:53 ` Matthieu Moy
2016-05-20 16:52 ` Junio C Hamano
2016-05-23 13:02 ` [PATCH v3] " Antoine Queru
2016-05-23 18:03 ` Matthieu Moy
2016-05-27 14:16 ` [PATCH v4] " Antoine Queru
2016-05-27 14:52 ` Matthieu Moy
2016-05-27 16:59 ` Eric Sunshine
2016-05-30 14:27 ` Antoine Queru
2016-05-30 14:53 ` [PATCH v5] upload-pack.c: use " Antoine Queru
2016-05-30 15:06 ` Matthieu Moy
2016-05-30 19:26 ` Junio C Hamano
2016-05-31 9:53 ` Antoine Queru
2016-05-31 11:27 ` Matthieu Moy
2016-05-31 17:16 ` Junio C Hamano
2016-06-01 15:49 ` Antoine Queru
2016-05-31 9:57 ` [PATCH v6] " Antoine Queru
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160518164019.26443-1-Antoine.Queru@ensimag.grenoble-inp.fr \
--to=antoine.queru@ensimag.grenoble-inp.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.queru@grenoble-inp.fr \
--cc=francois.beutin@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=simon.rabourg@ensimag.grenoble-inp.fr \
--cc=william.duclot@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).