PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-12 10:49:02 +00:00
Code Issues Projects Releases Wiki Activity

Make a separate rename function for Windows.

Browse Source
This commit is contained in:
david
2011-12-19 05:16:33 +00:00
parent 684f6e18d5
commit 4b401ad4be
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nmap-update/nmap-update.c
View File

@@ -1,5 +1,3 @@
#include "nbase.h"
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
@@ -818,6 +816,7 @@ static int stage_channel(const char *channel, const char *staging_dir)
} }
static int copy_tree(const char *from_dirname, const char *to_dirname); static int copy_tree(const char *from_dirname, const char *to_dirname);
static int rename_file(const char *from_filename, const char *to_filename);
static int install(const char *staging_dir, const char *install_dir) static int install(const char *staging_dir, const char *install_dir)
{ {
@@ -882,7 +881,7 @@ static int copy_file(const char *from_filename, const char *to_filename)
goto bail; goto bail;
} }
rc = rename(tmp_filename, to_filename); rc = rename_file(tmp_filename, to_filename);
if (rc == -1) { if (rc == -1) {
fprintf(stderr, "Can't rename %s to %s: %s.\n", fprintf(stderr, "Can't rename %s to %s: %s.\n",
tmp_filename, to_filename, strerror(errno)); tmp_filename, to_filename, strerror(errno));
@@ -933,6 +932,19 @@ static char *parent_dir(const char *path)
} }
#ifdef WIN32 #ifdef WIN32
static int rename_file(const char *from_filename, const char *to_filename)
{
int rc;
/* Windows rename doesn't remove the destination if it exists. */
errno = 0;
rc = unlink(to_filename);
if (rc == 0 || errno == ENOENT)
return 0;
return rename(from_filename, to_filename);
}
static int makedir(const char *dirname) static int makedir(const char *dirname)
{ {
return CreateDirectory(dirname, NULL) != 0 ? 0 : -1; return CreateDirectory(dirname, NULL) != 0 ? 0 : -1;
@@ -1035,6 +1047,11 @@ bail:
return -1; return -1;
} }
#else #else
static int rename_file(const char *from_filename, const char *to_filename)
{
return rename(from_filename, to_filename);
}
static int makedir(const char *dirname) static int makedir(const char *dirname)
{ {
return mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); return mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);