PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 14:11:29 +00:00
Code Issues Projects Releases Wiki Activity

Removed the log-errors option from the code, by treating it as if it was always true. This was done for the action item of o Remove Nmap's --log-errors feature and make its behavior the default. I also updated the docs/refguide.xml to reflect this change. I have not yet compiled the Dockbook.xml however.

Browse Source
This commit is contained in:
sean
2012-06-30 00:36:15 +00:00
parent 6a0771f3b7
commit 0909f12308
5 changed files with 14 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
nmap_error.cc
View File

@@ -115,12 +115,11 @@ void fatal(const char *fmt, ...) {
va_start(ap, fmt);
log_vwrite(LOG_STDERR, fmt, ap);
va_end(ap);
if (o.log_errors) {
va_start(ap, fmt);
log_vwrite(LOG_NORMAL, fmt, ap);
va_end(ap);
}
log_write(o.log_errors? LOG_NORMAL|LOG_STDERR : LOG_STDERR, "\nQUITTING!\n");
va_start(ap, fmt);
log_vwrite(LOG_NORMAL, fmt, ap);
va_end(ap);
log_write(LOG_NORMAL|LOG_STDERR, "\nQUITTING!\n");
if (xml_tag_open())
xml_close_start_tag();
@@ -163,13 +162,10 @@ void error(const char *fmt, ...) {
va_start(ap, fmt);
log_vwrite(LOG_STDERR, fmt, ap);
va_end(ap);
if (o.log_errors) {
va_start(ap, fmt);
va_start(ap, fmt);
log_vwrite(LOG_NORMAL, fmt, ap);
va_end(ap);
}
log_write(o.log_errors? LOG_NORMAL|LOG_STDERR : LOG_STDERR, "\n");
log_write(LOG_NORMAL|LOG_STDERR , "\n");
return;
}
@@ -197,7 +193,7 @@ void pfatal(const char *fmt, ...) {
Vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
va_end(ap);
log_write(o.log_errors? LOG_NORMAL|LOG_STDERR : LOG_STDERR, "%s: %s (%d)\n",
log_write(LOG_NORMAL|LOG_STDERR, "%s: %s (%d)\n",
errbuf, strerror_s, error_number);
if (xml_tag_open())
@@ -230,7 +226,7 @@ void pfatal(const char *fmt, ...) {
HeapFree(GetProcessHeap(), 0, strerror_s);
#endif
if (o.log_errors) log_flush(LOG_NORMAL);
log_flush(LOG_NORMAL);
fflush(stderr);
exit(1);
}
@@ -255,19 +251,17 @@ void gh_perror(const char *fmt, ...) {
va_start(ap, fmt);
log_vwrite(LOG_STDERR, fmt, ap);
va_end(ap);
if (o.log_errors) {
va_start(ap, fmt);
va_start(ap, fmt);
log_vwrite(LOG_NORMAL, fmt, ap);
va_end(ap);
}
log_write(o.log_errors? LOG_NORMAL|LOG_STDERR : LOG_STDERR, ": %s (%d)\n",
log_write(LOG_NORMAL|LOG_STDERR, ": %s (%d)\n",
strerror_s, error_number);
#ifdef WIN32
HeapFree(GetProcessHeap(), 0, strerror_s);
#endif
if (o.log_errors) log_flush(LOG_NORMAL);
log_flush(LOG_NORMAL);
fflush(stderr);
return;
}