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

Message output consistency.

Browse Source
This commit is contained in:
david
2011-12-19 05:16:25 +00:00
parent 9f44db4c50
commit cb4210cf7c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -526,7 +526,7 @@ static int read_config_file(const char *conf_filename)
errno = 0; errno = 0;
if (config_parser_open(conf_filename, &cp) == -1) { if (config_parser_open(conf_filename, &cp) == -1) {
if (options.verbose) if (options.verbose)
printf("Failed to open %s: %s\n", conf_filename, strerror(errno)); printf("Failed to open %s: %s.\n", conf_filename, strerror(errno));
return -1; return -1;
} }
@@ -561,7 +561,7 @@ static int read_config_file(const char *conf_filename)
errno = 0; errno = 0;
if (config_parser_close(&cp) == -1) { if (config_parser_close(&cp) == -1) {
if (options.verbose) if (options.verbose)
printf("Failed to close %s: %s\n", conf_filename, strerror(errno)); printf("Failed to close %s: %s.\n", conf_filename, strerror(errno));
return -1; return -1;
} }
@@ -848,25 +848,25 @@ static int copy_file(const char *from_filename, const char *to_filename)
nw = fwrite(buf, 1, nr, tmp_fd); nw = fwrite(buf, 1, nr, tmp_fd);
if (nw != nr || errno != 0) { if (nw != nr || errno != 0) {
printf("%lu %lu\n", nw, nr); printf("%lu %lu\n", nw, nr);
fprintf(stderr, "Error writing to %s: %s\n", tmp_filename, strerror(errno)); fprintf(stderr, "Error writing to %s: %s.\n", tmp_filename, strerror(errno));
goto bail; goto bail;
} }
} }
if (errno != 0) { if (errno != 0) {
fprintf(stderr, "Error reading from %s: %s\n", from_filename, strerror(errno)); fprintf(stderr, "Error reading from %s: %s.\n", from_filename, strerror(errno));
goto bail; goto bail;
} }
from_rc = fclose(from_fd); from_rc = fclose(from_fd);
from_fd = NULL; from_fd = NULL;
if (from_rc == -1) { if (from_rc == -1) {
fprintf(stderr, "Can't close %s: %s\n", from_filename, strerror(errno)); fprintf(stderr, "Can't close %s: %s.\n", from_filename, strerror(errno));
goto bail; goto bail;
} }
tmp_rc = fclose(tmp_fd); tmp_rc = fclose(tmp_fd);
tmp_fd = NULL; tmp_fd = NULL;
if (tmp_rc == -1) { if (tmp_rc == -1) {
fprintf(stderr, "Can't close %s: %s\n", to_filename, strerror(errno)); fprintf(stderr, "Can't close %s: %s.\n", to_filename, strerror(errno));
goto bail; goto bail;
} }
@@ -949,14 +949,14 @@ static int copy_tree(const char *from_dirname, const char *to_dirname)
rc = makedirs(to_dirname); rc = makedirs(to_dirname);
if (rc == -1) { if (rc == -1) {
fprintf(stderr, "Can't create the directory %s: %s\n", fprintf(stderr, "Can't create the directory %s: %s.\n",
to_dirname, strerror(errno)); to_dirname, strerror(errno));
return -1; return -1;
} }
dir = opendir(from_dirname); dir = opendir(from_dirname);
if (dir == NULL) { if (dir == NULL) {
fprintf(stderr, "Can't open the directory %s: %s\n", fprintf(stderr, "Can't open the directory %s: %s.\n",
from_dirname, strerror(errno)); from_dirname, strerror(errno));
return -1; return -1;
} }
@@ -1005,7 +1005,7 @@ static int copy_tree(const char *from_dirname, const char *to_dirname)
rc = closedir(dir); rc = closedir(dir);
if (rc == -1) { if (rc == -1) {
fprintf(stderr, "Can't close the directory %s: %s\n", fprintf(stderr, "Can't close the directory %s: %s.\n",
from_dirname, strerror(errno)); from_dirname, strerror(errno));
return -1; return -1;
} }