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>

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 79abce2a258cd3c4f701f58328bba9b87a029efc..4e77132ab5f73839241c430d6354d5abb8294d85 100755 (executable)
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -42,7 +42,8 @@ case "$continue" in
 '')
        rm -rf .dotest
        mkdir .dotest
 '')
        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
 
        shift
 esac
 

diff --git a/mailsplit.c b/mailsplit.c
index 7afea1aaca6af966b6532ba66f7411d897a2874f..bd7c611bb9902281a002f907b6bcf0aa41f58285 100644 (file)
--- a/mailsplit.c
+++ b/mailsplit.c
@@ -17,7 +17,7 @@
 
 static int usage(void)
 {
 
 static int usage(void)
 {

-       fprintf(stderr, "mailsplit <mbox> <directory>\n");
+       fprintf(stderr, "git-mailsplit [-d<prec>] <mbox> <directory>\n");

        exit(1);
 }
 
        exit(1);
 }
 


@@ -96,11 +96,17 @@ static int parse_email(const void *map, unsigned long size)
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

-       int fd, nr;
+       int fd, nr, nr_prec = 4;

        struct stat st;
        unsigned long size;
        void *map;
 
        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);
        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);
                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);
                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);
                map += len;
                size -= len;
        } while (size > 0);

+       printf("%d\n", nr);

        return 0;
 }
        return 0;
 }