mailsplit: -d<prec>

Instead of the default 4 digits with leading zeros, different precision
can be specified for the generated filenames.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2 files changed, 12 insertions, 4 deletions

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 79abce2a25..4e77132ab5 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -42,7 +42,8 @@ case "$continue" in
 '')
 	rm -rf .dotest
 	mkdir .dotest
-	git-mailsplit "$1" .dotest || exit 1
+	num_msgs=$(git-mailsplit "$1" .dotest) || exit 1
+	echo "$num_msgs patch(es) to process."
 	shift
 esac
 
diff --git a/mailsplit.c b/mailsplit.c
index 7afea1aaca..bd7c611bb9 100644
--- a/mailsplit.c
+++ b/mailsplit.c
@@ -17,7 +17,7 @@
 
 static int usage(void)
 {
-	fprintf(stderr, "mailsplit <mbox> <directory>\n");
+	fprintf(stderr, "git-mailsplit [-d<prec>] <mbox> <directory>\n");
 	exit(1);
 }
 
@@ -96,11 +96,17 @@ corrupt:
 
 int main(int argc, char **argv)
 {
-	int fd, nr;
+	int fd, nr, nr_prec = 4;
 	struct stat st;
 	unsigned long size;
 	void *map;
 
+	if (argc == 4 && !strncmp(argv[1], "-d", 2)) {
+		nr_prec = strtol(argv[1] + 2, NULL, 10);
+		if (nr_prec < 3 || 10 <= nr_prec)
+			usage();
+		argc--; argv++;
+	}
 	if (argc != 3)
 		usage();
 	fd = open(argv[1], O_RDONLY);
@@ -127,7 +133,7 @@ int main(int argc, char **argv)
 		char name[10];
 		unsigned long len = parse_email(map, size);
 		assert(len <= size);
-		sprintf(name, "%04d", ++nr);
+		sprintf(name, "%0*d", nr_prec, ++nr);
 		fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
 		if (fd < 0) {
 			perror(name);
@@ -141,5 +147,6 @@ int main(int argc, char **argv)
 		map += len;
 		size -= len;
 	} while (size > 0);
+	printf("%d\n", nr);
 	return 0;
 }