Skip to content

[pull] next from htacg:next #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 14, 2021
Merged

[pull] next from htacg:next #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
957ee4a
Is. #681 - read-only files, and dirs (#926)
geoffmcl Apr 14, 2021
2a98537
Is. #681 PR #926 - Bump to 5.7.46 for this fix merged
geoffmcl Apr 14, 2021
fc1943e
Add gen-html.bat helper to gen release
geoffmcl Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions build/win64/gen-html.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
@setlocal
@REM Build HTML from log of 'version.txt'
@REM Versify the tools used
@call verhist -? >nul
@if ERRORLEVEL 1 (
@echo Unable to run 'verhist.pl'! *** FIX ME ***
@exit /b 1
)
@call emailobfuscate -? >nul
@if ERRORLEVEL 1 (
@echo Unable to run 'emailobfuscate.pl'! *** FIX ME ***
@exit /b 1
)

@set TMPFIL1=..\..\version.txt
@if NOT EXIST %TMPFIL1% (
@echo Can NOT locate %TMPFIL1%, in %CD% - *** FIX ME ***
@exit /b 1
)

@call dirmin %TMPFIL1%

@set /P TMPVER=<%TMPFIL1%

@echo Current version '%TMPVER%' ...
@set TMPLOG1=..\..\..\temp-%TMPVER%.log
@set TMPLOG2=..\..\..\temp2-%TMPVER%.log
@set TMPLOG3=..\..\..\temp3-%TMPVER%.log

@if EXIST %TMPLOG1% goto GOTL1
@call git log -p %TMPFIL1% > %TMPLOG1%
@if NOT EXIST %TMPLOG1% (
@echo Gen of %TMPLOG1% FAILED! *** FIX ME ***
@exit /b 1
)
:GOTL1
@echo Got log 1 '%TMPLOG1%' ...
@call dirmin %TMPLOG1%

@if EXIST %TMPLOG2% goto GOTL2
@call verhist %TMPLOG1% -o %TMPLOG2%
@if EXIST %TMPLOG2% goto GOTL2
@echo Gen of %TMPLOG2% FAILED! *** FIX ME ***
@exit /b 1
:GOTL2
@echo Got log 2 '%TMPLOG2%' ...
@call dirmin %TMPLOG2%

@set TMPV=%1
@if "%TMPV%x" == "x" (
@echo Give the cut-off version, like 5.6.0, to continue..
@exit /b 1
)

@echo Doing: 'call grep %TMPV% %TMPLOG2%' ...
@call grep %TMPV% %TMPLOG2%
@if ERRORLEVEL 1 (
@echo Failed to find '%TMPV%'... check the file '%TMPLOG2%'
@exit /b 1
)

@set TMPD=%~2
@if "%TMPD%x" == "x" (
@echo Give the DATE of the cut-off, like 'Sat Nov 25 14:50:00 2017 +0100', to continue...
@exit /b 1
)

@if EXIST %TMPLOG3% goto GOTL3
@call git log "--decorate=full" "--since=%TMPD%" > %TMPLOG3%
@if EXIST %TMPLOG3% goto GOTL3
@echo Failed to generate 'git log ...' - *** FIX ME ***
@exit /b 1
:GOTL3
@echo Got log 3 '%TMPLOG3%' ...
@call dirmin %TMPLOG3%

@REM at last generate the release HTML

@set TMPHTM=..\..\..\temp-%TMPVER%.html
@if EXIST %TMPHTM% goto GOTL4
@call emailobfuscate %TMPLOG3% -o %TMPHTM% -a %TMPVER% -i
@if EXIST %TMPHTM% goto GOTL4
@echo FAILED to generate %TMPHTM%! *** FIX ME ***
@exit /b 1
:GOTL4
@echo Got HTML '%TMPHTM%' ...
@call dirmin %TMPHTM%

@REM All success - check image
@call start %TMPHTM%

@REM eof

20 changes: 13 additions & 7 deletions src/tidylib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,19 +1125,26 @@ int TIDY_CALL tidyParseSource( TidyDoc tdoc, TidyInputSource* source )
return tidyDocParseSource( doc, source );
}


#ifdef WIN32
#define M_IS_DIR _S_IFDIR
#else // !WIN32
#define M_IS_DIR S_IFDIR
#endif
int tidyDocParseFile( TidyDocImpl* doc, ctmbstr filnam )
{
int status = -ENOENT;
FILE* fin = fopen( filnam, "r+" );

if ( !fin )
FILE* fin = 0;
struct stat sbuf = { 0 }; /* Is. #681 - read-only files */
if ( stat(filnam,&sbuf) != 0 )
{
TY_(ReportFileError)( doc, filnam, FILE_NOT_FILE );
return status;
}

fclose( fin );
if (sbuf.st_mode & M_IS_DIR) /* and /NOT/ if a DIRECTORY */
{
TY_(ReportFileError)(doc, filnam, FILE_NOT_FILE);
return status;
}

#ifdef _WIN32
return TY_(DocParseFileWithMappedFile)( doc, filnam );
Expand All @@ -1147,7 +1154,6 @@ int tidyDocParseFile( TidyDocImpl* doc, ctmbstr filnam )

#if PRESERVE_FILE_TIMES
{
struct stat sbuf = { 0 };
/* get last modified time */
TidyClearMemory(&doc->filetimes, sizeof(doc->filetimes));
if (fin && cfgBool(doc, TidyKeepFileTimes) &&
Expand Down
4 changes: 2 additions & 2 deletions version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
5.7.45
2020.11.30
5.7.46
2021.04.14