#include <common/compat/string.h>
#include <common/compat/dirent.h>
#include <common/compat/directory-handle.h>
+#include <common/dynamic-buffer.h>
+#include <common/string-utils/format.h>
#include <lttng/constant.h>
#include "utils.h"
{
int ret;
struct lttng_directory_handle handle;
- struct lttng_credentials creds = {
+ const struct lttng_credentials creds = {
.uid = (uid_t) uid,
.gid = (gid_t) gid,
};
- (void) lttng_directory_handle_init(&handle, NULL);
+ ret = lttng_directory_handle_init(&handle, NULL);
+ if (ret) {
+ goto end;
+ }
ret = lttng_directory_handle_create_subdirectory_as_user(
&handle, path, mode,
(uid >= 0 || gid >= 0) ? &creds : NULL);
lttng_directory_handle_fini(&handle);
+end:
return ret;
}
{
int ret;
struct lttng_directory_handle handle;
- struct lttng_credentials creds = {
+ const struct lttng_credentials creds = {
.uid = (uid_t) uid,
.gid = (gid_t) gid,
};
- (void) lttng_directory_handle_init(&handle, NULL);
+ ret = lttng_directory_handle_init(&handle, NULL);
+ if (ret) {
+ goto end;
+ }
ret = lttng_directory_handle_create_subdirectory_recursive_as_user(
&handle, path, mode,
(uid >= 0 || gid >= 0) ? &creds : NULL);
lttng_directory_handle_fini(&handle);
+end:
return ret;
}
/*
- * path is the output parameter. It needs to be PATH_MAX len.
+ * out_stream_path is the output parameter.
*
* Return 0 on success or else a negative value.
*/
-static int utils_stream_file_name(char *path,
- const char *path_name, const char *file_name,
- uint64_t size, uint64_t count,
- const char *suffix)
+LTTNG_HIDDEN
+int utils_stream_file_path(const char *path_name, const char *file_name,
+ uint64_t size, uint64_t count, const char *suffix,
+ char *out_stream_path, size_t stream_path_len)
{
int ret;
- char full_path[PATH_MAX];
- char *path_name_suffix = NULL;
- char *extra = NULL;
+ char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
+ const char *path_separator;
- ret = snprintf(full_path, sizeof(full_path), "%s/%s",
- path_name, file_name);
- if (ret < 0) {
- PERROR("snprintf create output file");
- goto error;
+ if (path_name && path_name[strlen(path_name) - 1] == '/') {
+ path_separator = "";
+ } else {
+ path_separator = "/";
}
- /* Setup extra string if suffix or/and a count is needed. */
- if (size > 0 && suffix) {
- ret = asprintf(&extra, "_%" PRIu64 "%s", count, suffix);
- } else if (size > 0) {
- ret = asprintf(&extra, "_%" PRIu64, count);
- } else if (suffix) {
- ret = asprintf(&extra, "%s", suffix);
- }
- if (ret < 0) {
- PERROR("Allocating extra string to name");
- goto error;
+ path_name = path_name ? : "";
+ suffix = suffix ? : "";
+ if (size > 0) {
+ ret = snprintf(count_str, sizeof(count_str), "_%" PRIu64,
+ count);
+ assert(ret > 0 && ret < sizeof(count_str));
}
- /*
- * If we split the trace in multiple files, we have to add the count at
- * the end of the tracefile name.
- */
- if (extra) {
- ret = asprintf(&path_name_suffix, "%s%s", full_path, extra);
- if (ret < 0) {
- PERROR("Allocating path name with extra string");
- goto error_free_suffix;
- }
- strncpy(path, path_name_suffix, PATH_MAX - 1);
- path[PATH_MAX - 1] = '\0';
+ 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) {
+ ERR("Truncation occurred while formatting stream path");
+ ret = -1;
} else {
- ret = lttng_strncpy(path, full_path, PATH_MAX);
- if (ret) {
- ERR("Failed to copy stream file name");
- goto error_free_suffix;
- }
+ ret = 0;
}
- path[PATH_MAX - 1] = '\0';
- ret = 0;
-
- free(path_name_suffix);
-error_free_suffix:
- free(extra);
-error:
return ret;
}
uint64_t count, int uid, int gid, char *suffix)
{
int ret, flags, mode;
- char path[PATH_MAX];
+ char path[LTTNG_PATH_MAX];
- ret = utils_stream_file_name(path, path_name, file_name,
- size, count, suffix);
+ ret = utils_stream_file_path(path_name, file_name,
+ size, count, suffix, path, sizeof(path));
if (ret < 0) {
goto error;
}
uint64_t count, int uid, int gid, char *suffix)
{
int ret;
- char path[PATH_MAX];
+ char path[LTTNG_PATH_MAX];
- ret = utils_stream_file_name(path, path_name, file_name,
- size, count, suffix);
+ ret = utils_stream_file_path(path_name, file_name, size, count, suffix,
+ path, sizeof(path));
if (ret < 0) {
goto error;
}
}
/*
- * Return the group ID matching name, else 0 if it cannot be found.
+ * Return 0 on success and set *gid to the group_ID matching the passed name.
+ * Else -1 if it cannot be found or an error occurred.
*/
LTTNG_HIDDEN
-gid_t utils_get_group_id(const char *name)
+int utils_get_group_id(const char *name, bool warn, gid_t *gid)
{
- struct group *grp;
+ static volatile int warn_once;
+ int ret;
+ long sys_len;
+ size_t len;
+ struct group grp;
+ struct group *result;
+ struct lttng_dynamic_buffer buffer;
+
+ /* Get the system limit, if it exists. */
+ sys_len = sysconf(_SC_GETGR_R_SIZE_MAX);
+ if (sys_len == -1) {
+ len = 1024;
+ } else {
+ len = (size_t) sys_len;
+ }
- grp = getgrnam(name);
- if (!grp) {
- static volatile int warn_once;
+ lttng_dynamic_buffer_init(&buffer);
+ ret = lttng_dynamic_buffer_set_size(&buffer, len);
+ if (ret) {
+ ERR("Failed to allocate group info buffer");
+ ret = -1;
+ goto error;
+ }
+
+ while ((ret = getgrnam_r(name, &grp, buffer.data, buffer.size, &result)) == ERANGE) {
+ const size_t new_len = 2 * buffer.size;
- if (!warn_once) {
- WARN("No tracing group detected");
- warn_once = 1;
+ /* Buffer is not big enough, increase its size. */
+ if (new_len < buffer.size) {
+ ERR("Group info buffer size overflow");
+ ret = -1;
+ goto error;
}
- return 0;
+
+ ret = lttng_dynamic_buffer_set_size(&buffer, new_len);
+ if (ret) {
+ ERR("Failed to grow group info buffer to %zu bytes",
+ new_len);
+ ret = -1;
+ goto error;
+ }
+ }
+ if (ret) {
+ PERROR("Failed to get group file entry for group name \"%s\"",
+ name);
+ ret = -1;
+ goto error;
+ }
+
+ /* Group not found. */
+ if (!result) {
+ ret = -1;
+ goto error;
}
- return grp->gr_gid;
+
+ *gid = result->gr_gid;
+ ret = 0;
+
+error:
+ if (ret && warn && !warn_once) {
+ WARN("No tracing group detected");
+ warn_once = 1;
+ }
+ lttng_dynamic_buffer_reset(&buffer);
+ return ret;
}
/*