i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Print the actual command name, not a hardcoded obsolete one. Fixes ticket

Browse Source 
#4719.
* Added license header.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33438 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-05 12:32:07 +00:00
parent b69dfc85c8
commit 08c63a2d6b
2 changed files with 44 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/mail_utils/mail2mbox.cpp
+21 -42
View File
@@ -1,46 +1,32 @@
/****************************************************************************** /*
* $Id$ * Copyright 2005-2009, Haiku Inc.
* This file may be used under the terms of the MIT License.
* *
* BeMailToMBox is a utility program (requested by Frank Zschockelt) that * Originally public domain written by Alexander G. M. Smith.
* converts BeOS e-mail files into Unix mailbox files (the kind that Pine
* uses). All the files in the input directory are concatenated with the
* appropriate mbox header lines added between them, and trailing blank lines
* reduced. The resulting text is written to standard output. Command line
* driven.
*
* $Log: BeMailToMBox.cpp,v $ (now manually updated)
* r13960 | agmsmith | 2005-08-13 22:10:49 -0400 (Sat, 13 Aug 2005) | 3 lines
* More file movement for the BeMail utilities... Content updates later to
* avoid confusing svn.
*
* r13955 | agmsmith | 2005-08-13 19:43:41 -0400 (Sat, 13 Aug 2005) | 5 lines
* Half way through adding some more BeMail related utilities - they use
* libmail.so which isn't backwards compatibile so they need recompiling for
* Haiku - thus better to include them here. Also want spam levels of 1E-6 to
* be visible for genuine messages.
*
* Revision 1.1 2002/02/24 18:16:46 agmsmith
* Initial revision
*/ */
/* BeOS headers. */
/*! BeMailToMBox is a utility program (requested by Frank Zschockelt) that
converts BeOS e-mail files into Unix mailbox files (the kind that Pine
uses). All the files in the input directory are concatenated with the
appropriate mbox header lines added between them, and trailing blank lines
reduced. The resulting text is written to standard output. Command line
driven.
*/
#include <ctype.h>
#include <errno.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include <Application.h> #include <Application.h>
#include <StorageKit.h> #include <StorageKit.h>
#include <SupportKit.h> #include <SupportKit.h>
/* Posix headers. */
#include <string.h> extern const char* __progname;
#include <stdio.h> static const char* kProgramName = __progname;
#include <ctype.h>
#include <errno.h>
#include <time.h>
/******************************************************************************
* Globals
*/
time_t DateStampTime; time_t DateStampTime;
/* Time value used for stamping each message header. Incremented by 1 second /* Time value used for stamping each message header. Incremented by 1 second
@@ -367,11 +353,6 @@ ErrorExit:
} }
/******************************************************************************
* Finally, the main program which drives it all.
*/
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
dirent_t *DirEntPntr; dirent_t *DirEntPntr;
@@ -390,10 +371,8 @@ int main (int argc, char** argv)
printf ("work with other Unix style mailbox files. Each message in\n"); printf ("work with other Unix style mailbox files. Each message in\n");
printf ("the input directory is converted and sent to the standard\n"); printf ("the input directory is converted and sent to the standard\n");
printf ("output. Usage:\n\n"); printf ("output. Usage:\n\n");
printf ("bemailtombox InputDirectory >OutputFile\n\n"); printf ("%s InputDirectory >OutputFile\n\n", kProgramName);
printf ("Public domain, by Alexander G. M. Smith.\n"); printf ("Public domain, by Alexander G. M. Smith.\n");
printf ("$Id$\n");
printf ("$HeadURL$\n");
return -10; return -10;
} }
src/bin/mail_utils/mbox2mail.cpp
+23 -84
View File
@@ -1,92 +1,38 @@
/****************************************************************************** /*
* $Id$ * Copyright 2005-2009, Haiku Inc.
* This file may be used under the terms of the MIT License.
* *
* MboxToBeMail is a utility program that converts Unix mailbox (mbox) files * Originally public domain written by Alexander G. M. Smith.
* (the kind that Pine uses) into e-mail files for use with BeOS. It also
* handles news files from rn and trn, which have messages very similar to mail
* messages but with a different separator line. The input files store
* multiple mail messages in text format separated by "From ..." lines or
* "Article ..." lines. The output is a bunch of separate files, each one with
* one message plus BeOS BFS attributes describing that message. For
* convenience, all the messages that were from one file are put in a specified
* directory.
*
* Command line driven. Version 1.7 and up (which have support for
* international character sets (as requested by "MFC" Zahar from Russia) and
* the Thread attribute) require the libmail.so that comes with the Mail Daemon
* Replacement (MDR) version 2.2.6 or later (http://www.bebits.com/app/2289 or
* http://sourceforge.net/projects/bemaildaemon/). Use version 1.6 (get it
* from the version history pages on BeBits) if you don't want to install MDR.
*
* $Log: MailboxToBeMail.cpp,v $ (manually updated now that SVN is used)
* r13960 | agmsmith | 2005-08-13 22:10:49 -0400 (Sat, 13 Aug 2005) | 3 lines
* More file movement for the BeMail utilities... Content updates later to
* avoid confusing svn.
*
* r13955 | agmsmith | 2005-08-13 19:43:41 -0400 (Sat, 13 Aug 2005) | 5 lines
* Half way through adding some more BeMail related utilities - they use
* libmail.so which isn't backwards compatibile so they need recompiling for
* Haiku - thus better to include them here. Also want spam levels of 1E-6 to
* be visible for genuine messages.
*
* Revision 1.9 2003/12/31 00:37:46 agmsmith
* Use the MDR date parsing routine rather than parsedate, so it
* can handle newer date formats.
*
* Revision 1.8 2003/12/28 19:03:57 agmsmith
* Added an option to save or not save the separator text line.
*
* Revision 1.7 2003/12/28 04:23:21 agmsmith
* Now uses the Mail Daemon Replacement library to parse the headers,
* which means they now handle foreign character sets (converted
* automatically to UTF-8), so Subject and To are correct when they
* are used as part of the file name.
*
* Revision 1.6 2002/01/14 20:23:21 agmsmith
* Include the detection line with the message header, just for completeness.
*
* Revision 1.5 2002/01/14 03:21:43 agmsmith
* Added processing of UseNet articles, and allowed an older date format.
*
* Revision 1.4 2002/01/14 00:06:59 agmsmith
* Don't allow slashes in file names.
*
* Revision 1.3 2002/01/13 23:33:26 agmsmith
* First seemingly working version.
*
* Revision 1.2 2002/01/13 17:57:26 agmsmith
* Can now pick out separate messages from the inbox.
*
* Revision 1.1 2002/01/13 15:25:33 agmsmith
* Initial revision
*/ */
/* BeOS headers. */
/*! MboxToBeMail is a utility program that converts Unix mailbox (mbox) files
(the kind that Pine uses) into e-mail files for use with BeOS. It also
handles news files from rn and trn, which have messages very similar to mail
messages but with a different separator line. The input files store
multiple mail messages in text format separated by "From ..." lines or
"Article ..." lines. The output is a bunch of separate files, each one with
one message plus BeOS BFS attributes describing that message. For
convenience, all the messages that were from one file are put in a specified
directory.
*/
#include <ctype.h>
#include <errno.h>
#include <string.h>
#include <stdio.h>
#include <Application.h> #include <Application.h>
#include <E-mail.h> #include <E-mail.h>
#include <StorageKit.h> #include <StorageKit.h>
#include <SupportKit.h> #include <SupportKit.h>
/* Posix headers. */
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
/* MDR headers (get the MDR source and add the MDR include/public and
include/numail directories to the project path settings). Or just use
the Haiku build process which is already set up to include the right ones. */
#include <MailMessage.h> #include <MailMessage.h>
#include <mail_util.h> #include <mail_util.h>
extern const char* __progname;
/****************************************************************************** static const char* kProgramName = __progname;
* Globals
*/
char InputPathName [B_PATH_NAME_LENGTH]; char InputPathName [B_PATH_NAME_LENGTH];
FILE *InputFile; FILE *InputFile;
@@ -552,11 +498,6 @@ status_t SaveMessage (BString &MessageText)
} }
/******************************************************************************
* Finally, the main program which drives it all.
*/
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
char ErrorMessage [B_PATH_NAME_LENGTH + 80]; char ErrorMessage [B_PATH_NAME_LENGTH + 80];
@@ -585,10 +526,8 @@ int main (int argc, char** argv)
printf ("separator text line at the top of each message, the default\n"); printf ("separator text line at the top of each message, the default\n");
printf ("is to lose it.\n\n"); printf ("is to lose it.\n\n");
printf ("Usage:\n\n"); printf ("Usage:\n\n");
printf ("mboxtobemail [-s] InputFile [OutputDirectory]\n\n"); printf ("%s [-s] InputFile [OutputDirectory]\n\n", kProgramName);
printf ("Public domain, by Alexander G. M. Smith.\n"); printf ("Public domain, by Alexander G. M. Smith.\n");
printf ("$Id$\n");
printf ("$HeadURL$\n");
return -10; return -10;
} }