mailsplit: fix for more than one input files

Junio C Hamano · Junio C Hamano · commit b33271808ba3 · 2007-05-29T00:27:06.000-07:00
Earlier commit d63bd9a broke the case where more than one input files are fed to mailsplit by not incrementing the base counter when splitting second and subsequent input files. This should fix it. Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
@@ -261,7 +261,8 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 				error("cannot split patches from stdin");
 				return 1;
 			}
-			num += ret;
+			num += (ret - nr);
+			nr = ret;
 			continue;
 		}
 
@@ -279,7 +280,8 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 			error("cannot split patches from %s", arg);
 			return 1;
 		}
-		num += ret;
+		num += (ret - nr);
+		nr = ret;
 	}
 
 	printf("%d\n", num);

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,8 @@ int cmd_mailsplit(int argc, const char *argv, const char prefix)`
`261`	`261`	`error("cannot split patches from stdin");`
`262`	`262`	`return 1;`
`263`	`263`	`}`
`264`		`- num += ret;`
	`264`	`+ num += (ret - nr);`
	`265`	`+ nr = ret;`
`265`	`266`	`continue;`
`266`	`267`	`}`
`267`	`268`
`@@ -279,7 +280,8 @@ int cmd_mailsplit(int argc, const char *argv, const char prefix)`
`279`	`280`	`error("cannot split patches from %s", arg);`
`280`	`281`	`return 1;`
`281`	`282`	`}`
`282`		`- num += ret;`
	`283`	`+ num += (ret - nr);`
	`284`	`+ nr = ret;`
`283`	`285`	`}`
`284`	`286`
`285`	`287`	`printf("%d\n", num);`