diff --git a/main.cc b/main.cc index 83a0fc5d0..56e17ce06 100644 --- a/main.cc +++ b/main.cc @@ -127,16 +127,7 @@ static BOOL OpenLibs(void) { /* global options */ extern NmapOps o; /* option structure */ -/* A mechanism to save argv[0] for code that requires that. */ -static const char *program_name = NULL; - -static void set_program_name(const char *name) { - program_name = name; -} - -const char *get_program_name(void) { - return program_name; -} +extern void set_program_name(const char *name); int main(int argc, char *argv[]) { /* The "real" main is nmap_main(). This function hijacks control at the diff --git a/nmap.cc b/nmap.cc index 1d38e5f59..6f20d1a0e 100644 --- a/nmap.cc +++ b/nmap.cc @@ -138,12 +138,21 @@ extern char *optarg; extern int optind; extern NmapOps o; /* option structure */ -/* argv[0] storage from main.cc. */ -extern const char *get_program_name(void); static bool target_needs_new_hostgroup(std::vector &targets, const Target *target); static void display_nmap_version(); +/* A mechanism to save argv[0] for code that requires that. */ +static const char *program_name = NULL; + +void set_program_name(const char *name) { + program_name = name; +} + +static const char *get_program_name(void) { + return program_name; +} + /* parse the --scanflags argument. It can be a number >=0 or a string consisting of TCP flag names like "URGPSHFIN". Returns -1 if the argument is invalid. */ static int parse_scanflags(char *arg) { int flagval = 0;