nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

config: Give warn_about_relative_paths() const args

Browse Source 
Also gives make_path_absolute() const args.

Obviously correct fixes to already reviewed code.
This commit is contained in:
teor 2019-10-30 16:26:37 +10:00
parent a6ad26fd5f
commit 4666ca73a1
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/config/config.c
View File

@ -3303,7 +3303,7 @@ options_validate(const or_options_t *old_options, or_options_t *options,
*/ */
static int static int
warn_if_option_path_is_relative(const char *option, warn_if_option_path_is_relative(const char *option,
char *filepath) const char *filepath)
{ {
if (filepath && path_is_relative(filepath)) { if (filepath && path_is_relative(filepath)) {
char *abs_path = make_path_absolute(filepath); char *abs_path = make_path_absolute(filepath);
@ -3321,7 +3321,7 @@ warn_if_option_path_is_relative(const char *option,
* Return 1 if there were relative paths; 0 otherwise. * Return 1 if there were relative paths; 0 otherwise.
*/ */
static int static int
warn_about_relative_paths(or_options_t *options) warn_about_relative_paths(const or_options_t *options)
{ {
tor_assert(options); tor_assert(options);
int n = 0; int n = 0;

2
src/lib/fs/path.c
View File

@ -258,7 +258,7 @@ alloc_getcwd(void)
* Return a newly allocated string, which may be a duplicate of <b>fname</b>. * Return a newly allocated string, which may be a duplicate of <b>fname</b>.
*/ */
char * char *
make_path_absolute(char *fname) make_path_absolute(const char *fname)
{ {
#ifdef _WIN32 #ifdef _WIN32
char *absfname_malloced = _fullpath(NULL, fname, 1); char *absfname_malloced = _fullpath(NULL, fname, 1);

2
src/lib/fs/path.h
View File

@ -25,6 +25,6 @@ char *expand_filename(const char *filename);
int path_is_relative(const char *filename); int path_is_relative(const char *filename);
void clean_fname_for_stat(char *name); void clean_fname_for_stat(char *name);
int get_parent_directory(char *fname); int get_parent_directory(char *fname);
char *make_path_absolute(char *fname); char *make_path_absolute(const char *fname);
#endif /* !defined(TOR_PATH_H) */ #endif /* !defined(TOR_PATH_H) */