2005-04-12 08:46:50 +02:00
|
|
|
/*
|
|
|
|
* Totally braindamaged mbox splitter program.
|
|
|
|
*
|
|
|
|
* It just splits a mbox into a list of files: "0001" "0002" ..
|
|
|
|
* so you can process them further from there.
|
|
|
|
*/
|
2005-10-07 00:55:43 +02:00
|
|
|
#include "cache.h"
|
2006-06-13 22:21:46 +02:00
|
|
|
#include "builtin.h"
|
2008-07-21 20:03:49 +02:00
|
|
|
#include "string-list.h"
|
2009-08-05 05:31:57 +02:00
|
|
|
#include "strbuf.h"
|
2005-04-12 08:46:50 +02:00
|
|
|
|
2005-10-07 00:55:43 +02:00
|
|
|
static const char git_mailsplit_usage[] =
|
2010-10-08 19:31:17 +02:00
|
|
|
"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]";
|
2005-04-12 08:46:50 +02:00
|
|
|
|
|
|
|
static int is_from_line(const char *line, int len)
|
|
|
|
{
|
|
|
|
const char *colon;
|
|
|
|
|
|
|
|
if (len < 20 || memcmp("From ", line, 5))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
colon = line + len - 2;
|
|
|
|
line += 5;
|
|
|
|
for (;;) {
|
|
|
|
if (colon < line)
|
|
|
|
return 0;
|
|
|
|
if (*--colon == ':')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!isdigit(colon[-4]) ||
|
|
|
|
!isdigit(colon[-2]) ||
|
|
|
|
!isdigit(colon[-1]) ||
|
|
|
|
!isdigit(colon[ 1]) ||
|
|
|
|
!isdigit(colon[ 2]))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* year */
|
|
|
|
if (strtol(colon+3, NULL, 10) <= 90)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Ok, close enough */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-08-05 05:31:57 +02:00
|
|
|
static struct strbuf buf = STRBUF_INIT;
|
2009-08-05 05:31:59 +02:00
|
|
|
static int keep_cr;
|
2005-10-07 00:55:43 +02:00
|
|
|
|
|
|
|
/* Called with the first line (potentially partial)
|
|
|
|
* already in buf[] -- normally that should begin with
|
|
|
|
* the Unix "From " line. Write it into the specified
|
|
|
|
* file.
|
|
|
|
*/
|
2005-12-14 07:39:23 +01:00
|
|
|
static int split_one(FILE *mbox, const char *name, int allow_bare)
|
2005-04-12 08:46:50 +02:00
|
|
|
{
|
2014-08-12 23:21:27 +02:00
|
|
|
FILE *output;
|
2005-10-07 00:55:43 +02:00
|
|
|
int fd;
|
|
|
|
int status = 0;
|
2009-08-05 05:31:57 +02:00
|
|
|
int is_bare = !is_from_line(buf.buf, buf.len);
|
2005-04-12 08:46:50 +02:00
|
|
|
|
2014-08-12 23:21:27 +02:00
|
|
|
if (is_bare && !allow_bare) {
|
|
|
|
fprintf(stderr, "corrupt mailbox\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2005-10-07 00:55:43 +02:00
|
|
|
fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
|
|
|
|
if (fd < 0)
|
2009-06-27 17:58:47 +02:00
|
|
|
die_errno("cannot open output file '%s'", name);
|
2009-09-12 10:43:27 +02:00
|
|
|
output = xfdopen(fd, "w");
|
2005-04-12 08:46:50 +02:00
|
|
|
|
2005-10-07 00:55:43 +02:00
|
|
|
/* Copy it out, while searching for a line that begins with
|
|
|
|
* "From " and having something that looks like a date format.
|
2005-04-12 08:46:50 +02:00
|
|
|
*/
|
2005-10-07 00:55:43 +02:00
|
|
|
for (;;) {
|
2009-08-05 05:31:59 +02:00
|
|
|
if (!keep_cr && buf.len > 1 && buf.buf[buf.len-1] == '\n' &&
|
|
|
|
buf.buf[buf.len-2] == '\r') {
|
|
|
|
strbuf_setlen(&buf, buf.len-2);
|
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
}
|
|
|
|
|
2009-08-05 05:31:57 +02:00
|
|
|
if (fwrite(buf.buf, 1, buf.len, output) != buf.len)
|
2009-06-27 17:58:47 +02:00
|
|
|
die_errno("cannot write output");
|
2005-10-07 00:55:43 +02:00
|
|
|
|
2009-08-05 05:31:57 +02:00
|
|
|
if (strbuf_getwholeline(&buf, mbox, '\n')) {
|
2005-10-07 00:55:43 +02:00
|
|
|
if (feof(mbox)) {
|
|
|
|
status = 1;
|
|
|
|
break;
|
|
|
|
}
|
2009-06-27 17:58:47 +02:00
|
|
|
die_errno("cannot read mbox");
|
2005-10-07 00:55:43 +02:00
|
|
|
}
|
2009-08-05 05:31:57 +02:00
|
|
|
if (!is_bare && is_from_line(buf.buf, buf.len))
|
2005-10-07 00:55:43 +02:00
|
|
|
break; /* done with one message */
|
|
|
|
}
|
|
|
|
fclose(output);
|
|
|
|
return status;
|
2005-04-12 08:46:50 +02:00
|
|
|
}
|
|
|
|
|
2008-07-21 20:03:49 +02:00
|
|
|
static int populate_maildir_list(struct string_list *list, const char *path)
|
2005-04-12 08:46:50 +02:00
|
|
|
{
|
2007-05-25 00:15:36 +02:00
|
|
|
DIR *dir;
|
|
|
|
struct dirent *dent;
|
2015-09-24 23:05:51 +02:00
|
|
|
char *name = NULL;
|
2007-11-06 09:54:18 +01:00
|
|
|
char *subs[] = { "cur", "new", NULL };
|
|
|
|
char **sub;
|
2015-09-24 23:05:51 +02:00
|
|
|
int ret = -1;
|
2007-11-06 09:54:18 +01:00
|
|
|
|
|
|
|
for (sub = subs; *sub; ++sub) {
|
2015-09-24 23:05:51 +02:00
|
|
|
free(name);
|
|
|
|
name = xstrfmt("%s/%s", path, *sub);
|
2007-11-06 09:54:18 +01:00
|
|
|
if ((dir = opendir(name)) == NULL) {
|
|
|
|
if (errno == ENOENT)
|
|
|
|
continue;
|
|
|
|
error("cannot opendir %s (%s)", name, strerror(errno));
|
2015-09-24 23:05:51 +02:00
|
|
|
goto out;
|
2007-11-06 09:54:18 +01:00
|
|
|
}
|
2007-05-25 00:15:36 +02:00
|
|
|
|
2007-11-06 09:54:18 +01:00
|
|
|
while ((dent = readdir(dir)) != NULL) {
|
|
|
|
if (dent->d_name[0] == '.')
|
|
|
|
continue;
|
2015-09-24 23:05:51 +02:00
|
|
|
free(name);
|
|
|
|
name = xstrfmt("%s/%s", *sub, dent->d_name);
|
2010-06-26 01:41:35 +02:00
|
|
|
string_list_insert(list, name);
|
2007-11-06 09:54:18 +01:00
|
|
|
}
|
2007-05-25 00:15:36 +02:00
|
|
|
|
2007-11-06 09:54:18 +01:00
|
|
|
closedir(dir);
|
2007-05-25 00:15:36 +02:00
|
|
|
}
|
|
|
|
|
2015-09-24 23:05:51 +02:00
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
free(name);
|
|
|
|
return ret;
|
2007-05-25 00:15:36 +02:00
|
|
|
}
|
|
|
|
|
mailsplit: sort maildir filenames more cleverly
A maildir does not technically record the order in which
items were placed into it. That means that when applying a
patch series from a maildir, we may get the patches in the
wrong order. We try to work around this by sorting the
filenames. Unfortunately, this may or may not work depending
on the naming scheme used by the writer of the maildir.
For instance, mutt will write:
${epoch_seconds}.${pid}_${seq}.${host}
where we have:
- epoch_seconds: timestamp at which entry was written
- pid: PID of writing process
- seq: a sequence number to ensure uniqueness of filenames
- host: hostname
None of the numbers are zero-padded. Therefore, when we sort
the names as byte strings, entries that cross a digit
boundary (e.g., 10) will sort out of order. In the case of
timestamps, it almost never matters (because we do not cross
a digit boundary in the epoch time very often these days).
But for the sequence number, a 10-patch series would be
ordered as 1, 10, 2, 3, etc.
To fix this, we can use a custom sort comparison function
which traverses each string, comparing chunks of digits
numerically, and otherwise doing a byte-for-byte comparison.
That would sort:
123.456_1.bar
123.456_2.bar
...
123.456_10.bar
according to the sequence number. Since maildir does not
define a filename format, this is really just a heuristic.
But it happens to work for mutt, and there is a reasonable
chance that it will work for other writers, too (at least as
well as a straight sort).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-02 00:35:48 +01:00
|
|
|
static int maildir_filename_cmp(const char *a, const char *b)
|
|
|
|
{
|
|
|
|
while (*a && *b) {
|
|
|
|
if (isdigit(*a) && isdigit(*b)) {
|
|
|
|
long int na, nb;
|
|
|
|
na = strtol(a, (char **)&a, 10);
|
|
|
|
nb = strtol(b, (char **)&b, 10);
|
|
|
|
if (na != nb)
|
|
|
|
return na - nb;
|
|
|
|
/* strtol advanced our pointers */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (*a != *b)
|
|
|
|
return (unsigned char)*a - (unsigned char)*b;
|
|
|
|
a++;
|
|
|
|
b++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (unsigned char)*a - (unsigned char)*b;
|
|
|
|
}
|
|
|
|
|
2007-05-25 00:15:36 +02:00
|
|
|
static int split_maildir(const char *maildir, const char *dir,
|
|
|
|
int nr_prec, int skip)
|
|
|
|
{
|
2015-09-24 23:05:51 +02:00
|
|
|
char *file = NULL;
|
2015-09-24 23:03:05 +02:00
|
|
|
FILE *f = NULL;
|
2006-06-13 22:21:46 +02:00
|
|
|
int ret = -1;
|
2007-05-25 00:15:36 +02:00
|
|
|
int i;
|
2010-07-04 21:46:19 +02:00
|
|
|
struct string_list list = STRING_LIST_INIT_DUP;
|
2006-06-13 22:21:46 +02:00
|
|
|
|
mailsplit: sort maildir filenames more cleverly
A maildir does not technically record the order in which
items were placed into it. That means that when applying a
patch series from a maildir, we may get the patches in the
wrong order. We try to work around this by sorting the
filenames. Unfortunately, this may or may not work depending
on the naming scheme used by the writer of the maildir.
For instance, mutt will write:
${epoch_seconds}.${pid}_${seq}.${host}
where we have:
- epoch_seconds: timestamp at which entry was written
- pid: PID of writing process
- seq: a sequence number to ensure uniqueness of filenames
- host: hostname
None of the numbers are zero-padded. Therefore, when we sort
the names as byte strings, entries that cross a digit
boundary (e.g., 10) will sort out of order. In the case of
timestamps, it almost never matters (because we do not cross
a digit boundary in the epoch time very often these days).
But for the sequence number, a 10-patch series would be
ordered as 1, 10, 2, 3, etc.
To fix this, we can use a custom sort comparison function
which traverses each string, comparing chunks of digits
numerically, and otherwise doing a byte-for-byte comparison.
That would sort:
123.456_1.bar
123.456_2.bar
...
123.456_10.bar
according to the sequence number. Since maildir does not
define a filename format, this is really just a heuristic.
But it happens to work for mutt, and there is a reasonable
chance that it will work for other writers, too (at least as
well as a straight sort).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-02 00:35:48 +01:00
|
|
|
list.cmp = maildir_filename_cmp;
|
|
|
|
|
2007-11-06 09:54:18 +01:00
|
|
|
if (populate_maildir_list(&list, maildir) < 0)
|
2007-05-25 00:15:36 +02:00
|
|
|
goto out;
|
2006-06-13 22:21:46 +02:00
|
|
|
|
2007-05-25 00:15:36 +02:00
|
|
|
for (i = 0; i < list.nr; i++) {
|
2015-09-24 23:05:51 +02:00
|
|
|
char *name;
|
|
|
|
|
|
|
|
free(file);
|
|
|
|
file = xstrfmt("%s/%s", maildir, list.items[i].string);
|
|
|
|
|
2007-05-25 00:15:36 +02:00
|
|
|
f = fopen(file, "r");
|
|
|
|
if (!f) {
|
|
|
|
error("cannot open mail %s (%s)", file, strerror(errno));
|
2006-06-13 22:21:46 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-08-05 05:31:57 +02:00
|
|
|
if (strbuf_getwholeline(&buf, f, '\n')) {
|
2007-05-25 00:15:36 +02:00
|
|
|
error("cannot read mail %s (%s)", file, strerror(errno));
|
2006-06-13 22:21:46 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2015-09-24 23:05:51 +02:00
|
|
|
name = xstrfmt("%s/%0*d", dir, nr_prec, ++skip);
|
2007-05-25 00:15:36 +02:00
|
|
|
split_one(f, name, 1);
|
2015-09-24 23:05:51 +02:00
|
|
|
free(name);
|
2007-05-25 00:15:36 +02:00
|
|
|
|
|
|
|
fclose(f);
|
2015-09-24 23:03:05 +02:00
|
|
|
f = NULL;
|
2007-05-25 00:15:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = skip;
|
|
|
|
out:
|
2015-09-24 23:03:05 +02:00
|
|
|
if (f)
|
|
|
|
fclose(f);
|
2015-09-24 23:05:51 +02:00
|
|
|
free(file);
|
2008-07-21 20:03:49 +02:00
|
|
|
string_list_clear(&list, 1);
|
2007-05-25 00:15:36 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-06-08 11:22:56 +02:00
|
|
|
static int split_mbox(const char *file, const char *dir, int allow_bare,
|
|
|
|
int nr_prec, int skip)
|
2007-05-25 00:15:36 +02:00
|
|
|
{
|
|
|
|
int ret = -1;
|
2007-11-01 23:57:45 +01:00
|
|
|
int peek;
|
2007-05-25 00:15:36 +02:00
|
|
|
|
|
|
|
FILE *f = !strcmp(file, "-") ? stdin : fopen(file, "r");
|
|
|
|
int file_done = 0;
|
|
|
|
|
|
|
|
if (!f) {
|
|
|
|
error("cannot open mbox %s", file);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2007-11-01 23:57:45 +01:00
|
|
|
do {
|
|
|
|
peek = fgetc(f);
|
|
|
|
} while (isspace(peek));
|
|
|
|
ungetc(peek, f);
|
|
|
|
|
2009-08-05 05:31:57 +02:00
|
|
|
if (strbuf_getwholeline(&buf, f, '\n')) {
|
2007-05-25 00:15:36 +02:00
|
|
|
/* empty stdin is OK */
|
|
|
|
if (f != stdin) {
|
|
|
|
error("cannot read mbox %s", file);
|
|
|
|
goto out;
|
2006-06-13 22:21:46 +02:00
|
|
|
}
|
2007-05-25 00:15:36 +02:00
|
|
|
file_done = 1;
|
|
|
|
}
|
2006-06-13 22:21:46 +02:00
|
|
|
|
2007-05-25 00:15:36 +02:00
|
|
|
while (!file_done) {
|
2015-09-24 23:05:51 +02:00
|
|
|
char *name = xstrfmt("%s/%0*d", dir, nr_prec, ++skip);
|
2007-05-25 00:15:36 +02:00
|
|
|
file_done = split_one(f, name, allow_bare);
|
2015-09-24 23:05:51 +02:00
|
|
|
free(name);
|
2006-06-13 22:21:46 +02:00
|
|
|
}
|
2007-05-25 00:15:36 +02:00
|
|
|
|
|
|
|
if (f != stdin)
|
|
|
|
fclose(f);
|
|
|
|
|
2006-06-13 22:21:46 +02:00
|
|
|
ret = skip;
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
2007-05-25 00:15:36 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
int cmd_mailsplit(int argc, const char **argv, const char *prefix)
|
2006-06-13 22:21:46 +02:00
|
|
|
{
|
2007-05-25 00:15:36 +02:00
|
|
|
int nr = 0, nr_prec = 4, num = 0;
|
2005-12-14 07:39:23 +01:00
|
|
|
int allow_bare = 0;
|
|
|
|
const char *dir = NULL;
|
|
|
|
const char **argp;
|
|
|
|
static const char *stdin_only[] = { "-", NULL };
|
2005-10-07 00:55:43 +02:00
|
|
|
|
2005-12-14 07:39:23 +01:00
|
|
|
for (argp = argv+1; *argp; argp++) {
|
|
|
|
const char *arg = *argp;
|
2005-10-07 00:55:43 +02:00
|
|
|
|
|
|
|
if (arg[0] != '-')
|
|
|
|
break;
|
|
|
|
/* do flags here */
|
2005-12-14 07:39:23 +01:00
|
|
|
if ( arg[1] == 'd' ) {
|
|
|
|
nr_prec = strtol(arg+2, NULL, 10);
|
2005-10-07 00:55:43 +02:00
|
|
|
if (nr_prec < 3 || 10 <= nr_prec)
|
|
|
|
usage(git_mailsplit_usage);
|
|
|
|
continue;
|
2005-12-14 07:39:23 +01:00
|
|
|
} else if ( arg[1] == 'f' ) {
|
|
|
|
nr = strtol(arg+2, NULL, 10);
|
2009-11-09 16:04:52 +01:00
|
|
|
} else if ( arg[1] == 'h' ) {
|
|
|
|
usage(git_mailsplit_usage);
|
2005-12-14 07:39:23 +01:00
|
|
|
} else if ( arg[1] == 'b' && !arg[2] ) {
|
|
|
|
allow_bare = 1;
|
2009-08-05 05:31:59 +02:00
|
|
|
} else if (!strcmp(arg, "--keep-cr")) {
|
|
|
|
keep_cr = 1;
|
2005-12-14 07:39:23 +01:00
|
|
|
} else if ( arg[1] == 'o' && arg[2] ) {
|
|
|
|
dir = arg+2;
|
|
|
|
} else if ( arg[1] == '-' && !arg[2] ) {
|
|
|
|
argp++; /* -- marks end of options */
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
die("unknown option: %s", arg);
|
2005-10-07 00:55:43 +02:00
|
|
|
}
|
2005-04-12 08:46:50 +02:00
|
|
|
}
|
2005-10-07 00:55:43 +02:00
|
|
|
|
2005-12-14 07:39:23 +01:00
|
|
|
if ( !dir ) {
|
|
|
|
/* Backwards compatibility: if no -o specified, accept
|
|
|
|
<mbox> <dir> or just <dir> */
|
|
|
|
switch (argc - (argp-argv)) {
|
|
|
|
case 1:
|
|
|
|
dir = argp[0];
|
|
|
|
argp = stdin_only;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
stdin_only[0] = argp[0];
|
|
|
|
dir = argp[1];
|
|
|
|
argp = stdin_only;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
usage(git_mailsplit_usage);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* New usage: if no more argument, parse stdin */
|
|
|
|
if ( !*argp )
|
|
|
|
argp = stdin_only;
|
2005-04-12 08:46:50 +02:00
|
|
|
}
|
2005-10-07 00:55:43 +02:00
|
|
|
|
2007-05-25 00:15:36 +02:00
|
|
|
while (*argp) {
|
|
|
|
const char *arg = *argp++;
|
|
|
|
struct stat argstat;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (arg[0] == '-' && arg[1] == 0) {
|
|
|
|
ret = split_mbox(arg, dir, allow_bare, nr_prec, nr);
|
|
|
|
if (ret < 0) {
|
|
|
|
error("cannot split patches from stdin");
|
|
|
|
return 1;
|
|
|
|
}
|
2007-05-29 00:48:07 +02:00
|
|
|
num += (ret - nr);
|
|
|
|
nr = ret;
|
2007-05-25 00:15:36 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stat(arg, &argstat) == -1) {
|
|
|
|
error("cannot stat %s (%s)", arg, strerror(errno));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (S_ISDIR(argstat.st_mode))
|
|
|
|
ret = split_maildir(arg, dir, nr_prec, nr);
|
|
|
|
else
|
|
|
|
ret = split_mbox(arg, dir, allow_bare, nr_prec, nr);
|
|
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
error("cannot split patches from %s", arg);
|
|
|
|
return 1;
|
|
|
|
}
|
2007-05-29 00:48:07 +02:00
|
|
|
num += (ret - nr);
|
|
|
|
nr = ret;
|
2007-05-25 00:15:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
printf("%d\n", num);
|
2005-12-14 07:39:23 +01:00
|
|
|
|
2007-05-25 00:15:36 +02:00
|
|
|
return 0;
|
2005-04-12 08:46:50 +02:00
|
|
|
}
|