Commit e6fc6dea authored by robertdavidgraham's avatar robertdavidgraham
Browse files

bugs

parent cfbd15b5

bin/.gitignore

+2 −4
Original line number Diff line number Diff line 
masscan

masscan.exe

masscan.ilk

masscan.pdb

*

!.gitignore

tmp/.gitignore

+3 −3
Original line number Diff line number Diff line 
*.o

Debug

Release

*

!.gitignore

util/scan2text.c

+3 −3
Original line number Diff line number Diff line
@@ -280,11 +280,11 @@ normalize_string(unsigned char *px, size_t offset, size_t length, size_t max) 
            /* do nothing */

        } else {

            if (i + 6 < max) {

                memmove(px+i+5, px+i, length-i+1);

                memmove(px+i+4, px+i+1, length-i+1);

                px[i++] = '\\';

                px[i++] = 'x';

                px[i++] = "0123456789abdef"[c >> 4];

                px[i  ] = "0123456789abdef"[c >> 0];

                px[i++] = "0123456789abcdef"[c >> 4];

                px[i  ] = "0123456789abcdef"[c >> 0];

            }

        }

    }

vs10/masscan.sln

+11 −2
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 
# Visual Studio 2010

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "masscan", "masscan.vcxproj", "{C88D7583-254F-4BE6-A9B9-89A5BB52E679}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scan2text", "scan2text.vcxproj", "{78D9E59B-DB86-49EE-921F-51734A73F229}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Debug|Win32 = Debug|Win32
@@ -11,14 +13,21 @@ Global 
		Release|x64 = Release|x64

	EndGlobalSection

	GlobalSection(ProjectConfigurationPlatforms) = postSolution

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.ActiveCfg = Debug|Win32

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.Build.0 = Debug|Win32

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.ActiveCfg = Debug|x64

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.Build.0 = Debug|x64

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|x64.ActiveCfg = Debug|x64

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|x64.Build.0 = Debug|x64

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|Win32.ActiveCfg = Release|Win32

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|Win32.Build.0 = Release|Win32

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|x64.ActiveCfg = Release|x64

		{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|x64.Build.0 = Release|x64

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|Win32.ActiveCfg = Debug|Win32

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|Win32.Build.0 = Debug|Win32

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|x64.ActiveCfg = Debug|Win32

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|x64.Build.0 = Debug|Win32

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Release|Win32.ActiveCfg = Release|Win32

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Release|Win32.Build.0 = Release|Win32

		{78D9E59B-DB86-49EE-921F-51734A73F229}.Release|x64.ActiveCfg = Release|Win32

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

vs10/masscan.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

    <LinkIncremental>true</LinkIncremental>

    <IntDir>$(SolutionDir)\..\tmp\$(Configuration)\</IntDir>

    <IntDir>$(SolutionDir)\..\tmp\</IntDir>

    <OutDir>$(SolutionDir)\..\bin\</OutDir>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">