PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-01 20:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Defer the calculation of the default XSL stylesheet until it's needed.

Browse Source 
This is going to depend on argv[0], so it can't happen in the NmapOps
constructor, which runs even before main.
This commit is contained in:
david
2011-03-26 06:48:17 +00:00
parent 5a32f584d4
commit 02669cbfd8
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
NmapOps.cc
View File

@@ -195,8 +195,6 @@ static char *filename_to_url(const char *filename) {
}
void NmapOps::Initialize() {
char tmpxsl[MAXPATHLEN];
setaf(AF_INET);
#if defined WIN32 || defined __amigaos__
isr00t = 1;
@@ -272,20 +270,9 @@ void NmapOps::Initialize() {
adler32 = false;
if (datadir) free(datadir);
datadir = NULL;
xsl_stylesheet_set = false;
if (xsl_stylesheet) free(xsl_stylesheet);
if (nmap_fetchfile(tmpxsl, sizeof(tmpxsl), "nmap.xsl") == 1) {
xsl_stylesheet = filename_to_url(tmpxsl);
} else {
#if WIN32
/* Use a relative URL on Windows if nmap_fetchfile failed. It won't work,
but it gives a clue that there is an nmap.xsl somewhere. */
Strncpy(tmpxsl, "nmap.xsl", sizeof(tmpxsl));
xsl_stylesheet = strdup(tmpxsl);
#else
Snprintf(tmpxsl, sizeof(tmpxsl), "%s/nmap.xsl", NMAPDATADIR);
xsl_stylesheet = filename_to_url(tmpxsl);
#endif
}
xsl_stylesheet = NULL;
spoof_mac_set = false;
mass_dns = true;
log_errors = false;
@@ -572,6 +559,33 @@ void NmapOps::setMaxHostGroupSz(unsigned int sz) {
void NmapOps::setXSLStyleSheet(const char *xslname) {
if (xsl_stylesheet) free(xsl_stylesheet);
xsl_stylesheet = xslname? strdup(xslname) : NULL;
xsl_stylesheet_set = true;
}
/* Returns the full path or URL that should be printed in the XML
output xml-stylesheet element. Returns NULL if the whole element
should be skipped */
char *NmapOps::XSLStyleSheet() {
char tmpxsl[MAXPATHLEN];
if (xsl_stylesheet_set)
return xsl_stylesheet;
if (nmap_fetchfile(tmpxsl, sizeof(tmpxsl), "nmap.xsl") == 1) {
xsl_stylesheet = filename_to_url(tmpxsl);
} else {
#if WIN32
/* Use a relative URL on Windows if nmap_fetchfile failed. It won't work,
but it gives a clue that there is an nmap.xsl somewhere. */
Strncpy(tmpxsl, "nmap.xsl", sizeof(tmpxsl));
xsl_stylesheet = strdup(tmpxsl);
#else
Snprintf(tmpxsl, sizeof(tmpxsl), "%s/nmap.xsl", NMAPDATADIR);
xsl_stylesheet = filename_to_url(tmpxsl);
#endif
}
return xsl_stylesheet;
}
void NmapOps::setSpoofMACAddress(u8 *mac_data) {