ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-07 19:34:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#506 added additional check on run directory to prevent creation as defaul… (#566)

Browse Source 
* added additional check on run directory to prevent creation as default output directory

* #506 edited error messages to include strerror
This commit is contained in:
Scott Fennell 2018-03-14 15:18:37 -05:00 committed by jmpenn
parent 050e552d7c
commit f6fa9cdf3e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
View File

@ -18,6 +18,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <cstring>
#include <cerrno>
#include "trick/CommandLineArguments.hh"
#include "trick/memorymanager_c_intf.h"
@ -163,13 +165,18 @@ int Trick::CommandLineArguments::process_sim_args(int nargs , char **args) {
} else {
run_dir = "." ;
}
/* check existence of run directory */
if (access(run_dir.c_str(), F_OK) != 0) {
std::cerr << "\nERROR: while accessing input file directory \"" << run_dir << "\" : " << std::strerror(errno) << std::endl ;
exit(1);
}
output_dir = run_dir ;
for (ii = 2; ii < argc; ii++) {
if (!strncmp("-OO", argv[ii], (size_t) 3) || !strncmp("-O", argv[ii], (size_t) 2)) {
if (ii == ( argc - 1 )) {
std::cerr << "\nERROR: No directory specified after -O or -OO argument. Exiting!" << std::endl ;
std::cerr << "\nERROR: No directory specified after -O or -OO argument" << std::endl ;
exit(1) ;
}
/* Output data directory */
@ -182,13 +189,13 @@ int Trick::CommandLineArguments::process_sim_args(int nargs , char **args) {
/* Create output directory if necessary. */
if (access(output_dir.c_str(), F_OK) != 0) {
if (mkdir(output_dir.c_str(), 0775) == -1) {
std::cerr << "\nERROR: While trying to create dir \"" << output_dir << "\" Exiting!" << std::endl ;
std::cerr << "\nERROR: While trying to create output directory \"" << output_dir << "\" : " << std::strerror(errno) << std::endl ;
exit(1) ;
}
} else {
/* check permissions on output directory */
if (access(output_dir.c_str(), (W_OK|X_OK) ) == -1) {
std::cerr << "\nERROR: Unable to write to \"" << output_dir << "\" Exiting!" << std::endl ;
std::cerr << "\nERROR: while writing to output directory \"" << output_dir << "\" : " << std::strerror(errno) << std::endl ;
exit(2) ;
}
}