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

merge soc07 r4915 - Use path_get_basename in init_updatedb

Browse source
This commit is contained in:
fyodor 2007-08-11 04:20:04 +00:00
parent 935b0b78e1
commit 2479d5d1d9
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nse_init.cc
View file

@ -7,6 +7,8 @@
#include "nse_bitlib.h"
#include "nse_pcrelib.h"
#include "nbase.h"
#include "nmap.h"
#include "nmap_error.h"
#include "NmapOps.h"
@ -28,7 +30,6 @@ int init_updatedb(lua_State* l);
int init_pick_default_categories(std::vector<std::string>& chosenScripts);
int check_extension(const char* ext, const char* path);
std::string get_filename(std::string str);
extern NmapOps o;
@ -291,10 +292,15 @@ int init_updatedb(lua_State* l) {
lua_pushnil(l);
while(lua_next(l, -2) != 0) {
char *filename = path_get_basename(c_iter);
if (filename == NULL) {
error("%s: Could not allocate temporary memory.", SCRIPT_ENGINE);
return SCRIPT_ENGINE_ERROR;
}
fprintf(scriptdb,
"Entry{ category = \"%s\", filename = \"%s\" }\n",
lua_tostring(l, -1),
get_filename(std::string(c_iter)).c_str());
lua_tostring(l, -1), filename);
free(filename);
lua_pop(l, 1);
}
lua_pop(l, 1); // pop the categories table
@ -427,15 +433,6 @@ int init_fetchfile(char *path, size_t path_len, char* file) {
return type;
}
std::string get_filename(std::string str) {
int pos = MAX( (int) str.rfind('\\'), (int) str.rfind('/'));
if(pos > -1)
return str.substr(pos + 1);
else
return str;
}
/* This is simply the most portable way to check
* if a file has a given extension.
* The portability comes at the price of reduced