Commit 6419aee2 authored by Jay Satiro's avatar Jay Satiro Committed by Daniel Stenberg
Browse files

checksrc: Windows-specific input fixes 

lib/config-win32ce.h
- Fix whitespace for checksrc compliance.

lib/checksrc.pl
- Remove trailing carriage returns from input.

projects/checksrc.bat
- Ignore tool_hugehelp.c.
parent 5b668606

lib/checksrc.pl

+4 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ my $supressed; # whitelisted problems 
my $file;

my $dir=".";

my $wlist;

my $windows_os = $^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin';



my %whitelist;
@@ -37,7 +38,7 @@ sub readwhitelist { 
    open(W, "<$dir/checksrc.whitelist");

    my @all=<W>;

    for(@all) {

        chomp;

        $windows_os ? $_ =~ s/\r?\n$// : chomp;

        $whitelist{$_}=1;

    }

    close(W);
@@ -120,7 +121,7 @@ sub scanfile { 
    my $copyright=0;



    while(<R>) {

        chomp;

        $windows_os ? $_ =~ s/\r?\n$// : chomp;

        my $l = $_;

        my $column = 0;

projects/checksrc.bat

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ rem *************************************************************************** 
  if not exist "%SRC_DIR%" goto nosrc



:start

  for /f "delims=" %%i in ('dir %SRC_DIR%\src\*.c.* /b') do @perl %SRC_DIR%\lib\checksrc.pl -D%SRC_DIR%\src "%%i"

  for /f "delims=" %%i in ('dir %SRC_DIR%\src\*.c.* /b') do @perl %SRC_DIR%\lib\checksrc.pl -D%SRC_DIR%\src -Wtool_hugehelp.c "%%i"

  for /f "delims=" %%i in ('dir %SRC_DIR%\src\*.h.* /b') do @perl %SRC_DIR%\lib\checksrc.pl -D%SRC_DIR%\src "%%i"

  for /f "delims=" %%i in ('dir %SRC_DIR%\lib\*.c.* /b') do @perl %SRC_DIR%\lib\checksrc.pl -D%SRC_DIR%\lib "%%i"

  for /f "delims=" %%i in ('dir %SRC_DIR%\lib\*.h.* /b') do @perl %SRC_DIR%\lib\checksrc.pl -D%SRC_DIR%\lib -Wcurl_config.h.cmake "%%i"

lib/config-win32ce.h

+1 −1

File changed.

Contains only whitespace changes.