wok view nmap/stuff/nmap-6.25-nolua.patch @ rev 16634
Up tazpkg (5.3)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon May 12 07:54:37 2014 +0000 (2014-05-12) |
| parents | |
| children |
line source
1 --- nmap-6.25/output.h 2012-08-15 00:36:25.000000000 +0800
2 +++ nmap-6.25-fixed/output.h 2012-12-02 10:30:45.003319377 +0800
3 @@ -226,6 +226,10 @@
4 void printscriptresults(ScriptResults *scriptResults, stype scantype);
6 void printhostscriptresults(Target *currenths);
7 +
8 +/*This is a helper function to determine the ordering of the script results
9 + based on their id */
10 +bool comparescriptids(ScriptResult first, ScriptResult second);
11 #endif
13 /* Print a table with traceroute hops. */
14 @@ -253,8 +257,4 @@
15 were found. */
16 void printdatafilepaths();
18 -/*This is a helper function to determine the ordering of the script results
19 - based on their id */
20 -bool comparescriptids(ScriptResult first, ScriptResult second);
21 -
22 #endif /* OUTPUT_H */
23 --- nmap-6.25.orig/output.cc 2012-11-29 11:19:52.000000000 +0800
24 +++ nmap-6.25/output.cc 2012-12-02 10:44:50.986325233 +0800
25 @@ -2613,6 +2613,7 @@
26 }
27 }
29 +#ifndef NOLUA
30 /*This is a helper function to determine the ordering of the script results
31 based on their id */
32 bool comparescriptids(ScriptResult first, ScriptResult second){
33 @@ -2625,5 +2626,6 @@
34 else
35 return false;
36 }
37 +#endif
40 --- nmap-6.25.orig/portlist.cc 2012-10-11 12:45:50.000000000 +0800
41 +++ nmap-6.25/portlist.cc 2012-12-02 10:51:28.930327962 +0800
42 @@ -144,6 +144,7 @@
43 }
44 }
46 +#ifndef NOLUA
47 void Port::freeScriptResults(void)
48 {
49 while (!scriptResults.empty()) {
50 @@ -151,6 +152,7 @@
51 scriptResults.pop_front();
52 }
53 }
54 +#endif
56 /* Fills in namebuf (as long as there is space in buflen) with the
57 Name nmap normal output will use to describe the port. This takes
58 --- nmap-6.25.orig/Target.cc 2012-08-15 00:36:25.000000000 +0800
59 +++ nmap-6.25/Target.cc 2012-12-02 10:55:28.097329636 +0800
60 @@ -162,10 +162,12 @@
62 Target::~Target() {
63 FreeInternal();
64 +#ifndef NOLUA
65 while (!scriptResults.empty()) {
66 scriptResults.front().clear();
67 scriptResults.pop_front();
68 }
69 +#endif
70 }
72 void Target::FreeInternal() {