diff -up mm2.7/src/configure.in.cleanup mm2.7/src/configure.in --- mm2.7/src/configure.in.cleanup 2009-10-22 11:03:19.278480957 +0100 +++ mm2.7/src/configure.in 2009-10-22 11:06:59.923190081 +0100 @@ -282,7 +282,7 @@ case "${host}" in *-*-linux-gnu*) cat >> $tmpfile << '_EOF_' #define TMPNAME_MAX NAME_MAX -static struct termio MyTtyStateIn, MyTtyStateOut; +#define metamail_tty_state_t struct termio _EOF_ ;; @@ -290,7 +290,7 @@ #define TMPNAME_MAX 1000 #define NAME_MAX 1000 -static struct sgttyb MyTtyStateIn, MyTtyStateOut; +#define metamail_tty_state_t struct sgttyb _EOF_ ;; diff -up mm2.7/src/metamail/Makefile.am.cleanup mm2.7/src/metamail/Makefile.am --- mm2.7/src/metamail/Makefile.am.cleanup 2009-10-22 12:46:46.180176715 +0100 +++ mm2.7/src/metamail/Makefile.am 2009-10-22 13:04:07.931638393 +0100 @@ -9,6 +9,8 @@ libmetamail_la_SOURCES = error.c dlist.c xmalloc.c xstrerror.c \ xstrdup.c +BUILT_SOURCES = common.h + common.h: stamp-common @: stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status diff -up mm2.7/src/metamail/dlist.c.cleanup mm2.7/src/metamail/dlist.c --- mm2.7/src/metamail/dlist.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/metamail/dlist.c 2009-10-23 12:07:10.000000000 +0100 @@ -76,13 +76,6 @@ dlist_append(DList* list, DListEntry* ne return new; } - - -DListEntry* -dlist_insert_sort (DList* list, DListEntry* new, dlist_comp cmp) { - -} - /* retrieves the head of a list */ DListEntry* dlist_head(DList* list) { @@ -144,11 +137,6 @@ dlist_remove(DList* list, DListEntry* en return entry; } -/* checks a list to be ok (debugging) verifies head, tail and prints list */ -dlist_check( DList* list ) { - // should be implemented -} - DListEntry* dlist_search(DList* list, void* data, dlist_comp cmp) diff -up mm2.7/src/metamail/dlist.h.cleanup mm2.7/src/metamail/dlist.h --- mm2.7/src/metamail/dlist.h.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/metamail/dlist.h 2009-10-23 13:10:40.000000000 +0100 @@ -22,12 +22,10 @@ extern const DList DListNULL; extern DListEntry *dlist_new (void* data); extern void dlist_cat (DList* list1, DList* list2); -extern DListEntry *dlist_insert_new (DList* list, void* data, +extern DListEntry *dlist_insertnew (DList* list, void* data, DListEntry* pos); extern DListEntry *dlist_insert (DList* list, DListEntry* new, DListEntry* pos); -extern DListEntry *dlist_insert_sort (DList* list, DListEntry* new, - dlist_comp cmp); extern DListEntry *dlist_append (DList* list, DListEntry* new); extern DListEntry *dlist_head (DList* list); extern DListEntry *dlist_tail (DList* list); diff -up mm2.7/src/metamail/error.c.cleanup mm2.7/src/metamail/error.c --- mm2.7/src/metamail/error.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/metamail/error.c 2009-10-23 12:07:10.000000000 +0100 @@ -1,3 +1,7 @@ +/* We want the GNU version of basename(3), not the POSIX one */ +#define _GNU_SOURCE 1 +#include + #if HAVE_CONFIG_H # include "config.h" #endif @@ -5,7 +9,6 @@ #include "common.h" #include "error.h" -#include /* basename(3) */ const char *program_name = NULL; static void error PARAMS((int exit_status, const char *mode, diff -up mm2.7/src/src/metamail/codes.c.cleanup mm2.7/src/src/metamail/codes.c --- mm2.7/src/src/metamail/codes.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/codes.c 2009-10-23 13:20:25.000000000 +0100 @@ -41,6 +41,9 @@ char c; } */ +static void almostputc(int c, FILE *outfile, int PortableNewlines); +static void output64chunk(int c1, int c2, int c3, int pads, FILE *outfile); + /* the following gets a character, but fakes it properly into two chars if there's a newline character */ static int InNewline=0; @@ -67,6 +70,7 @@ int PortableNewlines; #endif } +void to64(infile, outfile, PortableNewlines) FILE *infile, *outfile; int PortableNewlines; @@ -95,6 +99,7 @@ int PortableNewlines; fflush(outfile); } +void output64chunk(c1, c2, c3, pads, outfile) FILE *outfile; { @@ -112,6 +117,7 @@ FILE *outfile; } } +int PendingBoundary(s, Boundaries, BoundaryCt) char *s; char **Boundaries; @@ -138,6 +144,7 @@ int *BoundaryCt; static int CRpending = 0; #ifdef NEWLINE_CHAR +void almostputc(c, outfile, PortableNewlines) int c; FILE *outfile; @@ -163,6 +170,7 @@ int PortableNewlines; } } #else +void almostputc(c, outfile, PortableNewlines) int c; FILE *outfile; @@ -172,6 +180,7 @@ int PortableNewlines; } #endif +void from64(infile, outfile, boundaries, boundaryct, PortableNewlines) FILE *infile, *outfile; char **boundaries; @@ -196,7 +205,9 @@ int PortableNewlines; char Buf[200]; /* a dash is NOT base 64, so all bets are off if NOT a boundary */ ungetc(c1, infile); - fgets(Buf, sizeof(Buf), infile); + if (!fgets(Buf, sizeof(Buf), infile)) { + fprintf(stderr, "warning: error in from64.fgets\n"); + } if (boundaries && (Buf[0] == '-') && (Buf[1] == '-') @@ -273,6 +284,7 @@ char c; } */ +void toqp(infile, outfile) FILE *infile, *outfile; { @@ -348,6 +360,7 @@ FILE *infile, *outfile; } } +void fromqp(infile, outfile, boundaries, boundaryct) FILE *infile, *outfile; char **boundaries; @@ -364,7 +377,9 @@ int *boundaryct; unsigned char *s; ungetc(c1, infile); - fgets(Buf, sizeof(Buf), infile); + if (!fgets(Buf, sizeof(Buf), infile)) { + fprintf(stderr, "warning: error in fromqp.fgets\n"); + } if (boundaries && (Buf[0] == '-') && (Buf[1] == '-') diff -up mm2.7/src/src/metamail/mailto.c.cleanup mm2.7/src/src/metamail/mailto.c --- mm2.7/src/src/metamail/mailto.c.cleanup 2009-10-23 15:19:58.000000000 +0100 +++ mm2.7/src/src/metamail/mailto.c 2009-10-23 17:15:31.000000000 +0100 @@ -47,7 +47,6 @@ STILL NEED TO DO/SUPPORT: struct mailpart *CreateNewPart(); char *getmyname(); /* Defined in shared.c */ - /* The main data structure for the multiple parts of the mail */ struct mailpart { @@ -56,10 +55,48 @@ struct mailpart { char *content_type; int encoding_type_needed; char *filename; - struct MailcapEntry *mc; + struct MailtoMailcapEntry *mc; struct mailpart *next, *prev; }; +static void BuildCommand(char *Buf, char *controlstring, char *TmpFileName); +static void cleanexit(int code) __attribute__((__noreturn__)); +static int ContainsEightBitChar(char *fname); +static void DeAlias(char *name, FILE *fp, char *hdr); +static void EditCurrentMessage(int UseVisual); +static void EmitAddresses(FILE *fp, char *names, char *hdr); +static void EmitHeader(FILE *fp, char *hdr, char *body); +static void EmitHeaderWithAliases(FILE *fp, char *hdr, char *names); +static void EndStyle(FILE *fp, char *s); +static void finalize(void); +static void fputsquoting(char *s, FILE *fp); +static void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode); +static void HandleAliasCommand(char *aliasline); +static void HandleSetCommand(char *cmd, int DoSet); +static void HeaderFputs(char *s, FILE *fp, char *hdr); +static void InitSignals(void); +static int MailtoProcessMailcapFiles(void); +static void nomemabort(void); +static void ProcessInitFiles(void); +static void ProcessOneMailRC(char *fname, int IsAndrew); +static void PutQP(unsigned char c, FILE *fp); +static void ReopenStyles(FILE *fp, struct mailpart *part); +static void RestoreCurrentStyles(void); +static void SetTextFlags(struct mailpart *mp); +static void StartStyle(FILE *fp, char *s, char *envstartstr); +static void SwitchToEuropean(void); +static void TempCloseStyles(FILE *fp); +static void tfputs(const char *s); +static void ToggleStyle(char *name, FILE *fp, struct mailpart *part, char *turnonstr, char *turnoffstr); +static int TranslateInputToEncodedOutput(FILE *InputFP, FILE *OutputFP, int Ecode, char *type); +static void TryClosingStyle(char *name, FILE *fp, struct mailpart *part); +static void TryOpeningStyle(char *name, FILE *fp, struct mailpart *part, char *nvstartstr); +static int WhichEncodingForFile(char *fname, char *ctype); +static void WriteContentTypeAndEncoding(FILE *fp, struct mailpart *part); +static void WriteCtypeNicely(FILE *fp, char *ct); +static int WriteDeadLetter(void); +static void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart); + /* Some globals */ struct mailpart *FirstPart = NULL; static char *Subject = NULL, *ToList = NULL, *CCList= NULL, *InReplyTo = NULL; @@ -76,7 +113,7 @@ char *mimeSignature = ".SIGNATURE"; #define DEFAULT_EDITOR "vi" -#define SYSTEM(command) system(command); +#define SYSTEM(command) system(command) /* The following are the globals that can be set via .mailrc */ @@ -100,6 +137,7 @@ int V_askcc=0, /* To ask about the Cc f int JustificationState = JUST_LEFT; +void EightBitCharHelp() { if (!CharacterSet || !strcmp(CharacterSet, "us-ascii")) { printf("There are no extended characters available for your US-ASCII terminal.\n\n"); @@ -156,7 +194,8 @@ tmpname() { return(s); } -TildeHelp() { +static void +TildeHelp(void) { char *pager; char TmpName[100], CmdBuf[150]; FILE *fp; @@ -213,7 +252,9 @@ TildeHelp() { if (fp != stdout) { fclose(fp); snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", pager ? pager : "more", TmpName); - SYSTEM(CmdBuf); + if (SYSTEM(CmdBuf) == -1) { + fprintf(stderr, "mailto: warning: failed to run command: %s\n", CmdBuf); + } unlink(TmpName); } } @@ -231,7 +272,8 @@ char *gethome() { static char standoutbuf[50], standendbuf[50], StartUnderline[50], StopUnderline[50], BoldOn[50], BoldOff[50], KS[50], KE[50]; static int termcolumns, termrows; -InitTerminal() { +static void +InitTerminal(void) { char tbuf[1024], *term, *dum; term = getenv("TERM"); @@ -274,7 +316,8 @@ InitTerminal() { fputs(KS, stdout); } -FinalizeTerminal() { +static void +FinalizeTerminal(void) { tfputs(standendbuf); tfputs(BoldOff); tfputs(StopUnderline); @@ -296,7 +339,8 @@ NewPart() { return(p); } -nomemabort() { +static void +nomemabort(void) { fprintf(stderr, "mailto: Out of memory\n"); cleanexit(-1); } @@ -357,7 +401,7 @@ char *s; if (V_commasonly) { ans = malloc(1+strlen(s)); - if (!ans) nomemabort; + if (!ans) nomemabort(); strcpy(ans, s); return(ans); } @@ -410,6 +454,7 @@ int definitelynew; return(List); } +int main(argc, argv) char **argv; { @@ -501,7 +546,7 @@ char **argv; if (strcmp(CharacterSet, "us-ascii")) { printf("Composing mail in character set %s\n", CharacterSet); } - ProcessMailcapFiles(); + MailtoProcessMailcapFiles(); if (!ToList) { sdum=GetLineMalloced("To", ""); ToList=AddCommasToAddressList(sdum); @@ -545,7 +590,9 @@ char **argv; break; case '!': if (!V_quiet) printf("Executing: %s\n", start); - SYSTEM(start); + if (SYSTEM(start) == -1) { + fprintf(stderr, "mailto: warning: failed to execute: %s\n", start); + } break; case '>': CurrentPart->isrich = 1; @@ -738,7 +785,9 @@ char **argv; cleanexit(-1); } snprintf(Cmd, sizeof(Cmd), "metamail -z %s", s); - SYSTEM(Cmd); + if (SYSTEM(Cmd) == -1) { + fprintf(stderr, "mailto: warning: failed to execute: %s\n", Cmd); + } free(s); RestoreCurrentStyles(); break; @@ -951,6 +1000,7 @@ char *newid() { return(idbuf); } +static void WriteOutMessage(fp, ToList, Subject, CCList, FirstPart) FILE *fp; char *ToList, *Subject, *CCList; @@ -1019,6 +1069,7 @@ struct mailpart *FirstPart; } } +static void WriteContentTypeAndEncoding(fp, part) FILE *fp; struct mailpart *part; @@ -1059,6 +1110,7 @@ struct mailpart *part; } } +static int TranslateInputToEncodedOutput(InputFP, OutputFP, Ecode, ctype) FILE *InputFP, *OutputFP; int Ecode; @@ -1091,6 +1143,7 @@ static char *EnvStartStack[MAX_STACK_SIZ kept open across an inserted object -- i.e. the richtext is split into two parts of a multipart message */ +static void TempCloseStyles(fp) FILE *fp; { @@ -1104,7 +1157,8 @@ FILE *fp; fflush(stdout); } -RestoreCurrentStyles() { +static void +RestoreCurrentStyles(void) { int i=0; while (ifilename); FirstPart = FirstPart->next; @@ -1331,7 +1390,8 @@ int signum; kill(getpid(), signum); } -InitSignals() { +static void +InitSignals(void) { signal(SIGINT, cleanup); signal(SIGPIPE, cleanup); signal(SIGILL, cleanup); @@ -1345,7 +1405,8 @@ InitSignals() { #endif } -WriteDeadLetter() +static int +WriteDeadLetter(void) { FILE *fp; char DeadFile[1000]; @@ -1362,7 +1423,7 @@ WriteDeadLetter() } } -struct MailcapEntry { +struct MailtoMailcapEntry { char *contenttype; char *command; char *testcommand; @@ -1372,7 +1433,7 @@ struct MailcapEntry { char *label; int needsterminal; int copiousoutput; - struct MailcapEntry *next; + struct MailtoMailcapEntry *next; } *FirstMailcapEntry = NULL; /* There are a fair number of core leaks in what follows. That should matter little -- the mailcap files are only parsed once, and are usually pretty small anyway. */ @@ -1446,18 +1507,18 @@ char *s; return(retval); /* also a bad parse */ } -struct MailcapEntry * -GetMailcapEntry(fp) +static struct MailtoMailcapEntry * +GetMailtoMailcapEntry(fp) FILE *fp; { int rawentryalloc = MAX_LINELENGTH, len; char *rawentry, *s, *t, *LineBuf; - struct MailcapEntry *mc; + struct MailtoMailcapEntry *mc; LineBuf = malloc(MAX_LINELENGTH); if (!LineBuf) nomemabort(); rawentry = malloc(1 + rawentryalloc); - mc = (struct MailcapEntry *) malloc(sizeof (struct MailcapEntry)); + mc = (struct MailtoMailcapEntry *) malloc(sizeof (struct MailtoMailcapEntry)); if (!rawentry || !mc) nomemabort(); *rawentry = '\0'; while (fgets(LineBuf, MAX_LINELENGTH, fp)) { @@ -1539,11 +1600,11 @@ FILE *fp; return(mc); } -ProcessMailcapFiles() +static int MailtoProcessMailcapFiles(void) { char *s, *path = getenv("MAILCAPS"), *origpath; static char *stdpath = STDPATH; - struct MailcapEntry *mc, *CurrentMailcapEntry = NULL; + struct MailtoMailcapEntry *mc, *CurrentMailcapEntry = NULL; FILE *fp; if (!path) { @@ -1567,7 +1628,7 @@ ProcessMailcapFiles() if (s) *s++ = '\0'; fp = fopen(path, "r"); while (fp && !feof(fp)) { - mc = GetMailcapEntry(fp); + mc = GetMailtoMailcapEntry(fp); if (!mc) continue; if (!FirstMailcapEntry) { FirstMailcapEntry = mc; @@ -1587,7 +1648,7 @@ ProcessMailcapFiles() struct mailpart * CreateNewPart() { struct mailpart *mp; - struct MailcapEntry *mc = FirstMailcapEntry; + struct MailtoMailcapEntry *mc = FirstMailcapEntry; int i, ans, resultcode; char LineBuf[100], *CmdBuf; @@ -1610,14 +1671,18 @@ CreateNewPart() { } printf("\n\nEnter your choice as a number from 0 to %d: ", i); fflush(stdout); - fgets(LineBuf, sizeof(LineBuf), stdin); + if (fgets(LineBuf, sizeof(LineBuf), stdin) == NULL) { + ans = 0; + } ans = atoi(LineBuf); if (ans == 0 || ans == 1) { char *sdum, CTLineBuf[100]; FILE *fpi, *fpo; printf("\nIf you want to include non-textual data from a file, enter the file name.\nTo include the output of a command, enter \"|\" followed by the command.\nIf you do not want to include anything, just press ENTER (RETURN).\n> "); fflush(stdout); - fgets(CTLineBuf, sizeof(CTLineBuf), stdin); + if (fgets(CTLineBuf, sizeof(CTLineBuf), stdin) == NULL) { + CTLineBuf[0] = '\0'; + } sdum = CTLineBuf+strlen(CTLineBuf) -1; while (sdum >= CTLineBuf && isspace((unsigned char) *sdum)) { *sdum = '\0'; @@ -1656,7 +1721,10 @@ CreateNewPart() { int ct; printf("\nEnter the MIME Content-type value for the data from file %s\n (type '?' for a list of locally-valid content-types): ", sdum); fflush(stdout); - fgets(LineBuf, sizeof(LineBuf), stdin); + if (fgets(LineBuf, sizeof(LineBuf), stdin) == NULL) { + LineBuf[0] = '\n'; + LineBuf[1] = '\0'; + } LineBuf[strlen(LineBuf)-1]='\0'; if (index(LineBuf, '/')) { char lc[100], *s, AnsBuf[100]; @@ -1833,6 +1901,7 @@ CreateNewPart() { return(mp); } +static void SetTextFlags(mp) struct mailpart *mp; { @@ -1844,6 +1913,7 @@ struct mailpart *mp; } } +static int WhichEncodingForFile(fname, ctype) char *fname, *ctype; { @@ -1880,6 +1950,7 @@ char *fname, *ctype; return(ENC_NONE); } +static void BuildCommand(Buf, controlstring, TmpFileName) char *Buf, *controlstring, *TmpFileName; { @@ -1918,6 +1989,7 @@ char *Buf, *controlstring, *TmpFileName; } } +static int CtypeMatch(ctype, pat) char *ctype, *pat; { @@ -1939,13 +2011,14 @@ char *ctype, *pat; return(0); } +static void EditCurrentMessage(UseVisual) int UseVisual; { char *editor = NULL; char *CmdBuf, *CmdBuf2, LineBuf[100]; struct mailpart *mp, *lastmp=NULL; - struct MailcapEntry *mc; + struct MailtoMailcapEntry *mc; int partct=1, ans; CmdBuf = malloc(CMDSIZE); @@ -1963,7 +2036,9 @@ int UseVisual; /* Only one part */ snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, FirstPart->filename); printf("Executing: %s\n", CmdBuf); - SYSTEM(CmdBuf); + if (SYSTEM(CmdBuf) == -1) { + fprintf(stderr, "mailto: warning: failed to execute: %s\n", CmdBuf); + } if ((FirstPart->istext || FirstPart->isrich) && FirstPart->encoding_type_needed == ENC_NONE && ContainsEightBitChar(FirstPart->filename)) { @@ -2000,15 +2075,22 @@ int UseVisual; printf("2: %s\n", CmdBuf); printf("\n\nEnter 1 or 2, or 0 to not edit it: "); fflush(stdout); - fgets(LineBuf, sizeof(LineBuf), stdin); - ans = atoi(LineBuf); + if (fgets(LineBuf, sizeof(LineBuf), stdin) == NULL) { + ans = 0; + } else { + ans = atoi(LineBuf); + }; } else ans = 2; if (ans == 1) { printf("Executing: %s\n", CmdBuf2); - SYSTEM(CmdBuf2); + if (SYSTEM(CmdBuf2) == -1) { + fprintf(stderr, "mailto: warning: failed to execute: %s\n", CmdBuf2); + } } else if (ans == 2) { printf("Executing: %s\n", CmdBuf); - SYSTEM(CmdBuf); + if (SYSTEM(CmdBuf) == -1) { + fprintf(stderr, "mailto: warning: failed to execute: %s\n", CmdBuf); + } } if ((mp->istext || mp->isrich) && mp->encoding_type_needed == ENC_NONE && @@ -2025,7 +2107,8 @@ int UseVisual; } -ProcessInitFiles() { +static void +ProcessInitFiles(void) { char fname[FILE_NAME_SIZE]; ProcessOneMailRC("/usr/lib/Mail.rc", 0); @@ -2071,6 +2154,7 @@ int IsAndrew; } } +static void ProcessOneMailRC(fname, IsAndrew) char *fname; int IsAndrew; @@ -2105,6 +2189,7 @@ int IsAndrew; fclose(fp); } +static void HandleSetCommand(cmd, DoSet) char *cmd; int DoSet; @@ -2149,6 +2234,7 @@ struct alias { struct alias *next; } *FirstAlias = NULL; +static void HandleAliasCommand(aliasline) char *aliasline; { @@ -2178,6 +2264,7 @@ char *aliasline; FirstAlias = tmpalias; } +static void EmitHeader(fp, hdr, body) FILE *fp; char *hdr; @@ -2216,6 +2303,7 @@ char *s; return(NULL); } +static void HeaderFputs(s, fp, hdr) char *s; FILE *fp; @@ -2257,6 +2345,7 @@ char *hdr; static char basis_hex[] = "0123456789ABCDEF"; +static void PutQP(c, fp) unsigned char c; FILE *fp; @@ -2266,6 +2355,7 @@ FILE *fp; putc(basis_hex[c&0xF], fp); } +static void EmitHeaderWithAliases(fp, hdr, names) FILE *fp; char *hdr; @@ -2277,6 +2367,7 @@ char *names; fputs("\n", fp); } +static void EmitAddresses(fp, names, hdr) FILE *fp; char *names; @@ -2295,6 +2386,7 @@ char *hdr; } } +static void DeAlias(name, fp, hdr) char *name; FILE *fp; @@ -2321,6 +2413,7 @@ char *hdr; } +static void WriteCtypeNicely(fp, ct) FILE *fp; char *ct; @@ -2356,6 +2449,7 @@ char *ct; } } +static void fputsquoting(s, fp) char *s; FILE *fp; @@ -2388,20 +2482,22 @@ FILE *fp; } +static int controlputc(c) char c; { - fputc(c, stdout); + return fputc(c, stdout); } /* Do the equivalent of an fputs for the terminal escape stuff */ - +static void tfputs(s) -char *s; +const char *s; { tputs(s, 1, controlputc); } +static int ContainsEightBitChar(fname) char *fname; { @@ -2422,7 +2518,8 @@ char *fname; return(eightBitSeen); } -SwitchToEuropean() { +static void +SwitchToEuropean(void) { printf("WARNING: You have entered 8-bit characters in what is supposed to be\n"); printf("plain ASCII text. If you are using a non-ASCII character set, you should\n"); printf("declare this to be the case with the MM_CHARSET environment variable.\n"); diff -up mm2.7/src/src/metamail/metamail.c.cleanup mm2.7/src/src/metamail/metamail.c --- mm2.7/src/src/metamail/metamail.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/metamail.c 2009-10-23 13:22:10.000000000 +0100 @@ -30,6 +30,8 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE environment variables and for manipulating environment variables */ #include "mailcap.h" /* mailcap file(s) parsing functions */ +#include "tmpfile.h" +#include "error.h" char fileToDelete[NAME_MAX]; @@ -88,9 +90,40 @@ struct part { struct NoAskItem *FirstNoAskItem = NULL, *FirstQuietItem = NULL; -void PrintHeader(); -void ConsumeRestOfPart(); -void ParseContentParameters(); +static metamail_tty_state_t MyTtyStateIn, MyTtyStateOut; + +static void BuildCommand(char *Buf, char *controlstring, char *TmpFileName, int *UsedTmpFileName, struct part **PartsWritten); +static void ConsumeRestOfPart(FILE *outfp); +static void CreateNewWindowPrefix(char *Prefix); +static int CtypeMatch(char *ctype, char *pat); +static void EliminateNastyChars(char *s); +static int ExecuteCommand(char *cmd, int really); +static int ExecuteMailcapEntry(struct MailcapEntry mc, char *TmpFileName, char *ThisContentType); +static void ExitWithError(char *txt); +static int HandleMessage(char *SquirrelFile, int nestingdepth); +static void maybephead(char *hdr); +static int NeedToAskBeforeExecuting(char *type); +static int OKToRun(char *ctype, char *progname, char *label); +static void ParseContentParameters(int pc, char *ct); +static int PassesTest(struct MailcapEntry *mc); +static void PauseForUser(void); +static void phead(char *s); +static void PrepareMessage(void); +static void PrintHeader(char *s, int ShowLeadingWhitespace); +static int ProcessArguments(int argc, char **argv); +static int Read822Prefix(int PrintHeads, int nestingdepth); +static void RestoreTtyState(void); +static void RunInNewWindow(char **argv, int argc, char **SourceFileNamePtr); +static int SaveSquirrelFile(char *SquirrelFile); +static void SaveTtyState(void); +static void SetUpEnvironment(void); +static int StartRawStdin(void); +static void strcatquoting(char *s1, char *s2); +static void strcpynoquotes(char *t, char *f); +static void StripTrailingSpace(char *s); +static void TranslateInputToOutput(FILE *InputFP, FILE *OutputFP, int Ecode, char *ctype); +static void usage(void); +static int WriteTmpFile(char *fname, char *ctype); sigtype cleanup(); @@ -185,13 +218,14 @@ initSignalHandlers() { } /** the main function for metamail */ +int main(argc, argv) int argc; char **argv; { int retcode = 0; - initSignalHandlers; + initSignalHandlers(); addToPath(AUXPATH); /* add additional dirs to PATH */ fileToDelete[0] = 0; @@ -254,6 +288,7 @@ char *fname; } } +int HandleMessage(SquirrelFile, nestingdepth) char *SquirrelFile; /* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */ @@ -413,8 +448,11 @@ int nestingdepth; ans = 2; } else { printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n4 -- Give another content type\n\n", octetstream ? "raw" : ContentType); - fgets(Fname, sizeof(Fname), stdin); - ans = atoi(Fname); + if (fgets(Fname, sizeof(Fname), stdin)) { + ans = atoi(Fname); + } else { + ans = 0; + } } switch(ans) { case 1: @@ -427,7 +465,9 @@ int nestingdepth; needname = 0; printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname); fflush(stdout); - fgets(Fname, sizeof(Fname), stdin); + if (!fgets(Fname, sizeof(Fname), stdin)) { + continue; + } Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */ if (!Fname[0]) strcpy(Fname, suggestedname); @@ -489,7 +529,10 @@ int nestingdepth; ContentType = malloc(64); printf("Please enter new content type> "); fflush(stdout); - fgets(ContentType, 64, stdin); + if (!fgets(ContentType, 64, stdin)) { + free(savedContentType); + return(0); + } ContentType[strlen(ContentType) - 1] = '\0'; /* bogus newline */ if (!ProcessMailcapFiles(SquirrelFile)) { free(savedContentType); @@ -550,6 +593,7 @@ int nestingdepth; return(-1); /* Unrecognized, really */ } +int ProcessArguments(argc, argv) int argc; char **argv; @@ -633,7 +677,9 @@ char **argv; break; case 'R': #ifdef RESET_PROGRAM - system(RESET_PROGRAM); + if (system(RESET_PROGRAM) == -1) { + fprintf(stderr, "metamail warning: failed to run %s\n", RESET_PROGRAM); + }; if (DoDebug) printf("Executed reset\n"); #else fprintf(stderr, "metamail warning: -R flag not supported on this system\n"); @@ -733,11 +779,13 @@ char **argv; return(0); } -usage() { +void +usage(void) { fprintf(stderr, "Usage: metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p] [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n"); ExitWithError(NULL); } +void RunInNewWindow(argv, argc, SourceFileNamePtr) char **argv, **SourceFileNamePtr; int argc; @@ -768,7 +816,10 @@ int argc; /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window. This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this. */ /* So, first we copy everything to stdout */ sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr); - system(FullCmd); /* Cheesy way to do it */ + /* Cheesy way to do it */ + if (system(FullCmd) == -1) { + fprintf(stderr, "metamail: warning: failed to execute %s\n", FullCmd); + } fflush(stdout); fflush(stderr); } /* Then we run ourselves in a terminal window */ @@ -843,6 +894,7 @@ eatmore: } } +int TryMailcapEntry(mc, SquirrelFile) struct MailcapEntry mc; char *SquirrelFile; @@ -866,6 +918,7 @@ char *SquirrelFile; return(-1); } +int SaveSquirrelFile(SquirrelFile) char *SquirrelFile; { @@ -894,6 +947,7 @@ char *SquirrelFile; return(0); } +int ExecuteMailcapEntry(mc, TmpFileName, ThisContentType) char *TmpFileName, *ThisContentType; struct MailcapEntry mc; @@ -1033,6 +1087,7 @@ struct MailcapEntry mc; return(0); } +int PassesTest(mc) struct MailcapEntry *mc; { @@ -1080,6 +1135,7 @@ char *s, **t; return(NULL); } +int GetMailcapEntry(fp, mc) FILE *fp; struct MailcapEntry *mc; @@ -1169,6 +1225,7 @@ struct MailcapEntry *mc; return(1); } +void ExitWithError(txt) char *txt; { @@ -1199,6 +1256,7 @@ char *s; return(newcopy); } +int Read822Prefix(PrintHeads, nestingdepth) int PrintHeads, nestingdepth; { @@ -1322,7 +1380,8 @@ yankagain: return 0; } -PrepareMessage() { +void +PrepareMessage(void) { int c; EncodingCode = ENCODING_NONE; @@ -1356,7 +1415,8 @@ PrepareMessage() { SetUpEnvironment(); } -SetUpEnvironment() { +void +SetUpEnvironment(void) { int i, j, environsize; char **newenviron, *mailervar, *summaryvar, *ctypevar, *s; static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25]; @@ -1433,11 +1493,14 @@ SetUpEnvironment() { environ = newenviron; if (DoDebug) { printf("Here is the environment:\n\n"); - system("printenv"); + if (system("printenv") == -1) { + fprintf(stderr, "metamail: warning: failed to run printenv\n"); + } } } +int OKToRun(ctype, progname, label) char *ctype, *progname, *label; { @@ -1463,6 +1526,7 @@ char *ctype, *progname, *label; } } +void EliminateNastyChars(s) char *s; { @@ -1477,6 +1541,7 @@ char *s; } } +void StripTrailingSpace(s) char *s; { @@ -1528,6 +1593,7 @@ char *hdr; } /* check the header given to see if it matches any in the KeyHeadList */ +void maybephead(hdr) char *hdr; { @@ -1562,6 +1628,7 @@ char *hdr; } /* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */ +void phead(s) char *s; { @@ -1696,6 +1763,7 @@ int ShowLeadingWhitespace; PrintHeader(txtend + 2, 0); } +void BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten) char *Buf, *controlstring, *TmpFileName; int *UsedTmpFileName; @@ -1905,7 +1973,7 @@ struct part **PartsWritten; *to = 0; } -strcpynoquotes(t,f) +void strcpynoquotes(t,f) char *t, *f; { static char *badchars="|<>%*?\"`'"; @@ -1916,6 +1984,7 @@ char *t, *f; } } +int WriteTmpFile(fname, ctype) char *fname; char *ctype; @@ -1934,7 +2003,7 @@ char *ctype; return(retval); } - +void TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype) FILE *InputFP, *OutputFP; int Ecode; @@ -1960,6 +2029,7 @@ char *ctype; } else InputFP = stdin; } +void CreateNewWindowPrefix(Prefix) char *Prefix; { @@ -1990,14 +2060,16 @@ char *Prefix; int HasSavedTtyState=0; -SaveTtyState() { - /* Bogus -- would like a good portable way to reset the terminal state here */ +void +SaveTtyState(void) { + /* Bogus -- would like a good portable way to reset the terminal state here */ ioctl(fileno(stdin), TCGETA, &MyTtyStateIn); ioctl(fileno(stdout), TCGETA, &MyTtyStateOut); HasSavedTtyState = 1; - } +} +void RestoreTtyState() { if (HasSavedTtyState) { ioctl(fileno(stdout), TCSETA, &MyTtyStateOut); @@ -2005,6 +2077,7 @@ RestoreTtyState() { } } +int NeedToAskBeforeExecuting(type) char *type; { @@ -2016,6 +2089,7 @@ char *type; return(1); } +int NeedToBeQuiet(cmd) char *cmd; { @@ -2026,6 +2100,7 @@ char *cmd; return(0); } +int CtypeMatch(ctype, pat) char *ctype, *pat; { @@ -2052,6 +2127,7 @@ char *ctype, *pat; return(0); } +int ExecuteCommand(cmd, really) char *cmd; int really; @@ -2177,6 +2253,7 @@ char *s; return(NULL); } +void strcatquoting(s1, s2) char *s1; char *s2; @@ -2192,7 +2269,8 @@ char *s2; #endif } -PauseForUser() { +void +PauseForUser(void) { if (DefinitelyNotTty || MustNotBeTty) return; fflush(stdout); @@ -2208,7 +2286,8 @@ PauseForUser() { printf("\n"); } -StartRawStdin() { +int +StartRawStdin(void) { struct termio orterm, fterm; ioctl(0, TCGETA, &orterm); /* get current (i.e. cooked) termio */ fterm = orterm; /* get termio to modify */ diff -up mm2.7/src/src/metamail/metamail.h.cleanup mm2.7/src/src/metamail/metamail.h --- mm2.7/src/src/metamail/metamail.h.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/metamail.h 2009-10-23 13:15:37.000000000 +0100 @@ -3,6 +3,7 @@ #include #include +#include "mailcap.h" BEGIN_C_DECLS @@ -55,6 +56,20 @@ extern int MaybePageOutput END_C_DECLS +extern int DoesNeedPortableNewlines(char *ctype); +extern int ExceptionalNewline(char *contenttype, int needsportable); +extern void from64(FILE *infile, FILE *outfile, char **boundaries, int *boundaryct, int PortableNewlines); +extern void fromqp(FILE *infile, FILE *outfile, char **boundaries, int *boundaryct); +extern void fromuue (FILE *infp, FILE *outfp, char **boundaries, int *ctptr); +extern int GetMailcapEntry(FILE *fp, struct MailcapEntry *mc); +extern int IsDirectory(char *fname); +extern int lc2strcmp(char *s1, char *s2); +extern int lc2strncmp(char *s1, char *s2, int len); +extern int PendingBoundary(char *s, char **Boundaries, int *BoundaryCt); +extern void to64(FILE *infile, FILE *outfile, int PortableNewlines); +extern void toqp(FILE *infile, FILE *outfile); +extern int TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile); + #endif /* METAMAIL_H */ diff -up mm2.7/src/src/metamail/mimencode.c.cleanup mm2.7/src/src/metamail/mimencode.c --- mm2.7/src/src/metamail/mimencode.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/mimencode.c 2009-10-23 13:13:53.000000000 +0100 @@ -13,6 +13,7 @@ OF THIS MATERIAL FOR ANY PURPOSE. IT IS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ #include +#include "metamail.h" //#ifdef MSDOS //#include @@ -21,6 +22,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #define BASE64 1 #define QP 2 /* quoted-printable */ +int main(argc, argv) int argc; char **argv; diff -up mm2.7/src/src/metamail/shared.c.cleanup mm2.7/src/src/metamail/shared.c --- mm2.7/src/src/metamail/shared.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/shared.c 2009-10-23 12:07:10.000000000 +0100 @@ -6,11 +6,13 @@ #include #include #endif +#include "metamail.h" char **Exceptions; int *NeedsPortableNewlines; int ExceptionsAlloced = 0, ExceptionsUsed = 0; +int ExceptionalNewline(contenttype, needsportable) char *contenttype; int needsportable; @@ -40,6 +42,7 @@ int needsportable; return(0); } +int DoesNeedPortableNewlines(ctype) char *ctype; { @@ -65,6 +68,7 @@ char *ctype; return(0); } +int lc2strncmp(s1, s2, len) char *s1, *s2; int len; @@ -78,6 +82,7 @@ int len; return((*s1 == *s2) ? 0 : -1); } +int lc2strcmp(s1, s2) char *s1, *s2; { diff -up mm2.7/src/src/metamail/splitmail.c.cleanup mm2.7/src/src/metamail/splitmail.c --- mm2.7/src/src/metamail/splitmail.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/splitmail.c 2009-10-23 13:29:55.000000000 +0100 @@ -29,6 +29,7 @@ extern char *getmyname(); #define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi" #define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi" +void usageexit() { fprintf(stderr, "Usage: splitmail [-d] [-v] [-s splitsize] [-i id-suffix] [-p prefix] [file-name]\n"); exit(-1); @@ -37,6 +38,21 @@ usageexit() { char *MonthNames[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; char *DayNames[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; +static void HandleOnePart(int DoDeliver, + char *deliverycmd, + char *prefix, + int numparts, + int whichpart, + char *SharedHeaders, + char *SubjectBuf, + char *id, + char *MessageID, + char *bigbuf, + char *OrigID); +static int IllegalContentType(char *ctype); +static int ShareThisHeader(char *s, char *SubjectBuf, size_t size, char **OrigID); +static int ULstrcmp(register char *s1, register char *s2); + char * endofheader(s) char *s; @@ -51,6 +67,7 @@ char *s; } } +int main(argc, argv) char **argv; { @@ -209,6 +226,7 @@ char **argv; return(0); } +static void HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID) int DoDeliver, numparts, whichpart; char *deliverycmd, *prefix, *SharedHeaders, *SubjectBuf, *id, *MessageID, *bigbuf, *OrigID; @@ -216,9 +234,6 @@ char *deliverycmd, *prefix, *SharedHeade FILE *fpout; char OutputFile[1000]; int code; - // struct timeval tp; - // struct timezone tzp; - char *tm_zone; if (DoDeliver) { fpout = popen(deliverycmd, "w"); @@ -249,15 +264,7 @@ char *deliverycmd, *prefix, *SharedHeade fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (GMT)\n", DayNames[gt->tm_wday], gt->tm_mday, MonthNames[gt->tm_mon], 1900+gt->tm_year, gt->tm_hour, gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff); - //#else - //clock=time(0); - //gt = localtime(&clock); - //gettimeofday(&tp, &tzp); - //tm_zone = (char *)timezone(tzp.tz_minuteswest, gt->tm_isdst); - //secsoff = tzp.tz_minuteswest * 60; - //#else secsoff= gt->tm_gmtoff; - //#endif if (secsoff < 0) { signoff = '-'; secsoff *= -1; @@ -301,6 +308,7 @@ static char *SharedHeads[] = { NULL }; +static int ShareThisHeader(s, SubjectBuf, size, OrigID) char *s; char *SubjectBuf; @@ -343,6 +351,7 @@ char **OrigID; static char *tspecials = "()<>@,;:\\\"/[]?.="; +static int IllegalContentType(ctype) char *ctype; { @@ -415,7 +424,7 @@ char *ctype; return(0); } -int ULstrcmp(s1, s2) +static int ULstrcmp(s1, s2) register char *s1, *s2; { char c1,c2; diff -up mm2.7/src/src/metamail/tmpfile.c.cleanup mm2.7/src/src/metamail/tmpfile.c --- mm2.7/src/src/metamail/tmpfile.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/tmpfile.c 2009-10-23 13:10:55.000000000 +0100 @@ -3,6 +3,7 @@ #include "tmpfile.h" #include "metamail.h" +#include "error.h" DList TmpNameList = { NULL, NULL }; @@ -34,7 +35,7 @@ MkTmpFileName(name) fprintf(stderr, "name = \"%s\"\n", name); AddTmpFileName( name ); if (DoDebug) - fprintf( stderr, "MkTmpFileName END\n", name); + fprintf(stderr, "MkTmpFileName END\n"); } else { metamail_warning( "couldn't optain tmpfile: ", xstrerror( errno ) ); return; @@ -85,7 +86,7 @@ RmTmpFileName(name) if (DoDebug) fprintf( stderr, "filename: %s\n", name ); if (!access( name, R_OK ) ) { if(unlink( name ) == -1) - metamail_error( stderr, "error unlinking: ", xstrerror( errno ) ); + metamail_error("error unlinking: ", xstrerror( errno ) ); } XFREE( help->data ); XFREE( help ); @@ -101,19 +102,18 @@ CleanupTmpFiles( void ) fprintf( stderr, "CleanupTmpFiles:\n" ); while ( TmpNameList.head ) { - if (DoDebug) fprintf(stderr, "tmpfile: %s %X\n", TmpNameList.head->data, + if (DoDebug) fprintf(stderr, "tmpfile: %s %p\n", (char *) TmpNameList.head->data, TmpNameList.head->next); if (!access( (char*) TmpNameList.head->data, R_OK )) { if (DoDebug) fprintf( stderr, "access file yes\n" ); if (unlink( (char*) TmpNameList.head->data ) < 0) { if (DoDebug) - metamail_error( stderr, "error unlinking: ", - (char*) TmpNameList.head->data ); + metamail_error("error unlinking: ", (char*) TmpNameList.head->data ); } } help = dlist_remove( &TmpNameList, TmpNameList.head ); - if (DoDebug) fprintf( stderr, "%X\n", help ); + if (DoDebug) fprintf( stderr, "%p\n", help ); XFREE( help->data ); XFREE( help ); } diff -up mm2.7/src/src/metamail/uue.c.cleanup mm2.7/src/src/metamail/uue.c --- mm2.7/src/src/metamail/uue.c.cleanup 2009-10-23 12:07:10.000000000 +0100 +++ mm2.7/src/src/metamail/uue.c 2009-10-23 12:07:10.000000000 +0100 @@ -1,10 +1,12 @@ #include +#include "metamail.h" /* * hack to metamail to decode uuencoded bodyparts * Written by Keith Moore, February 1992 */ +void uueget (ptr, outfp, n) char *ptr; FILE *outfp; @@ -29,8 +31,8 @@ FILE *outfp; putc (c3, outfp); } - -getline (buf, size, fp) +int +uugetline (buf, size, fp) char *buf; int size; FILE *fp; @@ -62,6 +64,7 @@ FILE *fp; } +void fromuue (infp, outfp, boundaries, ctptr) FILE *infp, *outfp; char **boundaries; @@ -70,7 +73,7 @@ int *ctptr; char buf[63]; while (1) { - if (getline (buf, sizeof buf, infp) < 0) { + if (uugetline (buf, sizeof buf, infp) < 0) { fprintf (stderr, "Premature EOF!\n"); return; } @@ -82,7 +85,7 @@ int *ctptr; } } while (1) { - if (getline (buf, sizeof buf, infp) < 0) { + if (uugetline (buf, sizeof buf, infp) < 0) { fprintf (stderr, "Premature EOF!\n"); return; } diff -up mm2.7/src/src/richmail/iso2022.c.cleanup mm2.7/src/src/richmail/iso2022.c --- mm2.7/src/src/richmail/iso2022.c.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/iso2022.c 2009-10-26 12:04:06.000000000 +0000 @@ -44,6 +44,9 @@ #include "richlex.h" #include "richset.h" +extern void controloutput(char *, int); +extern int controlputc(int); + /* * Global data for this module. */ @@ -73,7 +76,7 @@ static int OutAsciiMode; /* * Initialise the ISO-2022 character set processor. */ -iso2022_init (name) +static void iso2022_init (name) char *name; { SwToAscii = 'B'; @@ -97,7 +100,7 @@ char *name; /* * Process a command for the ISO-2022 processor. */ -int iso2022_command (token,negated) +static int iso2022_command (token,negated) char *token; int negated; { @@ -224,7 +227,7 @@ int negated; /* * Check for singleton ISO-2022 tokens. */ -int iso2022_single (token) +static int iso2022_single (token) char *token; { return (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN) || @@ -235,7 +238,7 @@ char *token; /* * Determine the width of a ISO-2022 character. */ -int iso2022_width (ch) +static int iso2022_width (ch) RCHAR ch; { return (ch & 0xFF00 ? 2 : 1); @@ -244,7 +247,7 @@ RCHAR ch; /* * Determine if the current character can be used as a folding point. */ -int iso2022_fold (ch) +static int iso2022_fold (ch) RCHAR ch; { if (ch < 0x7F && isspace (ch)) { @@ -257,7 +260,7 @@ RCHAR ch; /* * Render the given ISO-2022 character. */ -iso2022_render (ch,param) +static void iso2022_render (ch,param) RCHAR ch; void *param; { @@ -294,7 +297,7 @@ void *param; /* * Enter or leave the ISO-2022 encoding. */ -iso2022_encoding (newenc) +static void iso2022_encoding (newenc) int newenc; { switch (newenc) { @@ -325,7 +328,7 @@ struct charsetproc iso2022_charset = * Define an output routine for slotting into RichtextPutc so * that ISO-2022 escape sequences are treated correctly. */ -int iso2022_fputc (ch,file) +int iso2022_fputc (ch,file) int ch; FILE *file; { @@ -372,4 +375,5 @@ FILE *file; } OutPrevPrevChar = OutPrevChar; OutPrevChar = ch; + return ch; } diff -up mm2.7/src/src/richmail/richlex.c.cleanup mm2.7/src/src/richmail/richlex.c --- mm2.7/src/src/richmail/richlex.c.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/richlex.c 2009-10-26 12:30:53.000000000 +0000 @@ -49,9 +49,6 @@ int CorrectionEnabled = 1; /* Zero if correction has been disabled */ int RichtextLessThanFlag = 0; /* Non-zero to turn on multi-byte '<' hack */ -//extern int fgetc (); -//extern int fputc (); - int (*RichtextGetc) () = fgetc; /* Function to call to get characters */ int (*RichtextPutc) () = fputc; /* Function to call to put characters */ int RichtextCharEncoding = RICH_ENC_US_ASCII; /* Current encoding mode */ @@ -103,7 +100,7 @@ static int PushbackExtract=0; /* * Reset the richtext parsing mechanism. */ -richtextreset() +void richtextreset() { StackSize = 0; FlushStack = 0; @@ -189,7 +186,7 @@ static int richtextmatchup() * Determine if the current token is one of the singleton * richtext commands: , , . */ -static richtextsingle(TextEnriched) +static int richtextsingle(TextEnriched) int TextEnriched; { return (charsetsingle (NextToken) || @@ -359,7 +356,7 @@ int nofill; /* Inside a nofill env we pa newc = RGET(file); if (newc == ')') { newc = RGET(file); /* 4-byte ESC-$-)-? sequence */ - sprintf(token,ISO2022_CHARSET,newc); + sprintf(token,ISO2022_CHARSET); } else { sprintf(token,ISO2022_GENERIC,newc); } @@ -414,7 +411,7 @@ int nofill; /* Inside a nofill env we pa /* * Output a string via "RichtextPutc". */ -static richtextoutstr(str,outparam) +void static richtextoutstr(str,outparam) char *str; void *outparam; { @@ -428,7 +425,7 @@ void *outparam; * Read the input stream, correct the richtext, and write the * results to the output stream. */ -richtextcorrect(inparam,outparam,TextEnriched) +void richtextcorrect(inparam,outparam,TextEnriched) void *inparam,*outparam; int TextEnriched; { @@ -457,7 +454,7 @@ int TextEnriched; * Change the encoding used for characters not present in * richtext command sequences. */ -richtextencoding(encoding) +void richtextencoding(encoding) int encoding; { RichtextCharEncoding = encoding; diff -up mm2.7/src/src/richmail/richlex.h.cleanup mm2.7/src/src/richmail/richlex.h --- mm2.7/src/src/richmail/richlex.h.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/richlex.h 2009-10-26 12:33:03.000000000 +0000 @@ -72,19 +72,19 @@ extern int RichtextLessThanFlag; /* * Define the function to call to get characters from * the message. The calling convention of this - * function is: "int func (void *param)". The default + * function is: "int func (FILE *param)". The default * value is "fgetc". The function must return EOF * at the end of the messsage; */ -extern int (*RichtextGetc) (); +extern int (*RichtextGetc) (FILE *param); /* * Define the function to call to output characters from * richtextcorrect. The calling convention of this - * function is: "int func (int c,void *param)". The default + * function is: "int func (int c,FILE *param)". The default * value is "fputc". */ -extern int (*RichtextPutc) (); +extern int (*RichtextPutc) (int c, FILE *param); /* * Define the maximum size of richtext command tokens. @@ -105,7 +105,7 @@ extern int (*RichtextPutc) (); /* * Reset the richtext parsing mechanism. */ -extern richtextreset(); +extern void richtextreset(void); /* * Get the next token from the input stream. RICHTEXT_COMMAND @@ -119,7 +119,7 @@ extern richtextreset(); * The "file" parameter is passed to the function pointed to by * "RichtextGetc" on each call. */ -extern RCHAR richtextlex( /* void *file,char *token,int TextEnriched */ ); +extern RCHAR richtextlex(void *file, char *token, int TextEnriched, int nofill); /* * Read the input stream, correct the richtext, and write the @@ -127,7 +127,7 @@ extern RCHAR richtextlex( /* void *file, * "RichtextPutc" function as the second argument, and "inparam" * is passed to "richtextlex" during parsing. */ -extern richtextcorrect( /* void *inparam,void *outparam,int TextEnriched */ ); +extern void richtextcorrect(void *inparam, void *outparam, int TextEnriched); #define RICH_ENC_US_ASCII 0 /* US-ASCII encoding: one-byte */ #define RICH_ENC_JP_ASCII 1 /* JP-ASCII encoding: one-byte */ @@ -147,7 +147,7 @@ extern int RichtextCharEncoding; * Change the encoding used for characters not present in * richtext command sequences. */ -extern richtextencoding( /* int encoding */ ); +extern void richtextencoding(int encoding); /* * Define a number of macros for decoding multi-byte character --- mm2.7/src/src/richmail/richset.c.cleanup 2009-10-26 12:41:33.000000000 +0000 +++ mm2.7/src/src/richmail/richset.c 2009-10-26 12:43:44.000000000 +0000 @@ -59,7 +59,7 @@ static int CharEncStack[MAX_CHAR_SETS]; * a particular base processor. The initialisation function of all * character set processors is called. */ -charsetinit (charset,name) +void charsetinit (charset,name) struct charsetproc *charset; char *name; { @@ -77,7 +77,7 @@ char *name; * Initialise the stack, starting with a character set processor with * a particular name. */ -charsetnameinit (name) +void charsetnameinit (name) char *name; { int temp = 0; @@ -111,7 +111,7 @@ char *name; /* * Push a new character set processor onto the stack. */ -charsetpush (charset) +void charsetpush (charset) struct charsetproc *charset; { if (NumCharSets >= MAX_CHAR_SETS) { @@ -129,7 +129,7 @@ struct charsetproc *charset; * if it matches the given processor. Note: the base * processor is never popped off. */ -charsetpop (charset) +void charsetpop (charset) struct charsetproc *charset; { if (NumCharSets > 1 && CharSets[NumCharSets - 1] == charset) { @@ -157,7 +157,7 @@ struct charsetproc *charset; * Set the details for a character set member in the top-most * character set. */ -charmember (member,ch) +void charmember (member,ch) struct charsetmember *member; RCHAR ch; { @@ -168,7 +168,7 @@ RCHAR ch; /* * Set the details for a member of a specific character set. */ -charmemberspec (member,ch,charset) +void charmemberspec (member,ch,charset) struct charsetmember *member; RCHAR ch; struct charsetproc *charset; @@ -180,7 +180,7 @@ struct charsetproc *charset; /* * Set the details for a output control code character. */ -charmemberctrl (member,ch) +void charmemberctrl (member,ch) struct charsetmember *member; RCHAR ch; { diff -up mm2.7/src/src/richmail/richset.h.cleanup mm2.7/src/src/richmail/richset.h --- mm2.7/src/src/richmail/richset.h.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/richset.h 2009-10-26 12:09:01.000000000 +0000 @@ -58,13 +58,13 @@ BEGIN_C_DECLS struct charsetproc { char *names; - int (*init) ( /* char *name */ ); - int (*command) ( /* char *token, int negated */ ); - int (*single) ( /* char *token */ ); - int (*width) ( /* RCHAR c */ ); - int (*fold) ( /* RCHAR c */ ); - int (*render) ( /* RCHAR c, void *param */ ); - int (*encoding) ( /* int newenc */ ); + void (*init) (char *name); + int (*command) (char *token, int negated); + int (*single) (char *token); + int (*width) (RCHAR c); + int (*fold) (RCHAR c); + void (*render) (RCHAR c, void *param); + void (*encoding) (int newenc); }; /* @@ -89,48 +89,47 @@ struct charsetmember * a particular base processor. The initialisation function of all * character set processors is called. */ -extern charsetinit ( /* struct charsetproc *charset, char *name */ ); +extern void charsetinit (struct charsetproc *charset, char *name); /* * Initialise the stack, starting with a character set processor with * a particular name. */ -extern charsetnameinit ( /* char *name */ ); +extern void charsetnameinit (char *name); /* * Push a new character set processor onto the stack. */ -extern charsetpush ( /* struct charsetproc *charset */ ); +extern void charsetpush (struct charsetproc *charset); /* * Pop the top-most character set processor off the stack * if it matches the given processor. Note: the base * processor is never popped off. */ -extern charsetpop ( /* struct charsetproc *charset */ ); +extern void charsetpop (struct charsetproc *charset); /* * See if the character set processor on the top of the stack * matches the given processor. */ -extern int charsettop ( /* struct charsetproc *charset */ ); +extern int charsettop (struct charsetproc *charset); /* * Set the details for a character set member in the top-most * character set. */ -extern charmember ( /* struct charsetmember *member, RCHAR ch */ ); +extern void charmember (struct charsetmember *member, RCHAR ch); /* * Set the details for a member of a specific character set. */ -extern charmemberspec ( /* struct charsetmember *member, RCHAR ch, - struct charset *charset */ ); +extern void charmemberspec (struct charsetmember *member, RCHAR ch, struct charsetproc *charset); /* * Set the details for a output control code character. */ -extern charmemberctrl ( /* struct charsetmember *member, RCHAR ch */ ); +extern void charmemberctrl (struct charsetmember *member, RCHAR ch); /* * Determine if the given character is a control code character. @@ -142,12 +141,12 @@ extern charmemberctrl ( /* struct charse * "command" function of all character set processors. Returns * zero if the command was not processed. */ -extern int charsetcommand ( /* char *token, int negated */ ); +extern int charsetcommand (char *token, int negated); /* * Test for an extension singleton command. */ -extern int charsetsingle ( /* char *token */ ); +extern int charsetsingle (char *token); /* * Get the width of a particular character. diff -up mm2.7/src/src/richmail/richtext.c.cleanup mm2.7/src/src/richmail/richtext.c --- mm2.7/src/src/richmail/richtext.c.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/richtext.c 2009-10-26 11:49:37.000000000 +0000 @@ -36,7 +36,6 @@ static int linepos = 0, inspace = 0, lef static int workingleft = 0, workingright, inexcerpt = 0, insignature = 0; static int highlight=0, underline=0, bold=0, nofill=0; static int termcolumns=80, termrows=23; -int controlputc(); /* A common problem, in justifying text, is figuring out how to format a line when part of it wants to be left-justified, part right-justified, @@ -62,9 +61,20 @@ static char KS[50], KE[50], BoldOn[50], static char charsetname[50]; static int FakeTerminal; -extern tputs(); +static void outputc(RCHAR c); +static void realoutputc(struct charsetmember, int); +static void MakeWorkingMargins(void); +static void Pause(void); +static void fputsmovingright(struct charsetmember *, FILE *); +static void ResetTerminalCodes(int, int, int, int, char *, char *, int, char *, char *, int, char *, char *, int); +static void FinalizeTerminal(void); +static void outputstr(char *); +static void FPUTS(unsigned char *s, FILE *fp); +static int lc2strcmp(char *, char *); +static int richtext_main(int, char **); -static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(), lc2strcmp(); +void controloutput(char *, int); +int controlputc(int); #define OUTC(c) (outputc((RCHAR)(c))) @@ -106,7 +116,7 @@ int signum; kill(getpid(), signum); } -static InitSignals() { +static void InitSignals() { signal(SIGINT, cleanup); signal(SIGILL, cleanup); signal(SIGTRAP, cleanup); @@ -123,12 +133,6 @@ static InitSignals() { #endif } -static nomemabort() { - fprintf(stderr, "richtext: Out of memory\n"); - FinalizeTerminal(); - exit(-1); -} - #ifndef RICHTEXT_LIBRARY /* @@ -136,6 +140,7 @@ static nomemabort() { * library call. */ +int main(argc, argv) int argc; char **argv; @@ -145,6 +150,7 @@ char **argv; #endif +static int richtext_main(argc, argv) int argc; char **argv; @@ -231,34 +237,34 @@ char **argv; cp = cb; - if (dum = (char*) tgetstr("ks", &cp)) + if ((dum = (char*) tgetstr("ks", &cp))) strcpy (KS, dum); else KS[0] = '\0'; - if (dum = (char*) tgetstr("ke", &cp)) + if ((dum = (char*) tgetstr("ke", &cp))) strcpy (KE, dum); else KE[0] = '\0'; - if (dum = (char*) tgetstr("so", &cp)) + if ((dum = (char*) tgetstr("so", &cp))) strcpy (highlightbuf, dum); highlightbuf[0] = '\0'; - if (dum = (char*) tgetstr("se", &cp)) + if ((dum = (char*) tgetstr("se", &cp))) strcpy (highlightendbuf, dum); highlightendbuf[0] = '\0'; - if (dum = (char*) tgetstr("md", &cp)) + if ((dum = (char*) tgetstr("md", &cp))) strcpy (BoldOn, dum); else strcpy(BoldOn, highlightbuf); - if (dum = (char*) tgetstr("me", &cp)) + if ((dum = (char*) tgetstr("me", &cp))) strcpy (BoldOff, dum); else strcpy(BoldOff, highlightendbuf); - if (dum = (char*) tgetstr("us", &cp)) + if ((dum = (char*) tgetstr("us", &cp))) strcpy (StartUnderline, dum); else StartUnderline[0] = '\0'; - if (dum = (char*) tgetstr("ue", &cp)) + if ((dum = (char*) tgetstr("ue", &cp))) strcpy (StopUnderline, dum); else StopUnderline[0] = '\0'; - if (dum = (char*) tgetstr("nd", &cp)) + if ((dum = (char*) tgetstr("nd", &cp))) strcpy (MoveRight, dum); else { MoveRight[0] = ' '; @@ -310,7 +316,7 @@ char **argv; richtextcorrect(InputFP,stdout,TextEnriched); return(0); } - FPUTS(KS, stdout); + FPUTS((unsigned char *)KS, stdout); rightmargin = workingright = termcolumns - 1; while((c = richtextlex(InputFP,token,TextEnriched, nofill)) != (RCHAR)EOF) { if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) { @@ -555,7 +561,7 @@ char **argv; controloutput(StopUnderline, 0); } OUTC('\n'); /* for good measure */ - FPUTS(KE, stdout); + FPUTS((unsigned char *)KE, stdout); fflush(stdout); if (UsePager) { Pause(); @@ -563,31 +569,32 @@ char **argv; return(0); } -static struct charsetmember OutputBuf[1000] = {0,0}; +static struct charsetmember OutputBuf[1000] = { { 0 }, { 0 } }; static int PendingOutput = 0, PendingControls = 0; -controlputc(c) +int controlputc(c) int c; { charmemberctrl (&OutputBuf[PendingOutput],(RCHAR)c); ++PendingOutput; ++PendingControls; + return c; } -static immediate_controlputc(c) +static int immediate_controlputc(c) int c; { - (*RichtextPutc) (c, stdout); + return (*RichtextPutc) (c, stdout); } -controloutput(s, immediate) +void controloutput(s, immediate) char *s; int immediate; { tputs(s, 1, immediate ? immediate_controlputc : controlputc); } -static folding_point (buf, pos) +static int folding_point (buf, pos) struct charsetmember *buf; int pos; { @@ -599,7 +606,7 @@ int pos; return (0); } -static calc_column (buf, pos) +static int calc_column (buf, pos) struct charsetmember *buf; int pos; { @@ -614,7 +621,7 @@ int pos; return (col); } -static FlushOut() { +static void FlushOut(void) { int i, j, x; static struct charsetmember NewOutputBuf[1000]; struct charsetmember *s; @@ -704,7 +711,7 @@ static FlushOut() { StopUnderline, 0, BoldOn, BoldOff, 0); } -static outputc(c) +static void outputc(c) RCHAR c; { struct charsetmember member; @@ -712,11 +719,11 @@ RCHAR c; realoutputc(member, 0); } -static realoutputc(c, alreadyformatted) +static void realoutputc(c, alreadyformatted) struct charsetmember c; int alreadyformatted; { - int i, newinspace; + int newinspace; if (c.ch == '\n') { charmember (&OutputBuf[PendingOutput],(RCHAR)'\n'); @@ -784,7 +791,7 @@ int alreadyformatted; } } -static MakeWorkingMargins() { +static void MakeWorkingMargins(void) { int oldworkingleft=workingleft, i; workingleft = leftmargin; @@ -798,7 +805,7 @@ static MakeWorkingMargins() { } } -static Pause() +static void Pause(void) { int c; @@ -812,7 +819,7 @@ static Pause() /* Leading spaces should be output as MoveRight, to avoid having margins that are underlined or reverse video */ -static fputsmovingright(s, fp) +static void fputsmovingright(s, fp) struct charsetmember *s; FILE *fp; { @@ -832,7 +839,7 @@ FILE *fp; } } -static ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf, +static void ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf, modifiedhighlight, StartUnderline, StopUnderline, modifiedunderline, BoldOn, BoldOff, modifiedbold) char *highlightbuf, *highlightendbuf, *StartUnderline, *StopUnderline, @@ -860,27 +867,27 @@ char *highlightbuf, *highlightendbuf, *S } } -static FinalizeTerminal() { +static void FinalizeTerminal(void) { tputs(highlightendbuf, 1, immediate_controlputc); tputs(BoldOff, 1, immediate_controlputc); tputs(StopUnderline, 1, immediate_controlputc); - FPUTS(KE, stdout); + FPUTS((unsigned char *)KE, stdout); } -static outputstr(s) +static void outputstr(s) char *s; { while (*s) OUTC(*s++); } -static FPUTS(s,fp) +static void FPUTS(s,fp) unsigned char *s; FILE *fp; { while(*s) (*RichtextPutc)((int)(*s++),fp); } -static lc2strcmp(s1, s2) +static int lc2strcmp(s1, s2) char *s1, *s2; { if (!s1 || !s2) return (-1); @@ -891,15 +898,3 @@ char *s1, *s2; return((*s1 == *s2) ? 0 : -1); } -static lc2strncmp(s1, s2, len) -char *s1, *s2; -int len; -{ - if (!s1 || !s2) return (-1); - while (*s1 && *s2 && len > 0) { - if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1); - ++s1; ++s2; --len; - } - if (len <= 0) return(0); - return((*s1 == *s2) ? 0 : -1); -} diff -up mm2.7/src/src/richmail/richtoatk.c.cleanup mm2.7/src/src/richmail/richtoatk.c --- mm2.7/src/src/richmail/richtoatk.c.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/richtoatk.c 2009-10-26 12:37:59.000000000 +0000 @@ -16,7 +16,9 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #include "richlex.h" -char *translate(t) +static int ignoretoken(char *t); + +static char *translate(t) char *t; { if (!strcmp(t, "fixed")) return("typewriter"); @@ -25,7 +27,7 @@ char *t; return(t); } -main() { +int main(int argc, char **argv) { RCHAR c; int i, JustDidNewline = 0; char tok[MAX_TOKEN_SIZE + 1],*token; @@ -74,9 +76,10 @@ main() { } } fputs("\n \n\\enddata{text, 42}\n", stdout); + exit(0); } -ignoretoken(t) +static int ignoretoken(t) char *t; { if (*t == '/') ++t; @@ -86,12 +89,12 @@ char *t; return(0); } -controlputc(c) +void controlputc(c) int c; { } -controloutput(s, immediate) +void controloutput(s, immediate) char *s; int immediate; { diff -up mm2.7/src/src/richmail/usascii.c.cleanup mm2.7/src/src/richmail/usascii.c --- mm2.7/src/src/richmail/usascii.c.cleanup 2009-10-26 09:26:52.000000000 +0000 +++ mm2.7/src/src/richmail/usascii.c 2009-10-26 12:12:09.000000000 +0000 @@ -42,7 +42,7 @@ /* * Initialise the US-ASCII character set processor. */ -usascii_init (name) +static void usascii_init (name) char *name; { if (name) @@ -52,7 +52,7 @@ char *name; /* * Process a command for the US-ASCII processor. */ -int usascii_command (token,negated) +static int usascii_command (token,negated) char *token; int negated; { @@ -72,7 +72,7 @@ int negated; /* * Check for singleton US-ASCII tokens. */ -int usascii_single (token) +static int usascii_single (token) char *token; { return (0); @@ -81,7 +81,7 @@ char *token; /* * Determine the width of a US-ASCII character. */ -int usascii_width (ch) +static int usascii_width (ch) RCHAR ch; { return (1); @@ -90,7 +90,7 @@ RCHAR ch; /* * Determine if the current character can be used as a folding point. */ -int usascii_fold (ch) +static int usascii_fold (ch) RCHAR ch; { return (ch < 0x7F && isspace (ch)); @@ -99,7 +99,7 @@ RCHAR ch; /* * Render the given US-ASCII character. */ -usascii_render (ch,param) +static void usascii_render (ch, param) RCHAR ch; void *param; { @@ -109,7 +109,7 @@ void *param; /* * Enter or leave the US-ASCII encoding. */ -usascii_encoding (newenc) +static void usascii_encoding (newenc) int newenc; { /* Nothing to be done in this version */