mirror of
https://github.com/git/git.git
synced 2024-11-16 14:04:52 +01:00
c2e86addb8
Fix warnings from 'make check'. - These files don't include 'builtin.h' causing sparse to complain that cmd_* isn't declared: builtin/clone.c:364, builtin/fetch-pack.c:797, builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78, builtin/merge-index.c:69, builtin/merge-recursive.c:22 builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426 builtin/notes.c:822, builtin/pack-redundant.c:596, builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149, builtin/remote.c:1512, builtin/remote-ext.c:240, builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384, builtin/unpack-file.c:25, builtin/var.c:75 - These files have symbols which should be marked static since they're only file scope: submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13, submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79, unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123, url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48 - These files redeclare symbols to be different types: builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571, usage.c:49, usage.c:58, usage.c:63, usage.c:72 - These files use a literal integer 0 when they really should use a NULL pointer: daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362 While we're in the area, clean up some unused #includes in builtin files (mostly exec_cmd.h). Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
155 lines
3 KiB
C
155 lines
3 KiB
C
#include "builtin.h"
|
|
|
|
static void flush_current_id(int patchlen, unsigned char *id, git_SHA_CTX *c)
|
|
{
|
|
unsigned char result[20];
|
|
char name[50];
|
|
|
|
if (!patchlen)
|
|
return;
|
|
|
|
git_SHA1_Final(result, c);
|
|
memcpy(name, sha1_to_hex(id), 41);
|
|
printf("%s %s\n", sha1_to_hex(result), name);
|
|
git_SHA1_Init(c);
|
|
}
|
|
|
|
static int remove_space(char *line)
|
|
{
|
|
char *src = line;
|
|
char *dst = line;
|
|
unsigned char c;
|
|
|
|
while ((c = *src++) != '\0') {
|
|
if (!isspace(c))
|
|
*dst++ = c;
|
|
}
|
|
return dst - line;
|
|
}
|
|
|
|
static int scan_hunk_header(const char *p, int *p_before, int *p_after)
|
|
{
|
|
static const char digits[] = "0123456789";
|
|
const char *q, *r;
|
|
int n;
|
|
|
|
q = p + 4;
|
|
n = strspn(q, digits);
|
|
if (q[n] == ',') {
|
|
q += n + 1;
|
|
n = strspn(q, digits);
|
|
}
|
|
if (n == 0 || q[n] != ' ' || q[n+1] != '+')
|
|
return 0;
|
|
|
|
r = q + n + 2;
|
|
n = strspn(r, digits);
|
|
if (r[n] == ',') {
|
|
r += n + 1;
|
|
n = strspn(r, digits);
|
|
}
|
|
if (n == 0)
|
|
return 0;
|
|
|
|
*p_before = atoi(q);
|
|
*p_after = atoi(r);
|
|
return 1;
|
|
}
|
|
|
|
static int get_one_patchid(unsigned char *next_sha1, git_SHA_CTX *ctx)
|
|
{
|
|
static char line[1000];
|
|
int patchlen = 0, found_next = 0;
|
|
int before = -1, after = -1;
|
|
|
|
while (fgets(line, sizeof(line), stdin) != NULL) {
|
|
char *p = line;
|
|
int len;
|
|
|
|
if (!memcmp(line, "diff-tree ", 10))
|
|
p += 10;
|
|
else if (!memcmp(line, "commit ", 7))
|
|
p += 7;
|
|
else if (!memcmp(line, "From ", 5))
|
|
p += 5;
|
|
else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line))
|
|
continue;
|
|
|
|
if (!get_sha1_hex(p, next_sha1)) {
|
|
found_next = 1;
|
|
break;
|
|
}
|
|
|
|
/* Ignore commit comments */
|
|
if (!patchlen && memcmp(line, "diff ", 5))
|
|
continue;
|
|
|
|
/* Parsing diff header? */
|
|
if (before == -1) {
|
|
if (!memcmp(line, "index ", 6))
|
|
continue;
|
|
else if (!memcmp(line, "--- ", 4))
|
|
before = after = 1;
|
|
else if (!isalpha(line[0]))
|
|
break;
|
|
}
|
|
|
|
/* Looking for a valid hunk header? */
|
|
if (before == 0 && after == 0) {
|
|
if (!memcmp(line, "@@ -", 4)) {
|
|
/* Parse next hunk, but ignore line numbers. */
|
|
scan_hunk_header(line, &before, &after);
|
|
continue;
|
|
}
|
|
|
|
/* Split at the end of the patch. */
|
|
if (memcmp(line, "diff ", 5))
|
|
break;
|
|
|
|
/* Else we're parsing another header. */
|
|
before = after = -1;
|
|
}
|
|
|
|
/* If we get here, we're inside a hunk. */
|
|
if (line[0] == '-' || line[0] == ' ')
|
|
before--;
|
|
if (line[0] == '+' || line[0] == ' ')
|
|
after--;
|
|
|
|
/* Compute the sha without whitespace */
|
|
len = remove_space(line);
|
|
patchlen += len;
|
|
git_SHA1_Update(ctx, line, len);
|
|
}
|
|
|
|
if (!found_next)
|
|
hashclr(next_sha1);
|
|
|
|
return patchlen;
|
|
}
|
|
|
|
static void generate_id_list(void)
|
|
{
|
|
unsigned char sha1[20], n[20];
|
|
git_SHA_CTX ctx;
|
|
int patchlen;
|
|
|
|
git_SHA1_Init(&ctx);
|
|
hashclr(sha1);
|
|
while (!feof(stdin)) {
|
|
patchlen = get_one_patchid(n, &ctx);
|
|
flush_current_id(patchlen, sha1, &ctx);
|
|
hashcpy(sha1, n);
|
|
}
|
|
}
|
|
|
|
static const char patch_id_usage[] = "git patch-id < patch";
|
|
|
|
int cmd_patch_id(int argc, const char **argv, const char *prefix)
|
|
{
|
|
if (argc != 1)
|
|
usage(patch_id_usage);
|
|
|
|
generate_id_list();
|
|
return 0;
|
|
}
|