$NetBSD: patch-af,v 1.6 2025/10/12 00:57:39 mrg Exp $

- use required standard headers
- don't provide own declarations of standard functions
- declare own functions
- use C89
- don't use gets()
- ...? (XXX)
- Add various missing prototypes, etc, for GCC 14.

--- metamail/mailto.c.orig	1994-02-09 12:30:26.000000000 -0800
+++ metamail/mailto.c	2025-10-11 17:19:50.131558639 -0700
@@ -36,11 +36,16 @@ STILL NEED TO DO/SUPPORT:
 -- Replace EditString with something that does the right thing in-line.
 */
 
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include <config.h>
 #include <pwd.h>
 #include <signal.h>
+#include <unistd.h>
+#include <termcap.h>
+#include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
@@ -50,8 +55,6 @@ STILL NEED TO DO/SUPPORT:
 #include <getfiles.h>
 #include <time.h>
 #include <lib_protos.h>
-#else
-extern char *getenv();
 #endif
 
 #ifdef SYSV
@@ -60,8 +63,47 @@ extern char *getenv();
 #include <unistd.h>
 #endif
 
-extern char *malloc(), *realloc(), *index(), *getmyname();
+#include "metamail.h"
+
 struct mailpart *CreateNewPart();
+void nomemabort();
+void cleanexit();
+void tfputs();
+void ProcessInitFiles();
+void InitSignals();
+void SwitchToEuropean();
+int ContainsEightBitChar();
+void fputsquoting();
+void WriteCtypeNicely();
+void EmitAddresses();
+void EmitHeader();
+void EmitHeaderWithAliases();
+void PutQP();
+void HandleSetCommand();
+void BuildCommand();
+int WhichEncodingForFile();
+void SetTextFlags();
+int ProcessMailcapFiles();
+int WriteDeadLetter();
+void finalize();
+void TryClosingStyle();
+void TryOpeningStyle();
+void ToggleStyle();
+void EndStyle();
+void StartStyle();
+void TempCloseStyles();
+void ReopenStyles();
+int TranslateInputToEncodedOutput();
+int RestoreCurrentStyles();
+void WriteContentTypeAndEncoding();
+
+void DeAlias(char *name, FILE *fp, char *hdr);
+void HeaderFputs(char *s, FILE *fp, char *hdr);
+void HandleAliasCommand(char *aliasline);
+void ProcessOneMailRC(char *fname, int IsAndrew);
+void EditCurrentMessage(int UseVisual);
+void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode);
+void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart);
 
 /* The main data structure for the multiple parts of the mail */
 
@@ -138,6 +180,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");
@@ -199,6 +242,7 @@ tmpname() {
     return(s);
 }
 
+void
 TildeHelp() {
     char *pager = getenv("PAGER");
     char TmpName[100], CmdBuf[150];
@@ -298,6 +342,7 @@ char *gethome() {
 static char standoutbuf[50], standendbuf[50], StartUnderline[50], StopUnderline[50], BoldOn[50], BoldOff[50], KS[50], KE[50];
 static int termcolumns, termrows;
 
+void
 InitTerminal() {
 #ifdef AMIGA
     strcpy(standoutbuf, "\x9b\x37m");   /* Enter standout (highlighted) mode */
@@ -350,6 +395,7 @@ InitTerminal() {
 #endif
 }
 
+void
 FinalizeTerminal() {
     tfputs(standendbuf);
     tfputs(BoldOff);
@@ -375,6 +421,7 @@ NewPart() {
     return(p);
 }
 
+void
 nomemabort() {
     fprintf(stderr, "mailto: Out of memory\n");
     cleanexit(-1);
@@ -484,7 +531,9 @@ int definitelynew;
     return(List);
 }
 
+void
 main(argc, argv)
+int argc;
 char **argv;
 {
     char *sdum, *LineBuf, CmdBuf[100];
@@ -570,6 +619,7 @@ char **argv;
         if (isupper(*sdum)) *sdum = tolower(*sdum);
     }
     if (strcmp(CharacterSet, "us-ascii")
+	 && strcmp(CharacterSet, "koi8-r")
          && strncmp(CharacterSet, "iso-8859-", 9)) {
         fprintf(stderr, "mailto:  Unsupported character set: %s\n", CharacterSet);
         exit(-1);
@@ -1042,10 +1092,7 @@ char *newid() {
     return(idbuf);
 }
 
-WriteOutMessage(fp, ToList, Subject, CCList, FirstPart)
-FILE *fp;
-char *ToList, *Subject, *CCList;
-struct mailpart *FirstPart;
+void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart)
 {
     FILE *fpin;
     static int ctr = 0;
@@ -1121,6 +1168,7 @@ struct mailpart *FirstPart;
     }
 }
 
+void
 WriteContentTypeAndEncoding(fp, part)
 FILE *fp;
 struct mailpart *part;
@@ -1130,6 +1178,7 @@ struct mailpart *part;
         if (part->isrich) {
             if (strcmp(CharacterSet, "us-ascii")
                  && (strncmp(CharacterSet, "iso-8859-", 9) 
+		     && strcmp(CharacterSet, "koi8-r")
                       || part->encoding_type_needed != ENC_NONE)) {
                 fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
             } else {
@@ -1140,6 +1189,7 @@ struct mailpart *part;
             WriteCtypeNicely(fp, part->content_type);
             if (strcmp(CharacterSet, "us-ascii")
                  && (strncmp(CharacterSet, "iso-8859-", 9) 
+		     && strcmp(CharacterSet, "koi8-r")
                       || part->encoding_type_needed != ENC_NONE)) {
                 fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
             } else fputs("\n", fp);
@@ -1160,6 +1210,7 @@ struct mailpart *part;
     }
 }
 
+int
 TranslateInputToEncodedOutput(InputFP, OutputFP, Ecode, ctype)
 FILE *InputFP, *OutputFP;
 int Ecode;
@@ -1192,6 +1243,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 */
 
+void
 TempCloseStyles(fp)
 FILE *fp;
 {
@@ -1205,6 +1257,7 @@ FILE *fp;
     fflush(stdout);
 }
 
+int
 RestoreCurrentStyles() {
     int i=0;
     while (i<StackSize) {
@@ -1215,6 +1268,7 @@ RestoreCurrentStyles() {
     }
 }
 
+void
 ReopenStyles(fp, part)
 FILE *fp;
 struct mailpart *part;
@@ -1227,11 +1281,13 @@ struct mailpart *part;
     }
 }
 
+void
 richtextreset()
 {
     StackSize = 0;
 }
 
+int
 AlreadyInStyle(s)
 char *s;
 {
@@ -1242,6 +1298,7 @@ char *s;
     return(0);
 }
 
+void
 StartStyle(fp, s, envstartstr)
 FILE *fp;
 char *s;
@@ -1258,6 +1315,7 @@ char *envstartstr;
     if (!V_quiet) printf("Beginning: %s\n", t);
 }
 
+void
 EndStyle(fp, s)
 FILE *fp;
 char *s;
@@ -1282,6 +1340,7 @@ char *s;
     if (!V_quiet) printf("Ending: %s\n", s);
 }
 
+void
 ToggleStyle(name, fp, part, turnonstr, turnoffstr)
 char *name;
 FILE *fp;
@@ -1301,6 +1360,7 @@ char *turnonstr, *turnoffstr;
     }
 }
 
+void
 TryOpeningStyle(name, fp, part, envstartstr)
 char *name;
 FILE *fp;
@@ -1315,6 +1375,7 @@ char *envstartstr;
     }
 }
 
+void
 TryClosingStyle(name, fp, part)
 char *name;
 FILE *fp;
@@ -1328,11 +1389,7 @@ struct mailpart *part;
     }
 }
 
-FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode)
-char *s;
-FILE *fp;
-struct mailpart *part;
-int EightBitMode, RightToLeftMode;
+void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode)
 {
     static int InNewLineSequence=1;
     int c=0;
@@ -1393,6 +1450,7 @@ int EightBitMode, RightToLeftMode;
     }
 }
 
+void
 cleanexit(code)
 int code;
 {
@@ -1400,6 +1458,7 @@ int code;
     exit(code);
 }
 
+void
 finalize() {
     while (FirstPart) {
         unlink(FirstPart->filename);
@@ -1436,6 +1495,7 @@ int signum;
 #endif
 }
 
+void
 InitSignals() {
     signal(SIGINT, cleanup);
 #ifndef AMIGA
@@ -1456,6 +1516,7 @@ InitSignals() {
 #endif
 }
 
+int
 WriteDeadLetter()
 {
     FILE *fp;
@@ -1662,6 +1723,7 @@ FILE *fp;
     return(mc);
 }
 
+int
 ProcessMailcapFiles() 
 {
     char *s, *path = getenv("MAILCAPS"), *origpath;
@@ -1745,6 +1807,7 @@ CreateNewPart() {
     }
     printf("\n\nEnter your choice as a number from 0 to %d: ", i);
     fflush(stdout);
+    *LineBuf = '\0';
     fgets(LineBuf, sizeof(LineBuf), stdin);
     ans = atoi(LineBuf);
     if (ans == 0 || ans == 1) {
@@ -1791,7 +1854,7 @@ 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);
-                gets(LineBuf);
+		fgets(LineBuf, sizeof(LineBuf), stdin);
                 if (index(LineBuf, '/')) {
                     char lc[100], *s, AnsBuf[100];
                     strcpy(lc, LineBuf);
@@ -1809,7 +1872,7 @@ CreateNewPart() {
                     }
                     if (mc) break;
                     printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
-                    s = gets(AnsBuf);
+		    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
                     while (s && *s && isspace((unsigned char) *s)) ++s;
                     if (s && (*s == 'y' || *s == 'Y')) break;
                     continue;
@@ -1967,6 +2030,7 @@ CreateNewPart() {
     return(mp);
 }
 
+void
 SetTextFlags(mp)
 struct mailpart *mp;
 {
@@ -1978,6 +2042,7 @@ struct mailpart *mp;
     }
 }
 
+int
 WhichEncodingForFile(fname, ctype)
 char *fname, *ctype;
 {
@@ -2014,6 +2079,7 @@ char *fname, *ctype;
     return(ENC_NONE);
 }
 
+void
 BuildCommand(Buf, controlstring, TmpFileName)
 char *Buf, *controlstring, *TmpFileName;
 {
@@ -2052,6 +2118,7 @@ char *Buf, *controlstring, *TmpFileName;
     }
 }
 
+int
 CtypeMatch(ctype, pat)
 char *ctype, *pat;
 {
@@ -2073,8 +2140,7 @@ char *ctype, *pat;
     return(0);
 }
 
-EditCurrentMessage(UseVisual)
-int UseVisual;
+void EditCurrentMessage(int UseVisual)
 {
     char *editor = NULL;
     char *CmdBuf, *CmdBuf2, LineBuf[100];
@@ -2162,6 +2228,7 @@ int UseVisual;
 }
 
 
+void
 ProcessInitFiles() {
 #ifdef AMIGA
     ProcessOneMailRC(mailRC, 0);
@@ -2212,9 +2279,7 @@ int IsAndrew;
     }
 }
 
-ProcessOneMailRC(fname, IsAndrew)
-char *fname;
-int IsAndrew;
+void ProcessOneMailRC(char *fname, int IsAndrew)
 {
     FILE *fp;
     char *LineBuf = NULL, *sdum;
@@ -2246,6 +2311,7 @@ int IsAndrew;
     fclose(fp);
 }
 
+void
 HandleSetCommand(cmd, DoSet)
 char *cmd;
 int DoSet;
@@ -2290,8 +2356,7 @@ struct alias {
     struct alias *next;
 } *FirstAlias = NULL;
 
-HandleAliasCommand(aliasline)
-char *aliasline;
+void HandleAliasCommand(char *aliasline)
 {
     struct alias *tmpalias;
     char *s, *s2;
@@ -2319,6 +2384,7 @@ char *aliasline;
     FirstAlias = tmpalias;
 }
 
+void
 EmitHeader(fp, hdr, body)
 FILE *fp;
 char *hdr;
@@ -2357,10 +2423,7 @@ char *s;
     return(NULL);
 }
 
-HeaderFputs(s, fp, hdr)
-char *s;
-FILE *fp;
-char *hdr;
+void HeaderFputs(char *s, FILE *fp, char *hdr)
 {
     char *firstnonascii, *firstascii;
 
@@ -2398,6 +2461,7 @@ char *hdr;
 
 static char basis_hex[] = "0123456789ABCDEF";
 
+void
 PutQP(c, fp)
 unsigned char c;
 FILE *fp;
@@ -2407,6 +2471,7 @@ FILE *fp;
     putc(basis_hex[c&0xF], fp);
 }
 
+void
 EmitHeaderWithAliases(fp, hdr, names)
 FILE *fp;
 char *hdr;
@@ -2418,6 +2483,7 @@ char *names;
     fputs("\n", fp);
 }
 
+void
 EmitAddresses(fp, names, hdr)
 FILE *fp;
 char *names;
@@ -2436,10 +2502,7 @@ char *hdr;
     }
 }
 
-DeAlias(name, fp, hdr)
-char *name;
-FILE *fp;
-char *hdr;
+void DeAlias(char *name, FILE *fp, char *hdr)
 {
     struct alias *tmpalias;
     char *end, savechar;
@@ -2462,6 +2525,7 @@ char *hdr;
 }
 
 
+void
 WriteCtypeNicely(fp, ct)
 FILE *fp;
 char *ct;
@@ -2497,6 +2561,7 @@ char *ct;
     }
 }
 
+void
 fputsquoting(s, fp)
 char *s;
 FILE *fp;
@@ -2566,10 +2631,12 @@ char *cmd;
 }
 #endif
 
+int
 controlputc(c)
-char c;
+int c;
 {
     fputc(c, stdout);
+    return (0);
 }
 
 /* Do the equivalent of an fputs for the terminal escape stuff */
@@ -2581,12 +2648,14 @@ char *s;
     return (0);
 }
 #else
+void
 tfputs(s)
 char *s;
 {
     tputs(s, 1, controlputc);
 }
 #endif
+int
 ContainsEightBitChar(fname)
 char *fname;
 {
@@ -2607,6 +2676,7 @@ char *fname;
     return(eightBitSeen);
 }
 
+void
 SwitchToEuropean() {
     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");