Menu
▾
▴
clisp-cvs Digest, Vol 54, Issue 13
|
From: <cli...@li...> - 2010-12-14 19:29:18
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.7558,1.7559 pathname.d,1.521,1.522 (Arseny Slobodyuk) 2. clisp/src ChangeLog,1.7559,1.7560 pathname.d,1.522,1.523 (Arseny Slobodyuk) 3. clisp/src w32shell.c,1.15,1.16 (Arseny Slobodyuk) 4. clisp/src ChangeLog,1.7560,1.7561 (Arseny Slobodyuk) ---------------------------------------------------------------------- Message: 1 Date: Mon, 18 Oct 2010 02:16:27 +0000 From: Arseny Slobodyuk <am...@us...> Subject: clisp/src ChangeLog,1.7558,1.7559 pathname.d,1.521,1.522 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3219 Modified Files: ChangeLog pathname.d Log Message: Fix bug#3087668 with probe-pathname. Index: pathname.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/pathname.d,v retrieving revision 1.521 retrieving revision 1.522 diff -u -d -r1.521 -r1.522 --- pathname.d 15 Oct 2010 18:32:25 -0000 1.521 +++ pathname.d 18 Oct 2010 02:16:24 -0000 1.522 @@ -5994,24 +5994,25 @@ bool ret; begin_blocking_system_call(); if (real_path(namestring,resolved)) { - DWORD fileattr; - fileattr = GetFileAttributes(resolved); + WIN32_FILE_ATTRIBUTE_DATA filedata; + BOOL success = GetFileAttributesEx(resolved, GetFileExInfoStandard, &filedata); end_blocking_system_call(); - if (fileattr == 0xFFFFFFFF) { + if (success) { /* file exists. */ + if (fwd) *fwd = convert_time_to_universal( + filedata.ftLastWriteTime.dwLowDateTime + || filedata.ftLastWriteTime.dwLowDateTime + ? &filedata.ftLastWriteTime : &filedata.ftCreationTime); + if (fsize) *fsize = off_to_I( + ((uint64)filedata.nFileSizeHigh<<32)|filedata.nFileSizeLow); + if (filedata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + return NAMESTRING_DIR; + else return NAMESTRING_FILE; + } else { /* you get ERROR_INVALID_NAME on GetFileAttributes("foo/") when file "foo" exists */ if (!(WIN32_ERROR_NOT_FOUND || GetLastError() == ERROR_INVALID_NAME)) OS_file_error(STACK_0); return NAMESTRING_NONE; /* does not exist */ - } else { /* file exists. */ - if (fwd || fsize) { - WIN32_FIND_DATA filedata; - find_first_file(resolved,&filedata); /* success is assured */ - if (fwd) *fwd = convert_time_to_universal(FIND_DATA_FWD(filedata)); - if (fsize) *fsize = off_to_I(FIND_DATA_FSIZE(filedata)); - } - if (fileattr & FILE_ATTRIBUTE_DIRECTORY) return NAMESTRING_DIR; - else return NAMESTRING_FILE; } } else { end_blocking_system_call(); return NAMESTRING_NONE; } #else @@ -6040,8 +6041,10 @@ pushSTACK(NIL); pushSTACK(STACK_1); /* space for FWD & FSIZE */ with_sstring_0(whole_namestring(STACK_0),O(pathname_encoding), namestring_asciz, { +#if defined(UNIX) if (cpslashp(namestring_asciz[namestring_asciz_bytelen-1])) namestring_asciz[namestring_asciz_bytelen-1] = 0; /* strip last slash */ +#endif classification = classify_namestring(namestring_asciz,resolved, &STACK_1/*fwd*/,&STACK_2/*fsize*/); }); Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.7558 retrieving revision 1.7559 diff -u -d -r1.7558 -r1.7559 --- ChangeLog 17 Oct 2010 10:04:23 -0000 1.7558 +++ ChangeLog 18 Oct 2010 02:16:24 -0000 1.7559 @@ -1,3 +1,13 @@ +2010-10-18 Julian Squires <ju...@ci...> + Arseny Slobodyuk <am...@us...> + Fix for bug#3087668 - when probe-pathname used for + root directories on WIN32. + + * pathname.d (probe_pathname) [!UNIX]: do not remove trailing slash. + (classify_namestring) [WIN32_NATIVE]: use GetFileAttributesEx instead + of FindFirstFile to retrieve size and modify date/time, because + GetFileAttributesEx unlike FFF can handle root directories. + 2010-10-17 Vladimir Tzankov <vtz...@gm...> fix bug#3088751: SIGSEGV on large (unsigned-byte 8) arrays ------------------------------ Message: 2 Date: Mon, 18 Oct 2010 02:29:20 +0000 From: Arseny Slobodyuk <am...@us...> Subject: clisp/src ChangeLog,1.7559,1.7560 pathname.d,1.522,1.523 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6241 Modified Files: ChangeLog pathname.d Log Message: Fix condition in FIND_DATA_FWD. Index: pathname.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/pathname.d,v retrieving revision 1.522 retrieving revision 1.523 diff -u -d -r1.522 -r1.523 --- pathname.d 18 Oct 2010 02:16:24 -0000 1.522 +++ pathname.d 18 Oct 2010 02:29:18 -0000 1.523 @@ -5936,7 +5936,7 @@ #if defined(WIN32_NATIVE) #define FIND_DATA_FWD(filedata) \ ((filedata.ftLastWriteTime.dwLowDateTime == 0 \ - && filedata.ftLastWriteTime.dwHighDateTime) \ + && filedata.ftLastWriteTime.dwHighDateTime == 0) \ ? &(filedata.ftCreationTime) : &(filedata.ftLastWriteTime)) #define FIND_DATA_FSIZE(filedata) \ (((uint64)filedata.nFileSizeHigh<<32)|filedata.nFileSizeLow) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.7559 retrieving revision 1.7560 diff -u -d -r1.7559 -r1.7560 --- ChangeLog 18 Oct 2010 02:16:24 -0000 1.7559 +++ ChangeLog 18 Oct 2010 02:29:18 -0000 1.7560 @@ -1,3 +1,7 @@ +2010-10-18 Arseny Slobodyuk <am...@us...> + + * pathname.d (FIND_DATA_FWD) [WIN32_NATIVE]: fixed condition. + 2010-10-18 Julian Squires <ju...@ci...> Arseny Slobodyuk <am...@us...> Fix for bug#3087668 - when probe-pathname used for ------------------------------ Message: 3 Date: Mon, 18 Oct 2010 02:42:04 +0000 From: Arseny Slobodyuk <am...@us...> Subject: clisp/src w32shell.c,1.15,1.16 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8788 Modified Files: w32shell.c Log Message: Added a declaration for BTCoCreateInstance to avoid warning. This warning is bad because it might mean wrong call agreement. Index: w32shell.c =================================================================== RCS file: /cvsroot/clisp/clisp/src/w32shell.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- w32shell.c 5 Aug 2010 07:46:34 -0000 1.15 +++ w32shell.c 18 Oct 2010 02:42:02 -0000 1.16 @@ -122,6 +122,10 @@ HRESULT BTCoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, + LPVOID * ppv); + +HRESULT BTCoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter, + DWORD dwClsContext, REFIID riid, LPVOID * ppv) { HRESULT result = CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv); ------------------------------ Message: 4 Date: Mon, 18 Oct 2010 02:52:17 +0000 From: Arseny Slobodyuk <am...@us...> Subject: clisp/src ChangeLog,1.7560,1.7561 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12256 Modified Files: ChangeLog Log Message: Use lisp symbol to refer a function in ChangeLog. Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.7560 retrieving revision 1.7561 diff -u -d -r1.7560 -r1.7561 --- ChangeLog 18 Oct 2010 02:29:18 -0000 1.7560 +++ ChangeLog 18 Oct 2010 02:52:15 -0000 1.7561 @@ -7,7 +7,7 @@ Fix for bug#3087668 - when probe-pathname used for root directories on WIN32. - * pathname.d (probe_pathname) [!UNIX]: do not remove trailing slash. + * pathname.d (PROBE-PATHNAME) [!UNIX]: do not remove trailing slash. (classify_namestring) [WIN32_NATIVE]: use GetFileAttributesEx instead of FindFirstFile to retrieve size and modify date/time, because GetFileAttributesEx unlike FFF can handle root directories. ------------------------------ ------------------------------------------------------------------------------ Download new Adobe(R) Flash(R) Builder(TM) 4 The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today! http://p.sf.net/sfu/adobe-dev2dev ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 54, Issue 13 ***************************************** |
