mirror of
https://git.yoctoproject.org/poky
synced 2026-02-25 10:59:41 +01:00
fc1ba0b67f
git versions < 2.5.5 & 2.7.4 (From OE-Core rev: 64ff6226d0c927c05fc42fd9ca8b31bac129b16d) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
90 lines
2.4 KiB
Diff
90 lines
2.4 KiB
Diff
From 8eee9f9277b6e38ec46c84f4ca3be5d988ca0a33 Mon Sep 17 00:00:00 2001
|
|
From: Jeff King <peff@peff.net>
|
|
Date: Thu, 11 Feb 2016 17:24:18 -0500
|
|
Subject: [PATCH] show_object_with_name: simplify by using path_name()
|
|
|
|
When "git rev-list" shows an object with its associated path
|
|
name, it does so by walking the name_path linked list and
|
|
printing each component (stopping at any embedded NULs or
|
|
newlines).
|
|
|
|
We'd like to eventually get rid of name_path entirely in
|
|
favor of a single buffer, and dropping this custom printing
|
|
code is part of that. As a first step, let's use path_name()
|
|
to format the list into a single buffer, and print that.
|
|
This is strictly less efficient than the original, but it's
|
|
a temporary step in the refactoring; our end game will be to
|
|
get the fully formatted name in the first place.
|
|
|
|
Signed-off-by: Jeff King <peff@peff.net>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
|
|
Upstream-Status: Backport
|
|
CVE: CVE-2016-2315 patch2
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
revision.c | 40 ++++++----------------------------------
|
|
1 file changed, 6 insertions(+), 34 deletions(-)
|
|
|
|
diff --git a/revision.c b/revision.c
|
|
index 0b322b4..cf544b6 100644
|
|
--- a/revision.c
|
|
+++ b/revision.c
|
|
@@ -45,46 +45,18 @@ char *path_name(const struct name_path *path, const char *name)
|
|
return n;
|
|
}
|
|
|
|
-static int show_path_component_truncated(FILE *out, const char *name, int len)
|
|
-{
|
|
- int cnt;
|
|
- for (cnt = 0; cnt < len; cnt++) {
|
|
- int ch = name[cnt];
|
|
- if (!ch || ch == '\n')
|
|
- return -1;
|
|
- fputc(ch, out);
|
|
- }
|
|
- return len;
|
|
-}
|
|
-
|
|
-static int show_path_truncated(FILE *out, const struct name_path *path)
|
|
-{
|
|
- int emitted, ours;
|
|
-
|
|
- if (!path)
|
|
- return 0;
|
|
- emitted = show_path_truncated(out, path->up);
|
|
- if (emitted < 0)
|
|
- return emitted;
|
|
- if (emitted)
|
|
- fputc('/', out);
|
|
- ours = show_path_component_truncated(out, path->elem, path->elem_len);
|
|
- if (ours < 0)
|
|
- return ours;
|
|
- return ours || emitted;
|
|
-}
|
|
-
|
|
void show_object_with_name(FILE *out, struct object *obj,
|
|
const struct name_path *path, const char *component)
|
|
{
|
|
- struct name_path leaf;
|
|
- leaf.up = (struct name_path *)path;
|
|
- leaf.elem = component;
|
|
- leaf.elem_len = strlen(component);
|
|
+ char *name = path_name(path, component);
|
|
+ char *p;
|
|
|
|
fprintf(out, "%s ", sha1_to_hex(obj->sha1));
|
|
- show_path_truncated(out, &leaf);
|
|
+ for (p = name; *p && *p != '\n'; p++)
|
|
+ fputc(*p, out);
|
|
fputc('\n', out);
|
|
+
|
|
+ free(name);
|
|
}
|
|
|
|
static void mark_blob_uninteresting(struct blob *blob)
|
|
--
|
|
2.7.4
|
|
|