2006-04-05 17:03:58 +08:00
|
|
|
#include "cache.h"
|
|
|
|
#include "xdiff-interface.h"
|
|
|
|
|
2006-04-07 13:29:55 +08:00
|
|
|
static int parse_num(char **cp_p, int *num_p)
|
2006-04-06 03:22:35 +08:00
|
|
|
{
|
|
|
|
char *cp = *cp_p;
|
2006-04-07 13:29:55 +08:00
|
|
|
int num = 0;
|
2006-04-06 03:22:35 +08:00
|
|
|
int read_some;
|
|
|
|
|
|
|
|
while ('0' <= *cp && *cp <= '9')
|
|
|
|
num = num * 10 + *cp++ - '0';
|
|
|
|
if (!(read_some = cp - *cp_p))
|
|
|
|
return -1;
|
|
|
|
*cp_p = cp;
|
|
|
|
*num_p = num;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int parse_hunk_header(char *line, int len,
|
2006-04-07 13:29:55 +08:00
|
|
|
int *ob, int *on,
|
|
|
|
int *nb, int *nn)
|
2006-04-06 03:22:35 +08:00
|
|
|
{
|
|
|
|
char *cp;
|
|
|
|
cp = line + 4;
|
|
|
|
if (parse_num(&cp, ob)) {
|
|
|
|
bad_line:
|
|
|
|
return error("malformed diff output: %s", line);
|
|
|
|
}
|
|
|
|
if (*cp == ',') {
|
|
|
|
cp++;
|
|
|
|
if (parse_num(&cp, on))
|
|
|
|
goto bad_line;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*on = 1;
|
|
|
|
if (*cp++ != ' ' || *cp++ != '+')
|
|
|
|
goto bad_line;
|
|
|
|
if (parse_num(&cp, nb))
|
|
|
|
goto bad_line;
|
|
|
|
if (*cp == ',') {
|
|
|
|
cp++;
|
|
|
|
if (parse_num(&cp, nn))
|
|
|
|
goto bad_line;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*nn = 1;
|
|
|
|
return -!!memcmp(cp, " @@", 3);
|
|
|
|
}
|
|
|
|
|
2006-04-05 17:03:58 +08:00
|
|
|
static void consume_one(void *priv_, char *s, unsigned long size)
|
|
|
|
{
|
|
|
|
struct xdiff_emit_state *priv = priv_;
|
|
|
|
char *ep;
|
|
|
|
while (size) {
|
|
|
|
unsigned long this_size;
|
|
|
|
ep = memchr(s, '\n', size);
|
|
|
|
this_size = (ep == NULL) ? size : (ep - s + 1);
|
|
|
|
priv->consume(priv, s, this_size);
|
|
|
|
size -= this_size;
|
|
|
|
s += this_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Make xdi_diff_outf interface for running xdiff_outf diffs
To prepare for the need to initialize and release resources for an
xdi_diff with the xdiff_outf output function, make a new function to
wrap this usage.
Old:
ecb.outf = xdiff_outf;
ecb.priv = &state;
...
xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
New:
xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);
Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-14 13:36:50 +08:00
|
|
|
static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
|
2006-04-05 17:03:58 +08:00
|
|
|
{
|
|
|
|
struct xdiff_emit_state *priv = priv_;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < nbuf; i++) {
|
|
|
|
if (mb[i].ptr[mb[i].size-1] != '\n') {
|
|
|
|
/* Incomplete line */
|
2006-08-26 22:16:18 +08:00
|
|
|
priv->remainder = xrealloc(priv->remainder,
|
|
|
|
priv->remainder_size +
|
|
|
|
mb[i].size);
|
2006-04-05 17:03:58 +08:00
|
|
|
memcpy(priv->remainder + priv->remainder_size,
|
|
|
|
mb[i].ptr, mb[i].size);
|
|
|
|
priv->remainder_size += mb[i].size;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we have a complete line */
|
|
|
|
if (!priv->remainder) {
|
|
|
|
consume_one(priv, mb[i].ptr, mb[i].size);
|
|
|
|
continue;
|
|
|
|
}
|
2006-08-26 22:16:18 +08:00
|
|
|
priv->remainder = xrealloc(priv->remainder,
|
|
|
|
priv->remainder_size +
|
|
|
|
mb[i].size);
|
2006-04-05 17:03:58 +08:00
|
|
|
memcpy(priv->remainder + priv->remainder_size,
|
|
|
|
mb[i].ptr, mb[i].size);
|
|
|
|
consume_one(priv, priv->remainder,
|
|
|
|
priv->remainder_size + mb[i].size);
|
|
|
|
free(priv->remainder);
|
|
|
|
priv->remainder = NULL;
|
|
|
|
priv->remainder_size = 0;
|
|
|
|
}
|
|
|
|
if (priv->remainder) {
|
|
|
|
consume_one(priv, priv->remainder, priv->remainder_size);
|
|
|
|
free(priv->remainder);
|
|
|
|
priv->remainder = NULL;
|
|
|
|
priv->remainder_size = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-21 00:37:07 +08:00
|
|
|
|
2007-12-14 06:24:18 +08:00
|
|
|
/*
|
|
|
|
* Trim down common substring at the end of the buffers,
|
|
|
|
* but leave at least ctx lines at the end.
|
|
|
|
*/
|
2007-12-15 04:00:42 +08:00
|
|
|
static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
|
2007-12-14 06:24:18 +08:00
|
|
|
{
|
|
|
|
const int blk = 1024;
|
2007-12-16 15:06:14 +08:00
|
|
|
long trimmed = 0, recovered = 0;
|
2007-12-14 06:24:18 +08:00
|
|
|
char *ap = a->ptr + a->size;
|
|
|
|
char *bp = b->ptr + b->size;
|
|
|
|
long smaller = (a->size < b->size) ? a->size : b->size;
|
|
|
|
|
2007-12-21 12:22:46 +08:00
|
|
|
if (ctx)
|
|
|
|
return;
|
|
|
|
|
2007-12-14 06:24:18 +08:00
|
|
|
while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
|
|
|
|
trimmed += blk;
|
|
|
|
ap -= blk;
|
|
|
|
bp -= blk;
|
|
|
|
}
|
|
|
|
|
2007-12-21 12:22:46 +08:00
|
|
|
while (recovered < trimmed)
|
2007-12-16 15:06:14 +08:00
|
|
|
if (ap[recovered++] == '\n')
|
2007-12-21 12:22:46 +08:00
|
|
|
break;
|
|
|
|
a->size -= trimmed - recovered;
|
|
|
|
b->size -= trimmed - recovered;
|
2007-12-14 06:24:18 +08:00
|
|
|
}
|
|
|
|
|
2007-12-14 05:25:07 +08:00
|
|
|
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
|
|
|
|
{
|
2007-12-14 06:24:18 +08:00
|
|
|
mmfile_t a = *mf1;
|
|
|
|
mmfile_t b = *mf2;
|
|
|
|
|
|
|
|
trim_common_tail(&a, &b, xecfg->ctxlen);
|
|
|
|
|
|
|
|
return xdl_diff(&a, &b, xpp, xecfg, xecb);
|
2007-12-14 05:25:07 +08:00
|
|
|
}
|
|
|
|
|
Make xdi_diff_outf interface for running xdiff_outf diffs
To prepare for the need to initialize and release resources for an
xdi_diff with the xdiff_outf output function, make a new function to
wrap this usage.
Old:
ecb.outf = xdiff_outf;
ecb.priv = &state;
...
xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
New:
xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);
Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-14 13:36:50 +08:00
|
|
|
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
|
|
|
|
struct xdiff_emit_state *state, xpparam_t const *xpp,
|
|
|
|
xdemitconf_t const *xecfg, xdemitcb_t *xecb)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
xecb->outf = xdiff_outf;
|
|
|
|
xecb->priv = state;
|
|
|
|
ret = xdi_diff(mf1, mf2, xpp, xecfg, xecb);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-12-21 00:37:07 +08:00
|
|
|
int read_mmfile(mmfile_t *ptr, const char *filename)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
FILE *f;
|
2007-03-07 09:44:37 +08:00
|
|
|
size_t sz;
|
2006-12-21 00:37:07 +08:00
|
|
|
|
|
|
|
if (stat(filename, &st))
|
|
|
|
return error("Could not stat %s", filename);
|
|
|
|
if ((f = fopen(filename, "rb")) == NULL)
|
|
|
|
return error("Could not open %s", filename);
|
2007-03-07 09:44:37 +08:00
|
|
|
sz = xsize_t(st.st_size);
|
2008-03-13 23:19:35 +08:00
|
|
|
ptr->ptr = xmalloc(sz ? sz : 1);
|
|
|
|
if (sz && fread(ptr->ptr, sz, 1, f) != 1)
|
2006-12-21 00:37:07 +08:00
|
|
|
return error("Could not read %s", filename);
|
|
|
|
fclose(f);
|
2007-03-07 09:44:37 +08:00
|
|
|
ptr->size = sz;
|
2006-12-21 00:37:07 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-05 10:36:11 +08:00
|
|
|
#define FIRST_FEW_BYTES 8000
|
|
|
|
int buffer_is_binary(const char *ptr, unsigned long size)
|
|
|
|
{
|
|
|
|
if (FIRST_FEW_BYTES < size)
|
|
|
|
size = FIRST_FEW_BYTES;
|
|
|
|
return !!memchr(ptr, 0, size);
|
|
|
|
}
|
2007-07-06 15:45:10 +08:00
|
|
|
|
|
|
|
struct ff_regs {
|
|
|
|
int nr;
|
|
|
|
struct ff_reg {
|
|
|
|
regex_t re;
|
|
|
|
int negate;
|
|
|
|
} *array;
|
|
|
|
};
|
|
|
|
|
|
|
|
static long ff_regexp(const char *line, long len,
|
|
|
|
char *buffer, long buffer_size, void *priv)
|
|
|
|
{
|
|
|
|
char *line_buffer = xstrndup(line, len); /* make NUL terminated */
|
|
|
|
struct ff_regs *regs = priv;
|
|
|
|
regmatch_t pmatch[2];
|
|
|
|
int result = 0, i;
|
|
|
|
|
|
|
|
for (i = 0; i < regs->nr; i++) {
|
|
|
|
struct ff_reg *reg = regs->array + i;
|
|
|
|
if (reg->negate ^ !!regexec(®->re,
|
|
|
|
line_buffer, 2, pmatch, 0)) {
|
|
|
|
free(line_buffer);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
i = pmatch[1].rm_so >= 0 ? 1 : 0;
|
|
|
|
line += pmatch[i].rm_so;
|
|
|
|
result = pmatch[i].rm_eo - pmatch[i].rm_so;
|
|
|
|
if (result > buffer_size)
|
|
|
|
result = buffer_size;
|
|
|
|
else
|
|
|
|
while (result > 0 && (isspace(line[result - 1]) ||
|
|
|
|
line[result - 1] == '\n'))
|
|
|
|
result--;
|
|
|
|
memcpy(buffer, line, result);
|
|
|
|
free(line_buffer);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct ff_regs *regs;
|
|
|
|
|
|
|
|
xecfg->find_func = ff_regexp;
|
|
|
|
regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
|
|
|
|
for (i = 0, regs->nr = 1; value[i]; i++)
|
|
|
|
if (value[i] == '\n')
|
|
|
|
regs->nr++;
|
|
|
|
regs->array = xmalloc(regs->nr * sizeof(struct ff_reg));
|
|
|
|
for (i = 0; i < regs->nr; i++) {
|
|
|
|
struct ff_reg *reg = regs->array + i;
|
|
|
|
const char *ep = strchr(value, '\n'), *expression;
|
|
|
|
char *buffer = NULL;
|
|
|
|
|
|
|
|
reg->negate = (*value == '!');
|
|
|
|
if (reg->negate && i == regs->nr - 1)
|
|
|
|
die("Last expression must not be negated: %s", value);
|
|
|
|
if (*value == '!')
|
|
|
|
value++;
|
|
|
|
if (ep)
|
|
|
|
expression = buffer = xstrndup(value, ep - value);
|
|
|
|
else
|
|
|
|
expression = value;
|
|
|
|
if (regcomp(®->re, expression, 0))
|
|
|
|
die("Invalid regexp to look for hunk header: %s", expression);
|
Avoid unnecessary "if-before-free" tests.
This change removes all obvious useless if-before-free tests.
E.g., it replaces code like this:
if (some_expression)
free (some_expression);
with the now-equivalent:
free (some_expression);
It is equivalent not just because POSIX has required free(NULL)
to work for a long time, but simply because it has worked for
so long that no reasonable porting target fails the test.
Here's some evidence from nearly 1.5 years ago:
http://www.winehq.org/pipermail/wine-patches/2006-October/031544.html
FYI, the change below was prepared by running the following:
git ls-files -z | xargs -0 \
perl -0x3b -pi -e \
's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s+(free\s*\(\s*\1\s*\))/$2/s'
Note however, that it doesn't handle brace-enclosed blocks like
"if (x) { free (x); }". But that's ok, since there were none like
that in git sources.
Beware: if you do use the above snippet, note that it can
produce syntactically invalid C code. That happens when the
affected "if"-statement has a matching "else".
E.g., it would transform this
if (x)
free (x);
else
foo ();
into this:
free (x);
else
foo ();
There were none of those here, either.
If you're interested in automating detection of the useless
tests, you might like the useless-if-before-free script in gnulib:
[it *does* detect brace-enclosed free statements, and has a --name=S
option to make it detect free-like functions with different names]
http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=build-aux/useless-if-before-free
Addendum:
Remove one more (in imap-send.c), spotted by Jean-Luc Herren <jlh@gmx.ch>.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-01 01:26:32 +08:00
|
|
|
free(buffer);
|
2007-07-06 15:45:10 +08:00
|
|
|
value = ep + 1;
|
|
|
|
}
|
|
|
|
}
|