Mercurial > libpst
changeset 254:fb66d428347d
switch to mboxrd quoting
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Thu, 02 Sep 2010 12:28:01 -0700 |
| parents | 115b871c61a1 |
| children | ab87f9070ed2 |
| files | ChangeLog NEWS configure.in libpst.spec.in src/readpst.c xml/libpst.in |
| diffstat | 6 files changed, 44 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 28 20:38:17 2010 -0700 +++ b/ChangeLog Thu Sep 02 12:28:01 2010 -0700 @@ -1,8 +1,10 @@ -LibPST 0.6.48 (2010-07-28) +LibPST 0.6.48 (2010-09-02) =============================== * fix for broken internet headers from Outlook. * fix ax_python.m4 to look for python2.7 * Subpackage Licensing, add COPYING to -libs. + * use mboxrd from quoting for output formats with multiple messages per file + * use no from quoting for output formats with single message per file LibPST 0.6.47 (2010-05-07) ===============================
--- a/NEWS Wed Jul 28 20:38:17 2010 -0700 +++ b/NEWS Thu Sep 02 12:28:01 2010 -0700 @@ -1,4 +1,4 @@ -0.6.48 2010-07-28 fix for broken internet headers from Outlook +0.6.48 2010-09-02 fix for broken internet headers from Outlook, change to mboxrd quoting 0.6.47 2010-05-07 patches from Kenneth Berland for solaris 0.6.46 2010-02-13 fixes for fedora 13 change in implicit dso linking semantics 0.6.45 2009-11-18 patch from Hugo DesRosiers to export categories and notes into vcards
--- a/configure.in Wed Jul 28 20:38:17 2010 -0700 +++ b/configure.in Thu Sep 02 12:28:01 2010 -0700 @@ -19,7 +19,7 @@ # 6. libtool will build libpst.so.x.y.z where the SONAME is libpst.so.x # and x=current-age, y=age, z=revision -libpst_version_info='4:2:0' +libpst_version_info='4:3:0' AC_SUBST(LIBPST_VERSION_INFO, [$libpst_version_info]) libpst_so_major='4' AC_SUBST(LIBPST_SO_MAJOR, [$libpst_so_major]) @@ -32,6 +32,7 @@ # 0.6.40 libpst.so.4 libpst.so.4.0.0 # 0.6.43 libpst.so.4 libpst.so.4.0.1 # 0.6.47 libpst.so.4 libpst.so.4.0.2 +# 0.6.48 libpst.so.4 libpst.so.4.0.3
--- a/libpst.spec.in Wed Jul 28 20:38:17 2010 -0700 +++ b/libpst.spec.in Thu Sep 02 12:28:01 2010 -0700 @@ -147,9 +147,14 @@ %changelog -* Wed Jul 28 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.48-1 +* Thu Sep 02 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.48-1 - fix for broken internet headers from Outlook - fix ax_python.m4 to look for python2.7 +- use mboxrd from quoting for output formats with multiple messages per file +- use no from quoting for output formats with single message per file + +* Sat Jul 31 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.47-6 +- rebuild for python dependencies * Mon Jul 26 2010 David Malcolm <dmalcolm@redhat.com> - 0.6.47-4 - hack up configure so that it looks for python 2.7
--- a/src/readpst.c Wed Jul 28 20:38:17 2010 -0700 +++ b/src/readpst.c Thu Sep 02 12:28:01 2010 -0700 @@ -77,7 +77,7 @@ #define MODE_KMAIL 1 // recurse mode creates a directory structure like the PST file. Each directory -// contains only one file which stores the emails in mbox format. +// contains only one file which stores the emails in mboxrd format. #define MODE_RECURSE 2 // separate mode creates the same directory structure as recurse. The emails are stored in @@ -617,13 +617,16 @@ void write_email_body(FILE *f, char *body) { char *n = body; DEBUG_ENT("write_email_body"); - while (n) { - if (strncmp(body, "From ", 5) == 0) - fprintf(f, ">"); - if ((n = strchr(body, '\n'))) { - n++; - pst_fwrite(body, n-body, 1, f); //write just a line - body = n; + if (mode != MODE_SEPARATE) { + while (n) { + char *p = body; + while (*p == '>') p++; + if (strncmp(p, "From ", 5) == 0) fprintf(f, ">"); + if ((n = strchr(body, '\n'))) { + n++; + pst_fwrite(body, n-body, 1, f); //write just a line + body = n; + } } } pst_fwrite(body, strlen(body), 1, f);
--- a/xml/libpst.in Wed Jul 28 20:38:17 2010 -0700 +++ b/xml/libpst.in Thu Sep 02 12:28:01 2010 -0700 @@ -97,7 +97,7 @@ Output messages in MH (rfc822) format as separate files. This will create folders as named in the PST file, and will put each email together with any attachments into its own file. These files will be numbered from 1 - to n with no leading zeros. + to n with no leading zeros. This format has no from quoting. </para></listitem> </varlistentry> <varlistentry> @@ -105,12 +105,12 @@ <listitem><para> Output messages into separate files. This will create folders as named in the PST file, and will put each email in its own file. These - files will be numbered from 1 to n with no leading zeros. So the email - contents for message $m are saved in a file named $m. Attachments + files will be numbered from 1 to n with no leading zeros. Attachments will also be saved in the same folder as the email message. The attachments for message $m are saved as $m-$name where $name is (the original name of the attachment, or 'attach$n' if the attachment had no name), where $n is another sequential index with no leading zeros. + This format has no from quoting. </para></listitem> </varlistentry> <varlistentry> @@ -142,7 +142,7 @@ <term>-e</term> <listitem><para> Same as the M option, but each output file will include an extension - from (.eml, .ics, .vcf). + from (.eml, .ics, .vcf). This format has no from quoting. </para></listitem> </varlistentry> <varlistentry> @@ -161,7 +161,7 @@ <varlistentry> <term>-k</term> <listitem><para> - Changes the output format to KMail. + Changes the output format to KMail. This format uses mboxrd from quoting. </para></listitem> </varlistentry> <varlistentry> @@ -185,7 +185,7 @@ Changes the output format to Recursive. This will create folders as named in the PST file, and will put all emails in a file called "mbox" inside each folder. These files are then compatible with all - mbox-compatible email clients. + mbox-compatible email clients. This format uses mboxrd from quoting. </para></listitem> </varlistentry> <varlistentry> @@ -200,7 +200,8 @@ <term>-u</term> <listitem><para> Sets Thunderbird mode, a submode of recursive mode. This causes - two extra .type and .size meta files to be created. + two extra .type and .size meta files to be created. This format uses + mboxrd from quoting. </para></listitem> </varlistentry> <varlistentry> @@ -214,6 +215,19 @@ </variablelist> </refsect1> + <refsect1 id='readpst.quoting.1'> + <title>From Quoting</title> + <para> + Output formats that place each mail message in a separate file (-M, -S, -e) + don't do any from quoting. + Output formats that place multiple email messages in a single file (-k, -r, -u) + now use mboxrd from quoting rules. + If none of those switches are specified, the default output format uses mboxrd + from quoting rules, since it produces multiple email messages in a single file. + Earlier versions used mboxo from quoting rules for all output formats. + </para> + </refsect1> + <refsect1 id='readpst.author.1'> <title>Author</title> <para>