X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=2a20e5a8c4ab4cca1557ca917cfa2de02defd905;hp=d6c67bb0f368bac63699b85c05dc399d8d292a08;hb=9120e619240c698c899a9baea203a52c4bdfd565;hpb=159b042f34366d0fde5dcd73b4231c558922a664 diff --git a/src/common/utils.c b/src/common/utils.c index d6c67bb0f..2a20e5a8c 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -294,7 +294,7 @@ int expand_double_slashes_dot_and_dotdot(char *path) * Copy the current token which is neither a '.' nor a '..'. */ path[expanded_path_len++] = '/'; - memcpy(&path[expanded_path_len], curr_char, curr_token_len); + memmove(&path[expanded_path_len], curr_char, curr_token_len); expanded_path_len += curr_token_len; } @@ -736,7 +736,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name, char *out_stream_path, size_t stream_path_len) { int ret; - char count_str[MAX_INT_DEC_LEN(count) + 1] = {}; + char count_str[MAX_INT_DEC_LEN(count) + 1] = {}; const char *path_separator; if (path_name && (path_name[0] == '\0' || @@ -754,7 +754,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name, assert(ret > 0 && ret < sizeof(count_str)); } - ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s", + ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s", path_name, path_separator, file_name, count_str, suffix); if (ret < 0 || ret >= stream_path_len) { @@ -1274,8 +1274,14 @@ int utils_get_group_id(const char *name, bool warn, gid_t *gid) } } if (ret) { - PERROR("Failed to get group file entry for group name \"%s\"", - name); + if (ret == ESRCH) { + DBG("Could not find group file entry for group name '%s'", + name); + } else { + PERROR("Failed to get group file entry for group name '%s'", + name); + } + ret = -1; goto error; }