diff -Naur patchtool-0.4/cmd_list.c patchtool-0.5/cmd_list.c --- patchtool-0.4/cmd_list.c 2005-04-12 00:17:38.000000000 +0000 +++ patchtool-0.5/cmd_list.c 2005-04-12 21:10:20.000000000 +0000 @@ -52,7 +52,7 @@ char c; int ret, stats[3]; - ret = part_status(part, NULL); + ret = part_status(part, stats); ptr = (ret == PART_DEL) ? mk_string_strip(part->filename[0], strip_level) : mk_string_strip(part->filename[1], strip_level); @@ -107,7 +107,6 @@ struct part *part = list_entry(tmp, struct part, list); process_part(part, strip_level, detail_level); - } close_patch(patch); diff -Naur patchtool-0.4/parse.c patchtool-0.5/parse.c --- patchtool-0.4/parse.c 2005-04-12 00:12:09.000000000 +0000 +++ patchtool-0.5/parse.c 2005-04-12 21:03:27.000000000 +0000 @@ -55,7 +55,6 @@ fprintf(stderr, "error: hunk problem\n"); return parser_next_line(tmp); } - //printf("header: \"%.20s\"\n", tmp); ret = sscanf(tmp, "@@ -%d,%d +%d,%d @@", &hunk->off[0], &hunk->line[0], &hunk->off[1], &hunk->line[1]); @@ -67,11 +66,11 @@ ret = sscanf(tmp, "@@ -%d +%d,%d @@", &hunk->off[0], &hunk->off[1], &hunk->line[1]); if (ret != 3) { - fprintf(stderr, "error: not enough arg in hunk: \"\"%.30s\"\"\n", tmp); + fprintf(stderr, "error: not enough arg " + "in hunk: \"\"%.30s\"\"\n", tmp); return parser_next_line(tmp); } hunk->off[0] = hunk->line[0] = -1; - return parser_next_line(tmp); } } @@ -122,7 +121,8 @@ case '+': line_add++; break; case ' ': line_space++; break; case '\\': break; - default: fprintf(stderr, "error: something wrong happen: %.20s\n", tmp); + default: fprintf(stderr, "error: something " + "wrong happen: %.20s\n", tmp); } tmp = parser_next_line(tmp); diff -Naur patchtool-0.4/patchtool.c patchtool-0.5/patchtool.c --- patchtool-0.4/patchtool.c 2005-04-11 23:22:53.000000000 +0000 +++ patchtool-0.5/patchtool.c 2005-04-13 10:29:23.000000000 +0000 @@ -19,7 +19,8 @@ #include #include "cmd.h" -#define match_cmd(str) if (strcmp(argv[1], #str) == 0) cmd_##str (argc - 2, &argv[2]); +#define match_cmd(str) if (strcmp(argv[1], #str) == 0) \ + cmd_##str (argc - 2, &argv[2]); int main(int argc, char **argv) {