Skip to content

Commit e6fc6de

Browse files
robertdavidgrahamrobertdavidgraham
committedOct 14, 2013
bugs
·
1.0.51.0
1 parent cfbd15b commit e6fc6de

File tree

6 files changed

+106
-13
lines changed

6 files changed

+106
-13
lines changed
 

‎bin/.gitignore

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
masscan
2-
masscan.exe
3-
masscan.ilk
4-
masscan.pdb
1+
*
2+
!.gitignore
53

64

‎tmp/.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*.o
2-
Debug
3-
Release
1+
*
2+
!.gitignore
3+
44

‎util/scan2text.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ normalize_string(unsigned char *px, size_t offset, size_t length, size_t max)
280280
/* do nothing */
281281
} else {
282282
if (i + 6 < max) {
283-
memmove(px+i+5, px+i, length-i+1);
283+
memmove(px+i+4, px+i+1, length-i+1);
284284
px[i++] = '\\';
285285
px[i++] = 'x';
286-
px[i++] = "0123456789abdef"[c >> 4];
287-
px[i ] = "0123456789abdef"[c >> 0];
286+
px[i++] = "0123456789abcdef"[c >> 4];
287+
px[i ] = "0123456789abcdef"[c >> 0];
288288
}
289289
}
290290
}

‎vs10/masscan.sln

+11-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
44
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "masscan", "masscan.vcxproj", "{C88D7583-254F-4BE6-A9B9-89A5BB52E679}"
55
EndProject
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scan2text", "scan2text.vcxproj", "{78D9E59B-DB86-49EE-921F-51734A73F229}"
7+
EndProject
68
Global
79
GlobalSection(SolutionConfigurationPlatforms) = preSolution
810
Debug|Win32 = Debug|Win32
@@ -11,14 +13,21 @@ Global
1113
Release|x64 = Release|x64
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.ActiveCfg = Debug|Win32
15-
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.Build.0 = Debug|Win32
16+
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.ActiveCfg = Debug|x64
17+
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|Win32.Build.0 = Debug|x64
1618
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|x64.ActiveCfg = Debug|x64
1719
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Debug|x64.Build.0 = Debug|x64
1820
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|Win32.ActiveCfg = Release|Win32
1921
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|Win32.Build.0 = Release|Win32
2022
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|x64.ActiveCfg = Release|x64
2123
{C88D7583-254F-4BE6-A9B9-89A5BB52E679}.Release|x64.Build.0 = Release|x64
24+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|Win32.ActiveCfg = Debug|Win32
25+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|Win32.Build.0 = Debug|Win32
26+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|x64.ActiveCfg = Debug|Win32
27+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Debug|x64.Build.0 = Debug|Win32
28+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Release|Win32.ActiveCfg = Release|Win32
29+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Release|Win32.Build.0 = Release|Win32
30+
{78D9E59B-DB86-49EE-921F-51734A73F229}.Release|x64.ActiveCfg = Release|Win32
2231
EndGlobalSection
2332
GlobalSection(SolutionProperties) = preSolution
2433
HideSolutionNode = FALSE

‎vs10/masscan.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
</PropertyGroup>
174174
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
175175
<LinkIncremental>true</LinkIncremental>
176-
<IntDir>$(SolutionDir)\..\tmp\$(Configuration)\</IntDir>
176+
<IntDir>$(SolutionDir)\..\tmp\</IntDir>
177177
<OutDir>$(SolutionDir)\..\bin\</OutDir>
178178
</PropertyGroup>
179179
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

‎vs10/scan2text.vcxproj

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ClCompile Include="..\util\scan2text.c" />
15+
</ItemGroup>
16+
<PropertyGroup Label="Globals">
17+
<ProjectGuid>{78D9E59B-DB86-49EE-921F-51734A73F229}</ProjectGuid>
18+
<Keyword>Win32Proj</Keyword>
19+
<RootNamespace>scan2text</RootNamespace>
20+
</PropertyGroup>
21+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
23+
<ConfigurationType>Application</ConfigurationType>
24+
<UseDebugLibraries>true</UseDebugLibraries>
25+
<CharacterSet>Unicode</CharacterSet>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28+
<ConfigurationType>Application</ConfigurationType>
29+
<UseDebugLibraries>false</UseDebugLibraries>
30+
<WholeProgramOptimization>true</WholeProgramOptimization>
31+
<CharacterSet>Unicode</CharacterSet>
32+
</PropertyGroup>
33+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
34+
<ImportGroup Label="ExtensionSettings">
35+
</ImportGroup>
36+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
37+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
38+
</ImportGroup>
39+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
40+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
41+
</ImportGroup>
42+
<PropertyGroup Label="UserMacros" />
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
44+
<LinkIncremental>true</LinkIncremental>
45+
<OutDir>$(SolutionDir)\..\bin\</OutDir>
46+
<IntDir>$(SolutionDir)\..\tmp\</IntDir>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
49+
<LinkIncremental>false</LinkIncremental>
50+
<OutDir>$(SolutionDir)\..\bin\</OutDir>
51+
<IntDir>$(SolutionDir)\..\tmp\</IntDir>
52+
</PropertyGroup>
53+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
54+
<ClCompile>
55+
<PrecompiledHeader>
56+
</PrecompiledHeader>
57+
<WarningLevel>Level3</WarningLevel>
58+
<Optimization>Disabled</Optimization>
59+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
60+
</ClCompile>
61+
<Link>
62+
<SubSystem>Console</SubSystem>
63+
<GenerateDebugInformation>true</GenerateDebugInformation>
64+
</Link>
65+
</ItemDefinitionGroup>
66+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67+
<ClCompile>
68+
<WarningLevel>Level3</WarningLevel>
69+
<PrecompiledHeader>
70+
</PrecompiledHeader>
71+
<Optimization>MaxSpeed</Optimization>
72+
<FunctionLevelLinking>true</FunctionLevelLinking>
73+
<IntrinsicFunctions>true</IntrinsicFunctions>
74+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75+
</ClCompile>
76+
<Link>
77+
<SubSystem>Console</SubSystem>
78+
<GenerateDebugInformation>true</GenerateDebugInformation>
79+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
80+
<OptimizeReferences>true</OptimizeReferences>
81+
</Link>
82+
</ItemDefinitionGroup>
83+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
84+
<ImportGroup Label="ExtensionTargets">
85+
</ImportGroup>
86+
</Project>

0 commit comments

Comments
 (0)
Please sign in to comment.