From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
Mark Strapetz <marc.strapetz@syntevo.com>,
Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v5 2/3] quote: implement sq_quotef()
Date: Fri, 26 Feb 2016 16:13:19 -0800 [thread overview]
Message-ID: <1456532000-22971-3-git-send-email-jacob.e.keller@intel.com> (raw)
In-Reply-To: <1456532000-22971-1-git-send-email-jacob.e.keller@intel.com>
From: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
---
quote.c | 13 +++++++++++++
quote.h | 3 +++
2 files changed, 16 insertions(+)
diff --git a/quote.c b/quote.c
index fe884d24521f..b281a8fe454e 100644
--- a/quote.c
+++ b/quote.c
@@ -43,6 +43,19 @@ void sq_quote_buf(struct strbuf *dst, const char *src)
free(to_free);
}
+void sq_quotef(struct strbuf *dst, const char *fmt, ...)
+{
+ struct strbuf src = STRBUF_INIT;
+
+ va_list ap;
+ va_start(ap, fmt);
+ strbuf_vaddf(&src, fmt, ap);
+ va_end(ap);
+
+ sq_quote_buf(dst, src.buf);
+ strbuf_release(&src);
+}
+
void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
{
int i;
diff --git a/quote.h b/quote.h
index 99e04d34bf22..6c53a2cc66c4 100644
--- a/quote.h
+++ b/quote.h
@@ -25,10 +25,13 @@ struct strbuf;
* sq_quote_buf() writes to an existing buffer of specified size; it
* will return the number of characters that would have been written
* excluding the final null regardless of the buffer size.
+ *
+ * sq_quotef() quotes the entire formatted string as a single result.
*/
extern void sq_quote_buf(struct strbuf *, const char *src);
extern void sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen);
+extern void sq_quotef(struct strbuf *, const char *fmt, ...);
/* This unwraps what sq_quote() produces in place, but returns
* NULL if the input does not look like what sq_quote would have
--
2.7.1.429.g45cd78e
next prev parent reply other threads:[~2016-02-27 0:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 0:13 [PATCH v5 0/3] pass credential.* to submodules Jacob Keller
2016-02-27 0:13 ` [PATCH v5 1/3] sumodule--helper: fix submodule--helper clone usage and check argc count Jacob Keller
2016-02-29 17:49 ` Junio C Hamano
2016-02-29 19:34 ` Jacob Keller
2016-02-29 19:44 ` Junio C Hamano
2016-02-29 22:05 ` Jacob Keller
2016-02-27 0:13 ` Jacob Keller [this message]
2016-02-27 0:13 ` [PATCH v5 3/3] git: submodule honor -c credential.* from command line Jacob Keller
2016-02-29 18:20 ` Junio C Hamano
2016-02-29 19:37 ` Jacob Keller
2016-02-29 19:47 ` Junio C Hamano
2016-02-29 22:09 ` Jacob Keller
2016-02-27 0:37 ` [PATCH v5 0/3] pass credential.* to submodules Jacob Keller
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=1456532000-22971-3-git-send-email-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=marc.strapetz@syntevo.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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).