diff options
| -rw-r--r-- | BUILD/VS2008X/lynx/lynx.sln | 4 | ||||
| -rw-r--r-- | BUILD/VS2008X/lynx/lynx.vcproj | 19 | ||||
| -rw-r--r-- | BUILD/VS2008X/makeuctb/makeuctb.sln | 4 | ||||
| -rw-r--r-- | BUILD/VS2008X/makeuctb/makeuctb.vcproj | 17 | ||||
| -rw-r--r-- | PACKAGE/debian/changelog | 6 | ||||
| -rw-r--r-- | PACKAGE/lynx.spec | 4 | ||||
| -rw-r--r-- | makefile.bcb | 10 | ||||
| -rw-r--r-- | src/LYMail.c | 29 |
8 files changed, 56 insertions, 37 deletions
diff --git a/BUILD/VS2008X/lynx/lynx.sln b/BUILD/VS2008X/lynx/lynx.sln index b4d9bc41..d6d0a393 100644 --- a/BUILD/VS2008X/lynx/lynx.sln +++ b/BUILD/VS2008X/lynx/lynx.sln @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lynx", "lynx.vcproj", "{77B6BED2-257D-4F7D-AA1B-D180875BD3BF}" ProjectSection(ProjectDependencies) = postProject {3EF8C45C-FC77-47B8-A5B6-5F9034ECE06E} = {3EF8C45C-FC77-47B8-A5B6-5F9034ECE06E} diff --git a/BUILD/VS2008X/lynx/lynx.vcproj b/BUILD/VS2008X/lynx/lynx.vcproj index 032e3b73..6de27a01 100644 --- a/BUILD/VS2008X/lynx/lynx.vcproj +++ b/BUILD/VS2008X/lynx/lynx.vcproj @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="9.00" Name="lynx" ProjectGUID="{77B6BED2-257D-4F7D-AA1B-D180875BD3BF}" RootNamespace="lynx" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -41,11 +42,11 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\lynx;"$(SolutionDir)..\..\..";"$(SolutionDir)..\..\..\lib";"$(SolutionDir)..\..\..\WWW\Library\Implementation";"$(SolutionDir)..\..\..\src";"$(SolutionDir)..\..\..\src\chrtrans"" - PreprocessorDefinitions="WIN32;_CONSOLE;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF;_WIN_CC" + PreprocessorDefinitions="WIN32;_CONSOLE;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF;_WIN_CC;$(NOINHERIT)" GeneratePreprocessedFile="0" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -68,6 +69,8 @@ IgnoreDefaultLibraryNames="libc;libcmt" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -89,9 +92,6 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\lynx;"$(SolutionDir)..\..\..";"$(SolutionDir)..\..\..\lib";"$(SolutionDir)..\..\..\WWW\Library\Implementation";"$(SolutionDir)..\..\..\src";"$(SolutionDir)..\..\..\src\chrtrans"" PreprocessorDefinitions="WIN32;_CONSOLE;_MBCS;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF;_WIN_CC" - RuntimeLibrary="2" + RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -147,6 +147,8 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -168,9 +170,6 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> diff --git a/BUILD/VS2008X/makeuctb/makeuctb.sln b/BUILD/VS2008X/makeuctb/makeuctb.sln index ebcb3e28..9e3257dd 100644 --- a/BUILD/VS2008X/makeuctb/makeuctb.sln +++ b/BUILD/VS2008X/makeuctb/makeuctb.sln @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makeuctb", "makeuctb.vcproj", "{3EF8C45C-FC77-47B8-A5B6-5F9034ECE06E}" EndProject Global diff --git a/BUILD/VS2008X/makeuctb/makeuctb.vcproj b/BUILD/VS2008X/makeuctb/makeuctb.vcproj index fce60eb9..74ca6269 100644 --- a/BUILD/VS2008X/makeuctb/makeuctb.vcproj +++ b/BUILD/VS2008X/makeuctb/makeuctb.vcproj @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="9.00" Name="makeuctb" ProjectGUID="{3EF8C45C-FC77-47B8-A5B6-5F9034ECE06E}" RootNamespace="makeuctb" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -27,7 +28,7 @@ /> <Tool Name="VCCustomBuildTool" - CommandLine="setlocal
set MYDST=..\..\..\src\chrtrans
copy $(TargetPath) %MYDST%
cd %MYDST%
call makehdrs
endlocal" + CommandLine="setlocal
set MYDST=..\..\..\src\chrtrans
copy $(TargetPath) %MYDST%
cd %MYDST%
call makehdrs
endlocal
" Outputs="..\..\..\src\chrtrans\makeuctb.exe;..\..\..\src\chrtrans\def7_uni.h;..\..\..\src\chrtrans\cp1250_uni.h;..\..\..\src\chrtrans\cp1251_uni.h;..\..\..\src\chrtrans\cp1252_uni.h;..\..\..\src\chrtrans\cp1253_uni.h;..\..\..\src\chrtrans\cp1255_uni.h;..\..\..\src\chrtrans\cp1256_uni.h;..\..\..\src\chrtrans\cp1257_uni.h;..\..\..\src\chrtrans\cp437_uni.h;..\..\..\src\chrtrans\cp737_uni.h;..\..\..\src\chrtrans\cp775_uni.h;..\..\..\src\chrtrans\cp850_uni.h;..\..\..\src\chrtrans\cp852_uni.h;..\..\..\src\chrtrans\cp857_uni.h;..\..\..\src\chrtrans\cp862_uni.h;..\..\..\src\chrtrans\cp864_uni.h;..\..\..\src\chrtrans\cp866_uni.h;..\..\..\src\chrtrans\cp866u_uni.h;..\..\..\src\chrtrans\cp869_uni.h;..\..\..\src\chrtrans\dmcs_uni.h;..\..\..\src\chrtrans\hp_uni.h;..\..\..\src\chrtrans\iso01_uni.h;..\..\..\src\chrtrans\iso02_uni.h;..\..\..\src\chrtrans\iso03_uni.h;..\..\..\src\chrtrans\iso04_uni.h;..\..\..\src\chrtrans\iso05_uni.h;..\..\..\src\chrtrans\iso06_uni.h;..\..\..\src\chrtrans\iso07_uni.h;..\..\..\src\chrtrans\iso08_uni.h;..\..\..\src\chrtrans\iso09_uni.h;..\..\..\src\chrtrans\iso10_uni.h;..\..\..\src\chrtrans\iso13_uni.h;..\..\..\src\chrtrans\iso14_uni.h;..\..\..\src\chrtrans\iso15_uni.h;..\..\..\src\chrtrans\koi8r_uni.h;..\..\..\src\chrtrans\koi8u_uni.h;..\..\..\src\chrtrans\mac_uni.h;..\..\..\src\chrtrans\mnem2_suni.h;..\..\..\src\chrtrans\mnem_suni.h;..\..\..\src\chrtrans\next_uni.h;..\..\..\src\chrtrans\pt154_uni.h;..\..\..\src\chrtrans\rfc_suni.h;..\..\..\src\chrtrans\utf8_uni.h;..\..\..\src\chrtrans\viscii_uni.h" /> <Tool @@ -66,6 +67,8 @@ LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -87,9 +90,6 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -106,7 +106,7 @@ /> <Tool Name="VCCustomBuildTool" - CommandLine="setlocal
set MYDST=..\..\..\src\chrtrans
copy $(TargetPath) %MYDST%
cd %MYDST%
call makehdrs
endlocal" + CommandLine="setlocal
set MYDST=..\..\..\src\chrtrans
copy $(TargetPath) %MYDST%
cd %MYDST%
call makehdrs
endlocal
" Outputs="..\..\..\src\chrtrans\makeuctb.exe;..\..\..\src\chrtrans\def7_uni.h;..\..\..\src\chrtrans\cp1250_uni.h;..\..\..\src\chrtrans\cp1251_uni.h;..\..\..\src\chrtrans\cp1252_uni.h;..\..\..\src\chrtrans\cp1253_uni.h;..\..\..\src\chrtrans\cp1255_uni.h;..\..\..\src\chrtrans\cp1256_uni.h;..\..\..\src\chrtrans\cp1257_uni.h;..\..\..\src\chrtrans\cp437_uni.h;..\..\..\src\chrtrans\cp737_uni.h;..\..\..\src\chrtrans\cp775_uni.h;..\..\..\src\chrtrans\cp850_uni.h;..\..\..\src\chrtrans\cp852_uni.h;..\..\..\src\chrtrans\cp857_uni.h;..\..\..\src\chrtrans\cp862_uni.h;..\..\..\src\chrtrans\cp864_uni.h;..\..\..\src\chrtrans\cp866_uni.h;..\..\..\src\chrtrans\cp866u_uni.h;..\..\..\src\chrtrans\cp869_uni.h;..\..\..\src\chrtrans\dmcs_uni.h;..\..\..\src\chrtrans\hp_uni.h;..\..\..\src\chrtrans\iso01_uni.h;..\..\..\src\chrtrans\iso02_uni.h;..\..\..\src\chrtrans\iso03_uni.h;..\..\..\src\chrtrans\iso04_uni.h;..\..\..\src\chrtrans\iso05_uni.h;..\..\..\src\chrtrans\iso06_uni.h;..\..\..\src\chrtrans\iso07_uni.h;..\..\..\src\chrtrans\iso08_uni.h;..\..\..\src\chrtrans\iso09_uni.h;..\..\..\src\chrtrans\iso10_uni.h;..\..\..\src\chrtrans\iso13_uni.h;..\..\..\src\chrtrans\iso14_uni.h;..\..\..\src\chrtrans\iso15_uni.h;..\..\..\src\chrtrans\koi8r_uni.h;..\..\..\src\chrtrans\koi8u_uni.h;..\..\..\src\chrtrans\mac_uni.h;..\..\..\src\chrtrans\mnem2_suni.h;..\..\..\src\chrtrans\mnem_suni.h;..\..\..\src\chrtrans\next_uni.h;..\..\..\src\chrtrans\pt154_uni.h;..\..\..\src\chrtrans\rfc_suni.h;..\..\..\src\chrtrans\utf8_uni.h;..\..\..\src\chrtrans\viscii_uni.h" /> <Tool @@ -144,6 +144,8 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -165,9 +167,6 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog index 57371f68..e7c228d6 100644 --- a/PACKAGE/debian/changelog +++ b/PACKAGE/debian/changelog @@ -1,3 +1,9 @@ +lynx-dev (2.8.8dev.13) unstable; urgency=low + + * changes for dev.13 + + -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jul 2012 10:55:34 -0400 + lynx-dev (2.8.8dev.12) unstable; urgency=low * changes for dev.12 diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index b00e8254..7863fe14 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,8 +1,8 @@ -# $LynxId: lynx.spec,v 1.12 2012/02/23 01:22:53 tom Exp $ +# $LynxId: lynx.spec,v 1.13 2012/07/07 14:55:10 tom Exp $ Summary: A text-based Web browser Name: lynx Version: 2.8.8 -Release: dev.12 +Release: dev.13 License: GPLv2 Group: Applications/Internet Source: lynx%{version}%{release}.tgz diff --git a/makefile.bcb b/makefile.bcb index d3d486a5..3ffbf936 100644 --- a/makefile.bcb +++ b/makefile.bcb @@ -1,4 +1,4 @@ -# $LynxId: makefile.bcb,v 1.19 2012/07/06 00:36:00 tom Exp $ +# $LynxId: makefile.bcb,v 1.20 2012/07/06 23:34:14 tom Exp $ # # Borland C++ / C++ builder # 1997/11/08 (Sat) 10:45:37 @@ -48,8 +48,8 @@ DEBUG= #SSL_LIBS = $(ETC_LIB)\libeay32.lib $(ETC_LIB)\libssl32.lib # Uncomment these lines if you wish to build with iconv -#I18N_DEFS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H -#I18N_LIBS = $(ETC_LIB)\libiconv2.lib $(ETC_LIB)\libintl3.lib -DICONV_CONST=const -DEXP_JAPANESEUTF8_SUPPORT +#I18N_DEFS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H -DICONV_CONST=const -DEXP_JAPANESEUTF8_SUPPORT +#I18N_LIBS = $(ETC_LIB)\libiconv2.lib $(ETC_LIB)\libintl3.lib CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) $(SSL_DEFS) $(I18N_DEFS) \ -I./;$(ETC_INC);$(ETC_INC)/openssl;SRC;$(WWW_LIB);$(BCC_INC);SRC/CHRTRANS \ @@ -88,12 +88,14 @@ CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) $(SSL_DEFS) $(I18N_DEFS) \ -DUSE_SOURCE_CACHE \ -DUSE_ZLIB \ -DVC="2.14FM" \ --DWIN_EX \ -D_MSC_VER=0 \ +-DWIN_EX \ -D_WINDOWS \ -D_WIN_CC=1 \ -DUSE_PROGRAM_DIR +# Note: setting _MSC_VER=0 is needed to work around a problem in the BCC55 +# header files that makes it try to include varargs.h # # Dependency List # diff --git a/src/LYMail.c b/src/LYMail.c index ee0156ee..8e8bc81f 100644 --- a/src/LYMail.c +++ b/src/LYMail.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMail.c,v 1.89 2012/07/06 21:18:09 tom Exp $ + * $LynxId: LYMail.c,v 1.90 2012/07/07 13:48:13 tom Exp $ */ #include <HTUtils.h> #include <HTParse.h> @@ -318,29 +318,42 @@ static void show_addresses(char *addresses) static void blat_option(FILE *fp, const char *option, const char *value) { if (non_empty(value)) { + char *result = malloc(strlen(option) + 4 + 4 * strlen(value)); + char *working = result; + + CTRACE((tfp, "blat_option(opt=\"%s\", value=\"%s\")\n", option, value)); + sprintf(working, "%s \"", option); + working += strlen(working); - fprintf(fp, "%s \"", option); while (*value != '\0') { unsigned ch = UCH(*value); switch (ch) { - case '\'': - fputs("\\\\", fp); + case '\\': + *working++ = '\\'; + *working++ = '\\'; break; case '"': - fputs("\"", fp); + *working++ = '\\'; + *working++ = '"'; break; default: if (ch < ' ' || ch > '~') { - fprintf(fp, "\\%03o", ch); + sprintf(working, "\\%03o", ch); } else { - fputc(ch, fp); + *working++ = ch; } break; } ++value; } - fprintf(fp, "\"\n"); + *working++ = '"'; + *working++ = '\n'; + *working = 0; + + CTRACE((tfp, "->%s", result)); + fputs(result, fp); + FREE(result); } } |