kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

log-tree.c: cleanup a bit append_signoff() 

This patch clean up append_signoff() by moving specific code that
looks up for "^[-A-Za-z]+: [^@]+@" pattern into a function.

It also stops the primary search when the cursor oversteps
'buf + at' limit.

This patch changes slightly append_signoff() behaviour too. If we
detect any Signed-off-by pattern during the primary search, we
needn't to do a pattern research after.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Franck Bui-Huu 2006-08-29 13:37:06 +02:00 committed by Junio C Hamano
parent 28f5c70b85
commit fc1c75ec74
1 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
log-tree.c
View File

@ -12,44 +12,27 @@ static void show_parents(struct commit *commit, int abbrev)
} }
} }


static int append_signoff(char *buf, int buf_sz, int at, const char *signoff) /*
{ * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
int signoff_len = strlen(signoff); * Signed-off-by: and Acked-by: lines.
static const char signed_off_by[] = "Signed-off-by: ";
char *cp = buf;

/* Do we have enough space to add it? */
if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 3)
return at;

/* First see if we already have the sign-off by the signer */
while (1) {
cp = strstr(cp, signed_off_by);
if (!cp)
break;
cp += strlen(signed_off_by);
if ((cp + signoff_len < buf + at) &&
!strncmp(cp, signoff, signoff_len) &&
isspace(cp[signoff_len]))
return at; /* we already have him */
}

/* Does the last line already end with "^[-A-Za-z]+: [^@]+@"?
* If not, add a blank line to separate the message from
* the run of Signed-off-by: and Acked-by: lines.
*/ */
static int detect_any_signoff(char *letter, int size)
{ {
char ch; char ch, *cp;
int seen_colon, seen_at, seen_name, seen_head, not_signoff; int seen_colon = 0;
seen_colon = 0; int seen_at = 0;
seen_at = 0; int seen_name = 0;
seen_name = 0; int seen_head = 0;
seen_head = 0;
not_signoff = 0; cp = letter + size;
cp = buf + at; while (letter <= --cp && (ch = *cp) == '\n')
while (buf <= --cp && (ch = *cp) == '\n') continue;
;
while (!not_signoff && buf <= cp && (ch = *cp--) != '\n') { while (letter <= cp) {
ch = *cp--;
if (ch == '\n')
break;

if (!seen_at) { if (!seen_at) {
if (ch == '@') if (ch == '@')
seen_at = 1; seen_at = 1;
@ -57,7 +40,7 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
} }
if (!seen_colon) { if (!seen_colon) {
if (ch == '@') if (ch == '@')
not_signoff = 1; return 0;
else if (ch == ':') else if (ch == ':')
seen_colon = 1; seen_colon = 1;
else else
@ -70,11 +53,44 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
seen_head = 1; seen_head = 1;
continue; continue;
} }
not_signoff = 1; /* no empty last line doesn't match */
return 0;
} }
if (not_signoff || !seen_head || !seen_name) return seen_head && seen_name;
}

static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
{
static const char signed_off_by[] = "Signed-off-by: ";
int signoff_len = strlen(signoff);
int has_signoff = 0;
char *cp = buf;

/* Do we have enough space to add it? */
if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 3)
return at;

/* First see if we already have the sign-off by the signer */
while ((cp = strstr(cp, signed_off_by))) {

has_signoff = 1;

cp += strlen(signed_off_by);
if (cp + signoff_len >= buf + at)
break;
if (strncmp(cp, signoff, signoff_len))
continue;
if (!isspace(cp[signoff_len]))
continue;
/* we already have him */
return at;
}

if (!has_signoff)
has_signoff = detect_any_signoff(buf, at);

if (!has_signoff)
buf[at++] = '\n'; buf[at++] = '\n';
}


strcpy(buf + at, signed_off_by); strcpy(buf + at, signed_off_by);
at += strlen(signed_off_by); at += strlen(signed_off_by);