From: <wa...@us...> - 2013-04-16 23:31:41
|
Revision: 5797 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5797&view=rev Author: wavael Date: 2013-04-16 23:31:32 +0000 (Tue, 16 Apr 2013) Log Message: ----------- _w?find(next|first)*: sanitize msvcr* exports Only msvcrt.dll exports the i64 suffix Make _w?find* alias _w?find* _w?find*32 on 32bits Make _w?find* alias _w?find* _w?find*64i32 on 64bits Do not use local definition when 64i32 version is already exported Remove local definition of 64i32 version as it is provided by libmingwex Add a test for _findfirst/_findnext/_findclose Modified Paths: -------------- trunk/mingw-w64-crt/Makefile.am trunk/mingw-w64-crt/lib32/msvcr100.def trunk/mingw-w64-crt/lib32/msvcr110.def trunk/mingw-w64-crt/lib32/msvcr80.def trunk/mingw-w64-crt/lib32/msvcr90.def trunk/mingw-w64-crt/lib32/msvcr90d.def trunk/mingw-w64-crt/lib32/msvcrt.def trunk/mingw-w64-crt/lib64/msvcr100.def trunk/mingw-w64-crt/lib64/msvcr110.def trunk/mingw-w64-crt/lib64/msvcr80.def trunk/mingw-w64-crt/lib64/msvcr90.def trunk/mingw-w64-crt/lib64/msvcr90d.def trunk/mingw-w64-crt/lib64/msvcrt.def Added Paths: ----------- trunk/mingw-w64-crt/testcases/t_findfirst.c Modified: trunk/mingw-w64-crt/Makefile.am =================================================================== --- trunk/mingw-w64-crt/Makefile.am 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/Makefile.am 2013-04-16 23:31:32 UTC (rev 5797) @@ -1146,6 +1146,7 @@ testcases/tstmaincpp \ testcases/tstmain_sys_xxx \ testcases/t_ansi_io \ + testcases/t_findfirst \ testcases/t_float \ testcases/t_fstat \ testcases/t_intrinc \ Modified: trunk/mingw-w64-crt/lib32/msvcr100.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr100.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib32/msvcr100.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -848,11 +848,13 @@ _findfirst32 _findfirst32i64 _findfirst64 -_findfirst64i32 DATA +_findfirst64i32 +_findfirst == _findfirst32 _findnext32 _findnext32i64 _findnext64 -_findnext64i32 DATA +_findnext64i32 +_findnext == _findnext32 _finite _flsbuf _flushall @@ -1575,11 +1577,13 @@ _wfindfirst32 _wfindfirst32i64 _wfindfirst64 -_wfindfirst64i32 DATA +_wfindfirst64i32 +_wfindfirst == _wfindfirst32 _wfindnext32 _wfindnext32i64 _wfindnext64 -_wfindnext64i32 DATA +_wfindnext64i32 +_wfindnext == _wfindnext32 _wfopen _wfopen_s _wfreopen Modified: trunk/mingw-w64-crt/lib32/msvcr110.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr110.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib32/msvcr110.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -969,10 +969,12 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst32 _findfirst32i64 _findfirst64 _findfirst64i32 _findnext32 +_findnext == _findnext32 _findnext32i64 _findnext64 _findnext64i32 @@ -1709,10 +1711,12 @@ _wfindfirst32 _wfindfirst32i64 _wfindfirst64 +_wfindfirst == _wfindfirst32 _wfindfirst64i32 _wfindnext32 _wfindnext32i64 _wfindnext64 +_wfindnext == _wfindnext32 _wfindnext64i32 _wfopen _wfopen_s Modified: trunk/mingw-w64-crt/lib32/msvcr80.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr80.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib32/msvcr80.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -170,10 +170,14 @@ _filelengthi64 _fileno _findclose -_findfirst -_findfirsti64 -_findnext -_findnexti64 +_findfirst32 +_findfirst == _findfirst32 +_findfirst64i32 +_findfirst32i64 +_findnext32 +_findnext == _findnext32 +_findnext64i32 +_findnext32i64 _finite _flsbuf _flushall @@ -458,10 +462,14 @@ _wexecvp _wexecvpe _wfdopen -_wfindfirst -_wfindfirsti64 -_wfindnext -_wfindnexti64 +_wfindfirst32 +_wfindfirst == _wfindfirst32 +_wfindfirst32i64 +_wfindfirst64i32 +_wfindnext32 +_wfindnext == _wfindnext32 +_wfindnext32i64 +_wfindnext64i32 _wfopen _wfreopen _wfsopen Modified: trunk/mingw-w64-crt/lib32/msvcr90.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr90.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib32/msvcr90.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -473,13 +473,15 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst32 _findfirst32i64 _findfirst64 -_findfirst64i32 DATA +_findfirst64i32 _findnext32 +_findnext == _findnext32 _findnext32i64 _findnext64 -_findnext64i32 DATA +_findnext64i32 _finite _flsbuf _flushall @@ -1207,13 +1209,15 @@ _wexecvpe _wfdopen _wfindfirst32 +_wfindfirst == _wfindfirst32 _wfindfirst32i64 _wfindfirst64 -_wfindfirst64i32 DATA +_wfindfirst64i32 _wfindnext32 +_wfindnext == _wfindnext32 _wfindnext32i64 _wfindnext64 -_wfindnext64i32 DATA +_wfindnext64i32 _wfopen _wfopen_s _wfreopen Modified: trunk/mingw-w64-crt/lib32/msvcr90d.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr90d.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib32/msvcr90d.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -531,10 +531,12 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst32 _findfirst32i64 _findfirst64 _findfirst64i32 _findnext32 +_findnext == _findnext32 _findnext32i64 _findnext64 _findnext64i32 @@ -1275,10 +1277,12 @@ _wexecvpe _wfdopen _wfindfirst32 +_wfindfirst == _wfindfirst32 _wfindfirst32i64 _wfindfirst64 _wfindfirst64i32 _wfindnext32 +_wfindnext = _wfindnext32 _wfindnext32i64 _wfindnext64 _wfindnext64i32 Modified: trunk/mingw-w64-crt/lib32/msvcrt.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcrt.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib32/msvcrt.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -171,9 +171,15 @@ _fileno _findclose _findfirst +_findfirst32 == _findfirst _findfirsti64 +_findfirst32i64 == _findfirsti64 +;_findfirst64i32 DATA ; provided by libmingwex _findnext +_findnext32 == _findnext _findnexti64 +_findnext32i64 == _findnexti64 +;_findnext64i32 DATA ; provided by libmingwex _finite _flsbuf _flushall @@ -460,9 +466,15 @@ _wexecvpe _wfdopen _wfindfirst +_wfindfirst32 == _wfindfirst _wfindfirsti64 +_wfindfirst32i64 == _wfindfirsti64 +;_wfindfirst64i32 DATA ; provided by libmingwex _wfindnext +_wfindnext32 == _wfindnext _wfindnexti64 +_wfindnext32i64 == _wfindnexti64 +;_wfindnext64i32 DATA ; provided by libmingwex _wfopen _wfreopen _wfsopen Modified: trunk/mingw-w64-crt/lib64/msvcr100.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr100.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib64/msvcr100.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -801,13 +801,15 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst64i32 _findfirst32i64 _findfirst64 -_findfirst64i32 DATA +_findfirst64i32 _findnext32 +_findnext == _findnext64i32 _findnext32i64 _findnext64 -_findnext64i32 DATA +_findnext64i32 _finite _finitef _flsbuf @@ -1520,13 +1522,15 @@ _wexecvpe _wfdopen _wfindfirst32 +_wfindfirst == _wfindfirst64i32 _wfindfirst32i64 _wfindfirst64 -_wfindfirst64i32 DATA +_wfindfirst64i32 _wfindnext32 +_wfindnext == _wfindnext64i32 _wfindnext32i64 _wfindnext64 -_wfindnext64i32 DATA +_wfindnext64i32 _wfopen _wfopen_s _wfreopen Modified: trunk/mingw-w64-crt/lib64/msvcr110.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr110.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib64/msvcr110.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -926,10 +926,12 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst64i32 _findfirst32i64 _findfirst64 _findfirst64i32 _findnext32 +_findnext == _findnext64i32 _findnext32i64 _findnext64 _findnext64i32 @@ -1645,10 +1647,12 @@ _wexecvpe _wfdopen _wfindfirst32 +_wfindfirst == _wfindfirst64i32 _wfindfirst32i64 _wfindfirst64 _wfindfirst64i32 _wfindnext32 +_wfindnext == _wfindnext64i32 _wfindnext32i64 _wfindnext64 _wfindnext64i32 Modified: trunk/mingw-w64-crt/lib64/msvcr80.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr80.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib64/msvcr80.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -258,12 +258,16 @@ _filelengthi64 _fileno _findclose -_findfirst +_findfirst32 +_findfirst == _findfirst64i32 _findfirst64 -_findfirsti64 -_findnext +_findfirst32i64 +_findfirst64i32 +_findnext32 +_findnext == _findnext64i32 _findnext64 -_findnexti64 +_findnext32i64 +_findnext64i32 _finite _finitef _flsbuf @@ -575,12 +579,16 @@ _wexecvp _wexecvpe _wfdopen -_wfindfirst +_wfindfirst32 +_wfindfirst == _wfindfirst64i32 _wfindfirst64 -_wfindfirsti64 -_wfindnext +_wfindfirst32i64 +_wfindfirst64i32 +_wfindnext32 +_wfindnext == _wfindnext64i32 _wfindnext64 -_wfindnexti64 +_wfindnext32i64 +_wfindnext64i32 _wfopen _wfreopen _wfsopen Modified: trunk/mingw-w64-crt/lib64/msvcr90.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr90.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib64/msvcr90.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -418,13 +418,15 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst64i32 _findfirst32i64 _findfirst64 -_findfirst64i32 DATA +_findfirst64i32 _findnext32 +_findnext == _findnext64i32 _findnext32i64 _findnext64 -_findnext64i32 DATA +_findnext64i32 _finite _finitef _flsbuf @@ -1142,11 +1144,13 @@ _wfindfirst32 _wfindfirst32i64 _wfindfirst64 -_wfindfirst64i32 DATA +_wfindfirst == _wfindfirst64i32 +_wfindfirst64i32 _wfindnext32 _wfindnext32i64 _wfindnext64 -_wfindnext64i32 DATA +_wfindnext == _wfindnext64i32 +_wfindnext64i32 _wfopen _wfopen_s _wfreopen Modified: trunk/mingw-w64-crt/lib64/msvcr90d.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr90d.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib64/msvcr90d.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -470,10 +470,12 @@ _fileno _findclose _findfirst32 +_findfirst == _findfirst64i32 _findfirst32i64 _findfirst64 _findfirst64i32 _findnext32 +_findnext == _findnext64i32 _findnext32i64 _findnext64 _findnext64i32 @@ -1202,10 +1204,12 @@ _wexecvpe _wfdopen _wfindfirst32 +_wfindfirst == _wfindfirst64i32 _wfindfirst32i64 _wfindfirst64 _wfindfirst64i32 _wfindnext32 +_wfindnext == _wfindnext64i32 _wfindnext32i64 _wfindnext64 _wfindnext64i32 Modified: trunk/mingw-w64-crt/lib64/msvcrt.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcrt.def 2013-04-15 16:58:20 UTC (rev 5796) +++ trunk/mingw-w64-crt/lib64/msvcrt.def 2013-04-16 23:31:32 UTC (rev 5797) @@ -292,9 +292,11 @@ _findfirst _findfirst64 _findfirsti64 +_findfirst64i32 == _findfirst _findnext _findnext64 _findnexti64 +_findnext64i32 == _findnext _finite _finitef _flsbuf @@ -929,9 +931,11 @@ _wfindfirst _wfindfirst64 _wfindfirsti64 +_wfindfirst64i32 == _wfindfirst _wfindnext _wfindnext64 _wfindnexti64 +_wfindnext64i32 == _wfindnext _wfopen _wfopen_s _wfreopen Added: trunk/mingw-w64-crt/testcases/t_findfirst.c =================================================================== --- trunk/mingw-w64-crt/testcases/t_findfirst.c (rev 0) +++ trunk/mingw-w64-crt/testcases/t_findfirst.c 2013-04-16 23:31:32 UTC (rev 5797) @@ -0,0 +1,20 @@ +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <string.h> +#include <io.h> + +int main(int argc, char **argv) +{ + struct _finddata_t d; + intptr_t handle = _findfirst ("*", &d); + if (handle == -1) + return 1; + + while (_findnext(handle, &d) == 0) + printf ("%s\n", d.name); + + _findclose (handle); + return 0; +} + Property changes on: trunk/mingw-w64-crt/testcases/t_findfirst.c ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |