This is in preparation of relative path support for ls-files, which
quotes a path only if the line terminator is not the NUL character.
Signed-off-by: Clemens Buchacher <drizzd@xxxxxx>
---
On Wed, Jun 02, 2010 at 04:36:56PM -0700, Junio C Hamano wrote:
> * cb/ls-files-cdup (2010-05-26) 1 commit
> - ls-files: allow relative pathspec
>
> Doesn't write_name() quote twice when prefix_offset is non-zero?
Yes. Fixed in the following two patches.
quote.c | 69 +++++++++++++++++++++++++++++++++++++++++---------------------
quote.h | 8 ++++++-
2 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/quote.c b/quote.c
index fc93435..2ae2c1f 100644
--- a/quote.c
+++ b/quote.c
@@ -295,42 +295,63 @@ void write_name_quotedpfx(const char *pfx, size_t pfxlen,
fputc(terminator, fp);
}
-/* quote path as relative to the given prefix */
-char *quote_path_relative(const char *in, int len,
- struct strbuf *out, const char *prefix)
+void write_name_quoted_relative(const char *name, size_t len,
+ const char *prefix, size_t prefix_len,
+ FILE *fp, int terminator)
{
- int needquote;
+ struct strbuf sb = STRBUF_INIT;
+ char *path = path_relative(name, len, &sb, prefix, prefix_len);
+ write_name_quoted(path, fp, terminator);
+
+ strbuf_release(&sb);
+}
+
+/* give path as relative to prefix */
+char *path_relative(const char *in, int len,
+ struct strbuf *out, const char *prefix, int prefix_len)
+{
if (len < 0)
len = strlen(in);
+ if (prefix && prefix_len < 0)
+ prefix_len = strlen(prefix);
- /* "../" prefix itself does not need quoting, but "in" might. */
- needquote = next_quote_pos(in, len) < len;
strbuf_setlen(out, 0);
strbuf_grow(out, len);
- if (needquote)
- strbuf_addch(out, '"');
- if (prefix) {
- int off = 0;
- while (prefix[off] && off < len && prefix[off] == in[off])
- if (prefix[off] == '/') {
- prefix += off + 1;
- in += off + 1;
- len -= off + 1;
- off = 0;
- } else
- off++;
-
- for (; *prefix; prefix++)
- if (*prefix == '/')
+ if (prefix_len > 0) {
+ int off = 0, i = 0;
+ while (i < prefix_len && i < len && prefix[i] == in[i]) {
+ if (prefix[i] == '/')
+ off = i + 1;
+ i++;
+ }
+ in += off;
+ len -= off;
+
+ while (i < prefix_len) {
+ if (prefix[i] == '/')
strbuf_addstr(out, "../");
+ i++;
+ }
}
+ strbuf_add(out, in, len);
+
+ return out->buf;
+}
+
+/* quote path as relative to the given prefix */
+char *quote_path_relative(const char *in, int len,
+ struct strbuf *out, const char *prefix)
+{
+ char *rel;
+ size_t rel_len;
- quote_c_style_counted (in, len, out, NULL, 1);
+ path_relative(in, len, out, prefix, -1);
+ rel = strbuf_detach(out, &rel_len);
+ quote_c_style_counted(rel, rel_len, out, NULL, 0);
+ free(rel);
- if (needquote)
- strbuf_addch(out, '"');
if (!out->len)
strbuf_addstr(out, "./");
diff --git a/quote.h b/quote.h
index f83eb23..e9e0221 100644
--- a/quote.h
+++ b/quote.h
@@ -54,9 +54,15 @@ extern void quote_two_c_style(struct strbuf *, const char *, const char *, int);
extern void write_name_quoted(const char *name, FILE *, int terminator);
extern void write_name_quotedpfx(const char *pfx, size_t pfxlen,
const char *name, FILE *, int terminator);
+extern void write_name_quoted_relative(const char *name, size_t len,
+ const char *prefix, size_t prefix_len,
+ FILE *fp, int terminator);
+/* give path as relative to prefix */
+extern char *path_relative(const char *in, int len,
+ struct strbuf *out, const char *prefix, int prefix_len);
/* quote path as relative to the given prefix */
-char *quote_path_relative(const char *in, int len,
+extern char *quote_path_relative(const char *in, int len,
struct strbuf *out, const char *prefix);
/* quoting as a string literal for other languages */
--
1.7.1.2.g2a651
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html