Skip to content

Use rcutils_expand_user() in rcl_logging_get_logging_directory() #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clalancette merged 1 commit into from
Oct 20, 2020
Merged

Use rcutils_expand_user() in rcl_logging_get_logging_directory() #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions rcl_logging_interface/src/logging_dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,26 +74,12 @@ rcl_logging_get_logging_directory(rcutils_allocator_t allocator, char ** directo
}
}

// Expand home directory
if ('~' == (*directory)[0]) {
const char * homedir = rcutils_get_home_dir();
if (NULL == homedir) {
allocator.deallocate(*directory, allocator.state);
RCUTILS_SET_ERROR_MSG("failed to get the home directory");
return RCL_LOGGING_RET_ERROR;
}
char * directory_not_expanded = *directory;
*directory = rcutils_format_string_limit(
allocator,
strlen(homedir) + strlen(directory_not_expanded),
"%s%s",
homedir,
directory_not_expanded + 1);
allocator.deallocate(directory_not_expanded, allocator.state);
if (NULL == *directory) {
RCUTILS_SET_ERROR_MSG("rcutils_format_string failed");
return RCL_LOGGING_RET_ERROR;
}
char * directory_maybe_not_expanded = *directory;
*directory = rcutils_expand_user(directory_maybe_not_expanded, allocator);
allocator.deallocate(directory_maybe_not_expanded, allocator.state);
if (NULL == *directory) {
RCUTILS_SET_ERROR_MSG("rcutils_expand_user failed");
return RCL_LOGGING_RET_ERROR;
}

char * directory_maybe_not_native = *directory;
Expand Down