CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split out a subroutine in nmap_fetchfile.

Browse source
This commit is contained in:
david 2011-12-15 21:13:42 +00:00
parent ee024fde3a
commit 212c2a82cb
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nmap.cc
View file

@ -2792,6 +2792,8 @@ static bool same_file(const char *filename_a, const char *filename_b) {
return stat_a.st_dev == stat_b.st_dev && stat_a.st_ino == stat_b.st_ino;
}
static int nmap_fetchfile_sub(char *filename_returned, int bufferlen, const char *file);
/* Search for a file in the standard data file locations. The result is stored
in filename_returned, which must point to an allocated buffer of at least
bufferlen bytes. Returns true iff the search should be considered finished
@ -2810,13 +2812,8 @@ static bool same_file(const char *filename_a, const char *filename_b) {
"/../share/nmap"
* NMAPDATADIR */
int nmap_fetchfile(char *filename_returned, int bufferlen, const char *file) {
char *dirptr;
int res;
int foundsomething = 0;
struct passwd *pw;
char dot_buffer[512];
static int warningcount = 0;
std::map<std::string, std::string>::iterator iter;
int res;
/* Check the map of requested data file names. */
iter = o.requested_data_files.find(file);
@ -2829,6 +2826,19 @@ int nmap_fetchfile(char *filename_returned, int bufferlen, const char *file) {
return fileexistsandisreadable(filename_returned) || 1;
}
res = nmap_fetchfile_sub(filename_returned, bufferlen, file);
return res;
}
static int nmap_fetchfile_sub(char *filename_returned, int bufferlen, const char *file) {
char *dirptr;
int res;
int foundsomething = 0;
struct passwd *pw;
char dot_buffer[512];
static int warningcount = 0;
if (o.datadir) {
res = Snprintf(filename_returned, bufferlen, "%s/%s", o.datadir, file);
if (res > 0 && res < bufferlen) {