From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: [PATCH 3/4] connect: learn to parse capabilities with values
Date: Fri, 10 Aug 2012 03:58:16 -0400 [thread overview]
Message-ID: <20120810075816.GC8399@sigill.intra.peff.net> (raw)
In-Reply-To: <20120810075342.GA30072@sigill.intra.peff.net>
We already take care to parse a capability like "foo=bar"
properly, but the code does not provide a good way of
actually finding out what is on the right-hand side of the
"=".
Signed-off-by: Jeff King <peff@peff.net>
---
cache.h | 2 ++
connect.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/cache.h b/cache.h
index 06413e1..3811c66 100644
--- a/cache.h
+++ b/cache.h
@@ -1030,7 +1030,9 @@ struct extra_have_objects {
};
extern struct ref **get_remote_heads(int in, struct ref **list, unsigned int flags, struct extra_have_objects *);
extern int server_supports(const char *feature);
+extern char *server_feature_value(const char *feature);
extern const char *parse_feature_request(const char *features, const char *feature);
+extern char *parse_feature_request_value(const char *features, const char *feature);
extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
diff --git a/connect.c b/connect.c
index 912cdde..6bd2531 100644
--- a/connect.c
+++ b/connect.c
@@ -104,6 +104,11 @@ int server_supports(const char *feature)
return !!parse_feature_request(server_capabilities, feature);
}
+char *server_feature_value(const char *feature)
+{
+ return parse_feature_request_value(server_capabilities, feature);
+}
+
const char *parse_feature_request(const char *feature_list, const char *feature)
{
int len;
@@ -124,6 +129,33 @@ const char *parse_feature_request(const char *feature_list, const char *feature)
return NULL;
}
+/*
+ * Parse features of the form "feature=value". Returns NULL if the feature
+ * does not exist, the empty string if it exists but does not have an "=", or
+ * the content to the right of the "=" until the first space (or end of
+ * string). The cannot contain literal spaces; double-quoting or similar
+ * schemes would break compatibility, since older versions of git treat the
+ * space as a hard-delimiter without any context.
+ *
+ * The return value (if non-NULL) is newly allocated on the heap and belongs to
+ * the caller.
+ */
+char *parse_feature_request_value(const char *feature_list, const char *feature)
+{
+ const char *start = parse_feature_request(feature_list, feature);
+ const char *end;
+
+ if (!start || prefixcmp(start, feature))
+ return NULL;
+ start += strlen(feature);
+
+ if (*start == '=')
+ start++;
+ end = strchrnul(start, ' ');
+
+ return xmemdupz(start, end - start);
+}
+
enum protocol {
PROTO_LOCAL = 1,
PROTO_SSH,
--
1.7.12.rc2.4.g7f05cf9
next prev parent reply other threads:[~2012-08-10 7:58 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 7:53 [PATCH 0/4] jk/version-string and google code Jeff King
2012-08-10 7:57 ` [PATCH 1/4] send-pack: fix capability-sending logic Jeff King
2012-08-10 7:57 ` [PATCH 2/4] do not send client agent unless server does first Jeff King
2012-08-10 19:45 ` Junio C Hamano
2012-08-10 21:09 ` Jeff King
2012-08-10 7:58 ` Jeff King [this message]
2012-08-10 8:06 ` [PATCH 3/4] connect: learn to parse capabilities with values Eric Sunshine
2012-08-10 20:01 ` Junio C Hamano
2012-08-10 21:15 ` Jeff King
2012-08-10 21:55 ` Junio C Hamano
2012-08-13 19:03 ` Junio C Hamano
2012-08-13 19:07 ` [PATCH 4/4] fetch-pack: mention server version with verbose output Junio C Hamano
2012-08-13 19:43 ` Junio C Hamano
2012-08-13 20:54 ` Jeff King
2012-08-13 21:07 ` Junio C Hamano
2012-08-13 21:07 ` Jeff King
2012-08-13 21:09 ` Junio C Hamano
2012-08-13 21:11 ` Jeff King
2012-08-14 1:59 ` Jeff King
2012-08-14 2:02 ` Jeff King
2012-08-14 4:56 ` Junio C Hamano
2012-08-10 7:59 ` Jeff King
2012-08-10 15:34 ` [PATCH 0/4] jk/version-string and google code Junio C Hamano
2012-08-10 17:46 ` Jeff King
2012-08-10 18:52 ` Junio C Hamano
2012-08-10 21:50 ` Jeff King
2012-08-10 22:29 ` Shawn Pearce
2012-08-10 22:36 ` Junio C Hamano
2012-08-10 15:37 ` Junio C Hamano
2012-08-10 18:06 ` Dave Borowitz
2012-08-10 18:08 ` Jeff King
2012-08-10 18:13 ` Dave Borowitz
2012-08-10 18:25 ` Jeff King
2012-08-10 21:25 ` Junio C Hamano
2012-08-10 21:35 ` Jeff King
2012-08-10 21:42 ` Junio C Hamano
2012-08-10 19:11 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120810075816.GC8399@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
/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.
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 NNTP newsgroup(s).