Skip to content

Commit

Permalink
Make read_one_header_line return a flag not a length.
Browse files Browse the repository at this point in the history
Currently we only use the return value from read_one_header line
to tell if the line we have read is a header or not.  So make
it a flag.  This paves the way for better email detection.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Eric W. Biederman authored and Junio C Hamano committed May 23, 2006
1 parent 405053d commit f8128cf
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ struct header_def {
int namelen;
};

static void check_header(char *line, int len, struct header_def *header)
static void check_header(char *line, struct header_def *header)
{
int i;

Expand All @@ -349,17 +349,17 @@ static void check_header(char *line, int len, struct header_def *header)
}
}

static void check_subheader_line(char *line, int len)
static void check_subheader_line(char *line)
{
static struct header_def header[] = {
{ "Content-Type", handle_subcontent_type },
{ "Content-Transfer-Encoding",
handle_content_transfer_encoding },
{ NULL },
};
check_header(line, len, header);
check_header(line, header);
}
static void check_header_line(char *line, int len)
static void check_header_line(char *line)
{
static struct header_def header[] = {
{ "From", handle_from },
Expand All @@ -370,7 +370,7 @@ static void check_header_line(char *line, int len)
handle_content_transfer_encoding },
{ NULL },
};
check_header(line, len, header);
check_header(line, header);
}

static int read_one_header_line(char *line, int sz, FILE *in)
Expand Down Expand Up @@ -709,16 +709,16 @@ static void handle_multipart_body(void)
return;
/* We are on boundary line. Start slurping the subhead. */
while (1) {
int len = read_one_header_line(line, sizeof(line), stdin);
if (!len) {
int hdr = read_one_header_line(line, sizeof(line), stdin);
if (!hdr) {
if (handle_multipart_one_part() < 0)
return;
/* Reset per part headers */
transfer_encoding = TE_DONTCARE;
charset[0] = 0;
}
else
check_subheader_line(line, len);
check_subheader_line(line);
}
fclose(patchfile);
if (!patch_lines) {
Expand Down Expand Up @@ -787,15 +787,15 @@ int main(int argc, char **argv)
exit(1);
}
while (1) {
int len = read_one_header_line(line, sizeof(line), stdin);
if (!len) {
int hdr = read_one_header_line(line, sizeof(line), stdin);
if (!hdr) {
if (multipart_boundary[0])
handle_multipart_body();
else
handle_body();
break;
}
check_header_line(line, len);
check_header_line(line);
}
return 0;
}

0 comments on commit f8128cf

Please sign in to comment.