X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=blobdiff_plain;f=mbox2maildir;h=0eab9ecf229f15dec8e0323e975cad0e2fb5bc85;hb=refs%2Fheads%2Fmaster;hp=42d6816eece169c50d15d528124ad7e980703f08;hpb=fe13229ecf159cad31fe89c2e311f2b441ba1edf;p=bin.git

diff --git a/mbox2maildir b/mbox2maildir
index 42d6816..0eab9ec 100755
--- a/mbox2maildir
+++ b/mbox2maildir
@@ -1,12 +1,19 @@
 #! /bin/sh -e
 
-if [ -z "$1" ]; then
+if [ -z "$1" ] || [ "x$1" = "x--help" ]; then
     echo "Usage: $0 <mbox>" >&2
     exit 1
 fi
 
-maildirmake "$1.maildir"
-perfect-maildir "$1.maildir" < "$1"
+mbox="$1"
+if [ "${mbox#/}" = "$mbox" ]; then
+    # mb2md has stupid semantics for relative paths.
+    mbox="$(pwd)/$mbox"
+fi
+
+#maildirmake.dovecot "$1.maildir"
+#perfect-maildir "$1.maildir" < "$1"
+mb2md -s "$mbox" -d "$mbox.maildir"
 mv "$1" "$1.mbox"
 mv "$1.maildir" "$1"