head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.4 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.2 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.2.0.104 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.102 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.100 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.98 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.96 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.94 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.92 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.90 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.88 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.86 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.84 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.82 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.80 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.78 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.76 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.74 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.72 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.70 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.68 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.66 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.64 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.60 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.40 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.62 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.58 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.56 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.54 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.52 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.50 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.48 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.46 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.44 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.42 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.38 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.36 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.34 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.32 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.30 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.28 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.26 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.24 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.22 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.20 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.18 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.16 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.14 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.12 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.10 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.0.58 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.56 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.54 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.52 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.50 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.48 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.46 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.44 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.42 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.40 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.38 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.36 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.34 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.32 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.30 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.28 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.26 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.24 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.22 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.20 pkgsrc-2008Q1:1.1.0.18 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2025.10.12.00.57.39; author mrg; state Exp; branches; next 1.2; commitid IKX5SIrJGeYgsdeG; 1.2 date 2012.10.26.20.27.15; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.01.19.10.55.30; author tron; state Exp; branches; next ; desc @@ 1.3 log @make build with GCC 14. phew! it's a lot of standard things: - missing headers - missing types - conflicting types @ text @$NetBSD: patch-ar,v 1.2 2012/10/26 20:27:15 joerg Exp $ --- richmail/richtext.c.orig 1994-02-09 08:31:18.000000000 -0800 +++ richmail/richtext.c 2025-10-11 17:38:16.071403518 -0700 @@@@ -13,18 +13,18 @@@@ OF THIS MATERIAL FOR ANY PURPOSE. IT IS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ +#include #include #include #include +#include +#include +#include +#include #include "richlex.h" #include "richset.h" #include -extern char *getenv(); -#ifdef AMIGA -extern char *strchr(); -#endif - #ifdef MSDOS unsigned _stklen=16384; /* Increase stack size under MS-DOS */ #endif @@@@ -79,7 +79,15 @@@@ static int FakeTerminal; extern tputs(); #endif -static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(); +static int lc2strcmp(char *s1, char *s2); + +static void outputc(), realoutputc(), MakeWorkingMargins(), Pause(), FinalizeTerminal(), outputstr(), FPUTS(); +static void fputsmovingright(struct charsetmember *s, FILE *fp); +static void ResetTerminalCodes(int FakeTerminal, int standout, int underline, int bold, char *standoutbuf, char *standendbuf, + int modifiedstandout, char *StartUnderline, char *StopUnderline, int modifiedunderline, + char *BoldOn, char *BoldOff, int modifiedbold); +int richtext_main(); +int controloutput(); #define OUTC(c) (outputc((RCHAR)(c))) @@@@ -125,7 +133,7 @@@@ int signum; #endif } -static InitSignals() { +static int InitSignals() { signal(SIGINT, cleanup); #if !defined(AMIGA) #if !defined(MSDOS) @@@@ -146,7 +154,7 @@@@ static InitSignals() { #endif } -static nomemabort() { +static int nomemabort() { fprintf(stderr, "richtext: Out of memory\n"); FinalizeTerminal(); #ifdef AMIGA @@@@ -163,6 +171,7 @@@@ static nomemabort() { * library call. */ +int main(argc, argv) int argc; char **argv; @@@@ -172,6 +181,7 @@@@ char **argv; #endif +int richtext_main(argc, argv) int argc; char **argv; @@@@ -659,6 +669,7 @@@@ char **argv; static struct charsetmember OutputBuf[1000] = {0,0}; static int PendingOutput = 0, PendingControls = 0; +int controlputc(c) int c; { @@@@ -667,12 +678,13 @@@@ int c; ++PendingControls; } -static immediate_controlputc(c) +static int immediate_controlputc(c) int c; { (*RichtextPutc) (c, stdout); } +int controloutput(s, immediate) char *s; int immediate; @@@@ -680,7 +692,7 @@@@ 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; { @@@@ -692,7 +704,7 @@@@ int pos; return (0); } -static calc_column (buf, pos) +static int calc_column (buf, pos) struct charsetmember *buf; int pos; { @@@@ -707,7 +719,7 @@@@ int pos; return (col); } -static FlushOut() { +static void FlushOut() { int i, j, x; static struct charsetmember NewOutputBuf[1000]; struct charsetmember *s; @@@@ -797,7 +809,7 @@@@ static FlushOut() { StopUnderline, 0, BoldOn, BoldOff, 0); } -static outputc(c) +static void outputc(c) RCHAR c; { struct charsetmember member; @@@@ -805,6 +817,7 @@@@ RCHAR c; realoutputc(member, 0); } +void static realoutputc(c, alreadyformatted) struct charsetmember c; int alreadyformatted; @@@@ -877,7 +890,7 @@@@ int alreadyformatted; } } -static MakeWorkingMargins() { +static void MakeWorkingMargins() { int oldworkingleft=workingleft, i; workingleft = leftmargin; @@@@ -891,7 +904,7 @@@@ static MakeWorkingMargins() { } } -static Pause() +static void Pause() { int c; @@@@ -905,9 +918,7 @@@@ static Pause() /* Leading spaces should be output as MoveRight, to avoid having margins that are underlined or reverse video */ -static fputsmovingright(s, fp) -struct charsetmember *s; -FILE *fp; +static void fputsmovingright(struct charsetmember *s, FILE *fp) { int inmargin=1; if (!s) return; @@@@ -925,11 +936,9 @@@@ FILE *fp; } } -static ResetTerminalCodes(FakeTerminal, standout, underline, bold, standoutbuf, standendbuf, - modifiedstandout, StartUnderline, StopUnderline, modifiedunderline, - BoldOn, BoldOff, modifiedbold) -char *standoutbuf, *standendbuf, *StartUnderline, *StopUnderline, - *BoldOn, *BoldOff; +static void ResetTerminalCodes(int FakeTerminal, int standout, int underline, int bold, char *standoutbuf, char *standendbuf, + int modifiedstandout, char *StartUnderline, char *StopUnderline, int modifiedunderline, + char *BoldOn, char *BoldOff, int modifiedbold) { if (OverStrike) return; @@@@ -953,14 +962,14 @@@@ char *standoutbuf, *standendbuf, *StartU } } -static FinalizeTerminal() { +static void FinalizeTerminal() { tputs(standendbuf, 1, immediate_controlputc); tputs(BoldOff, 1, immediate_controlputc); tputs(StopUnderline, 1, immediate_controlputc); FPUTS(KE, stdout); } -static outputstr(s) +static void outputstr(s) char *s; { while (*s) OUTC(*s++); @@@@ -982,14 +991,14 @@@@ int (*func)(); } #endif -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); @@@@ -1000,7 +1009,7 @@@@ char *s1, *s2; return((*s1 == *s2) ? 0 : -1); } -static lc2strncmp(s1, s2, len) +static int lc2strncmp(s1, s2, len) char *s1, *s2; int len; { @ 1.2 log @Fix a bunch of missing prototypes and incorrect not as void tagged functions. @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.1 2006/01/19 10:55:30 tron Exp $ d3 3 a5 3 --- richmail/richtext.c.orig 1994-02-09 16:31:18.000000000 +0000 +++ richmail/richtext.c @@@@ -13,18 +13,16 @@@@ OF THIS MATERIAL FOR ANY PURPOSE. IT IS d15 2 d29 1 a29 1 @@@@ -79,7 +77,13 @@@@ static int FakeTerminal; d36 1 a36 1 +static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), FinalizeTerminal(), outputstr(), FPUTS(); d41 2 d46 120 a165 1 @@@@ -905,9 +909,7 @@@@ static Pause() d176 1 a176 1 @@@@ -925,11 +927,9 @@@@ FILE *fp; d191 26 a216 1 @@@@ -989,7 +989,7 @@@@ FILE *fp; d225 9 @ 1.1 log @Fix some evil C code to make this build with GCC 4.x. @ text @d1 1 a1 1 $NetBSD$ d4 6 a9 2 +++ richmail/richtext.c 2006-01-19 10:51:42.000000000 +0000 @@@@ -16,6 +16,8 @@@@ d18 10 a27 1 @@@@ -79,6 +81,8 @@@@ d31 1 d34 5 a38 1 static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(); d41 28 a68 1 @@@@ -989,7 +993,7 @@@@ @