moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

newlines: fix mixed newlines to LF-only 

I use the curl repo mainly on Windows with the typical Windows git
checkout which converts the LF line endings in the curl repo to CRLF
automatically on checkout. The automatic conversion is not done on files
in the repo with mixed line endings. I recently noticed some weird
output with projects/build-openssl.bat that I traced back to mixed line
endings, so I scanned the repo and there are files (excluding the
test data) that have mixed line endings.

I used this command below to do the scan. Unfortunately it's not as easy
as git grep, at least not on Windows. This gets the names of all the
files in the repo's HEAD, gets each of those files raw from HEAD, checks
for mixed line endings of both LF and CRLF, and prints the name if
mixed. I excluded path tests/data/test* because those can have mixed
line endings if I understand correctly.

for f in `git ls-tree --name-only --full-tree -r HEAD`;
do if [ -n "${f##tests/data/test*}" ];
    then git show "HEAD:$f" | \
        perl -0777 -ne 'exit 1 if /([^\r]\n.*\r\n)|(\r\n.*[^\r]\n)/';
    if [ $? -ne 0 ];
        then echo "$f";
    fi;
fi;
done
This commit is contained in:
Ray Satiro 2014-09-12 10:22:34 +02:00 committed by Daniel Stenberg
parent 82b8b6865c
commit 006b61eb0b
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maketgz
View File

@ -9,7 +9,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms

34
projects/build-openssl.bat
View File

@ -86,9 +86,9 @@ rem ***************************************************************************
shift & goto parseArgs
:prerequisites
rem Default the start directory if one isn't specified
if not defined START_DIR set START_DIR=..\..\openssl
rem Default the start directory if one isn't specified
if not defined START_DIR set START_DIR=..\..\openssl
rem Calculate the program files directory
if defined PROGRAMFILES (
set "PF=%PROGRAMFILES%"
@ -104,9 +104,9 @@ rem ***************************************************************************
rem Check we have Visual Studio installed
if not exist "%PF%\%VC_PATH%" goto novc
rem Check the start directory exists
if not exist "%START_DIR%" goto noopenssl
rem Check the start directory exists
if not exist "%START_DIR%" goto noopenssl
:configure
if "%BUILD_PLATFORM%" == "" (
@ -260,7 +260,7 @@ rem ***************************************************************************
:syntax
rem Display the help
echo.
echo Usage: build-openssl ^<compiler^> ^<platform^> [configuration] [directory]
echo Usage: build-openssl ^<compiler^> ^<platform^> [configuration] [directory]
echo.
echo Compiler:
echo.
@ -308,16 +308,16 @@ rem ***************************************************************************
echo Error: %VC_DESC% is not installed
goto error
:nox64
echo.
echo Error: %VC_DESC% does not support 64-bit builds
goto error
:noopenssl
echo.
echo Error: Cannot locate OpenSSL source directory
goto error
:nox64
echo.
echo Error: %VC_DESC% does not support 64-bit builds
goto error
:noopenssl
echo.
echo Error: Cannot locate OpenSSL source directory
goto error
:error
if "%OS%" == "Windows_NT" endlocal
exit /B 1

10
winbuild/gen_resp_file.bat
View File

@ -1,6 +1,6 @@
@echo OFF
@del %OUTFILE%
@echo %MACRO_NAME% = \> %OUTFILE%
@echo OFF
@del %OUTFILE%
@echo %MACRO_NAME% = \> %OUTFILE%
@for %%i in (%*) do @echo %DIROBJ%/%%i \>> %OUTFILE%
@echo. >> %OUTFILE%
:END
@echo. >> %OUTFILE%
:END