summaryrefslogtreecommitdiff
path: root/quote.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2006-09-11 04:59:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-11 05:47:30 (GMT)
commit86257aa324d04694408ad806989690979456f29a (patch)
treebae4aa0e26b35249d434edea718c9feb3cc644dd /quote.c
parent8be683520e5a00cb7bd67acfd71d9346c33305b2 (diff)
downloadgit-86257aa324d04694408ad806989690979456f29a.zip
git-86257aa324d04694408ad806989690979456f29a.tar.gz
git-86257aa324d04694408ad806989690979456f29a.tar.bz2
Move add_to_string to "quote.c" and make it extern.
So that this function may be used in places other than "rsh.c". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'quote.c')
-rw-r--r--quote.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/quote.c b/quote.c
index a38786c..e3a4d4a 100644
--- a/quote.c
+++ b/quote.c
@@ -106,6 +106,35 @@ char *sq_quote_argv(const char** argv, int count)
return buf;
}
+/*
+ * Append a string to a string buffer, with or without shell quoting.
+ * Return true if the buffer overflowed.
+ */
+int add_to_string(char **ptrp, int *sizep, const char *str, int quote)
+{
+ char *p = *ptrp;
+ int size = *sizep;
+ int oc;
+ int err = 0;
+
+ if (quote)
+ oc = sq_quote_buf(p, size, str);
+ else {
+ oc = strlen(str);
+ memcpy(p, str, (size <= oc) ? size - 1 : oc);
+ }
+
+ if (size <= oc) {
+ err = 1;
+ oc = size - 1;
+ }
+
+ *ptrp += oc;
+ **ptrp = '\0';
+ *sizep -= oc;
+ return err;
+}
+
char *sq_dequote(char *arg)
{
char *dst = arg;