#include "common/macros.h"
#define _LGPL_SOURCE
-#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
#include <limits.h>
* but the /tmp/test1 does, the real path for /tmp/test1 is concatened with
* /test2/test3 then returned. In normal time, realpath(3) fails if the end
* point directory does not exist.
- * In case resolved_path is NULL, the string returned was allocated in the
- * function and thus need to be freed by the caller. The size argument allows
- * to specify the size of the resolved_path argument if given, or the size to
- * allocate.
+ *
+ * Return a newly-allocated string.
*/
-LTTNG_HIDDEN
-char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
+static
+char *utils_partial_realpath(const char *path)
{
char *cut_path = NULL, *try_path = NULL, *try_path_prev = NULL;
const char *next, *prev, *end;
+ char *resolved_path = NULL;
/* Safety net */
if (path == NULL) {
cut_path = NULL;
}
- /* Allocate memory for the resolved path if necessary */
+ /* Allocate memory for the resolved path. */
+ resolved_path = zmalloc(LTTNG_PATH_MAX);
if (resolved_path == NULL) {
- resolved_path = zmalloc(size);
- if (resolved_path == NULL) {
- PERROR("zmalloc resolved path");
- goto error;
- }
+ PERROR("zmalloc resolved path");
+ goto error;
}
/*
}
/* Concatenate the strings */
- snprintf(resolved_path, size, "%s%s", try_path_prev, cut_path);
+ snprintf(resolved_path, LTTNG_PATH_MAX, "%s%s",
+ try_path_prev, cut_path);
/* Free the allocated memory */
free(cut_path);
* return it as is
*/
} else {
- strncpy(resolved_path, path, size);
+ strncpy(resolved_path, path, LTTNG_PATH_MAX);
}
/* Then we return the 'partially' resolved path */
if (keep_symlink) {
/* Resolve partially our path */
- absolute_path = utils_partial_realpath(absolute_path,
- absolute_path, LTTNG_PATH_MAX);
- if (!absolute_path) {
+ char *new_absolute_path = utils_partial_realpath(absolute_path);
+ if (!new_absolute_path) {
goto error;
}
+
+ free(absolute_path);
+ absolute_path = new_absolute_path;
}
ret = expand_double_slashes_dot_and_dotdot(absolute_path);
free(absolute_path);
return NULL;
}
-LTTNG_HIDDEN
char *utils_expand_path(const char *path)
{
return _utils_expand_path(path, true);
}
-LTTNG_HIDDEN
char *utils_expand_path_keep_symlink(const char *path)
{
return _utils_expand_path(path, false);
/*
* Create a pipe in dst.
*/
-LTTNG_HIDDEN
int utils_create_pipe(int *dst)
{
int ret;
* Make sure the pipe opened by this function are closed at some point. Use
* utils_close_pipe().
*/
-LTTNG_HIDDEN
int utils_create_pipe_cloexec(int *dst)
{
int ret, i;
* utils_close_pipe(). Using pipe() and fcntl rather than pipe2() to
* support OSes other than Linux 2.6.23+.
*/
-LTTNG_HIDDEN
int utils_create_pipe_cloexec_nonblock(int *dst)
{
int ret, i;
/*
* Close both read and write side of the pipe.
*/
-LTTNG_HIDDEN
void utils_close_pipe(int *src)
{
int i, ret;
/*
* Create a new string using two strings range.
*/
-LTTNG_HIDDEN
char *utils_strdupdelim(const char *begin, const char *end)
{
char *str;
/*
* Set CLOEXEC flag to the give file descriptor.
*/
-LTTNG_HIDDEN
int utils_set_fd_cloexec(int fd)
{
int ret;
/*
* Create pid file to the given path and filename.
*/
-LTTNG_HIDDEN
int utils_create_pid_file(pid_t pid, const char *filepath)
{
int ret;
FILE *fp;
- assert(filepath);
+ LTTNG_ASSERT(filepath);
fp = fopen(filepath, "w");
if (fp == NULL) {
* Create lock file to the given path and filename.
* Returns the associated file descriptor, -1 on error.
*/
-LTTNG_HIDDEN
int utils_create_lock_file(const char *filepath)
{
int ret;
int fd;
struct flock lock;
- assert(filepath);
+ LTTNG_ASSERT(filepath);
memset(&lock, 0, sizeof(lock));
fd = open(filepath, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR |
*
* On success, return 0 else a negative error code.
*/
-LTTNG_HIDDEN
int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
{
int ret;
struct lttng_directory_handle *handle;
const struct lttng_credentials creds = {
- .uid = (uid_t) uid,
- .gid = (gid_t) gid,
+ .uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
+ .gid = LTTNG_OPTIONAL_INIT_VALUE(gid),
};
handle = lttng_directory_handle_create(NULL);
*
* On success, return 0 else a negative error code.
*/
-LTTNG_HIDDEN
int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid)
{
int ret;
struct lttng_directory_handle *handle;
const struct lttng_credentials creds = {
- .uid = (uid_t) uid,
- .gid = (gid_t) gid,
+ .uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
+ .gid = LTTNG_OPTIONAL_INIT_VALUE(gid),
};
handle = lttng_directory_handle_create(NULL);
*
* Return 0 on success or else a negative value.
*/
-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)
if (size > 0) {
ret = snprintf(count_str, sizeof(count_str), "_%" PRIu64,
count);
- assert(ret > 0 && ret < sizeof(count_str));
+ LTTNG_ASSERT(ret > 0 && ret < sizeof(count_str));
}
ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
*
* @return 0 on success, -1 on failure.
*/
-LTTNG_HIDDEN
int utils_parse_size_suffix(const char * const str, uint64_t * const size)
{
int ret;
*
* @return 0 on success, -1 on failure.
*/
-LTTNG_HIDDEN
int utils_parse_time_suffix(char const * const str, uint64_t * const time_us)
{
int ret;
* Return the minimum order for which x <= (1UL << order).
* Return -1 if x is 0.
*/
-LTTNG_HIDDEN
int utils_get_count_order_u32(uint32_t x)
{
if (!x) {
* Return the minimum order for which x <= (1UL << order).
* Return -1 if x is 0.
*/
-LTTNG_HIDDEN
int utils_get_count_order_u64(uint64_t x)
{
if (!x) {
* Obtain the value of LTTNG_HOME environment variable, if exists.
* Otherwise returns the value of HOME.
*/
-LTTNG_HIDDEN
const char *utils_get_home_dir(void)
{
char *val = NULL;
* Get user's home directory. Dynamically allocated, must be freed
* by the caller.
*/
-LTTNG_HIDDEN
char *utils_get_user_home_dir(uid_t uid)
{
struct passwd pwd;
*
* Return amount of bytes set in the buffer or else 0 on error.
*/
-LTTNG_HIDDEN
size_t utils_get_current_time_str(const char *format, char *dst, size_t len)
{
size_t ret;
time_t rawtime;
struct tm *timeinfo;
- assert(format);
- assert(dst);
+ LTTNG_ASSERT(format);
+ LTTNG_ASSERT(dst);
/* Get date and time for session path */
time(&rawtime);
* 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
int utils_get_group_id(const char *name, bool warn, gid_t *gid)
{
static volatile int warn_once;
}
}
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;
}
* of elements in the long_options array. Returns NULL if the string's
* allocation fails.
*/
-LTTNG_HIDDEN
char *utils_generate_optstring(const struct option *long_options,
size_t opt_count)
{
* Try to remove a hierarchy of empty directories, recursively. Don't unlink
* any file. Try to rmdir any empty directory within the hierarchy.
*/
-LTTNG_HIDDEN
int utils_recursive_rmdir(const char *path)
{
int ret;
return ret;
}
-LTTNG_HIDDEN
int utils_truncate_stream_file(int fd, off_t length)
{
int ret;
return DEFAULT_MAN_BIN_PATH;
}
-LTTNG_HIDDEN
int utils_show_help(int section, const char *page_name,
const char *help_msg)
{
/* Section integer -> section string */
ret = sprintf(section_string, "%d", section);
- assert(ret > 0 && ret < 8);
+ LTTNG_ASSERT(ret > 0 && ret < 8);
/*
* Execute man pager.
* the information in `/proc/meminfo`. The number returned by this function is
* a best guess.
*/
-LTTNG_HIDDEN
int utils_get_memory_available(size_t *value)
{
return read_proc_meminfo_field(PROC_MEMINFO_MEMAVAILABLE_LINE, value);
* Returns the total size of the memory on the system in bytes based on the
* the information in `/proc/meminfo`.
*/
-LTTNG_HIDDEN
int utils_get_memory_total(size_t *value)
{
return read_proc_meminfo_field(PROC_MEMINFO_MEMTOTAL_LINE, value);
}
-LTTNG_HIDDEN
int utils_change_working_directory(const char *path)
{
int ret;
- assert(path);
+ LTTNG_ASSERT(path);
DBG("Changing working directory to \"%s\"", path);
ret = chdir(path);
return ret;
}
-LTTNG_HIDDEN
enum lttng_error_code utils_user_id_from_name(const char *user_name, uid_t *uid)
{
struct passwd p, *pres;
return ret_val;
}
-LTTNG_HIDDEN
enum lttng_error_code utils_group_id_from_name(
const char *group_name, gid_t *gid)
{
free(buf);
return ret_val;
}
+
+int utils_parse_unsigned_long_long(const char *str,
+ unsigned long long *value)
+{
+ int ret;
+ char *endptr;
+
+ LTTNG_ASSERT(str);
+ LTTNG_ASSERT(value);
+
+ errno = 0;
+ *value = strtoull(str, &endptr, 10);
+
+ /* Conversion failed. Out of range? */
+ if (errno != 0) {
+ /* Don't print an error; allow the caller to log a better error. */
+ DBG("Failed to parse string as unsigned long long number: string = '%s', errno = %d",
+ str, errno);
+ ret = -1;
+ goto end;
+ }
+
+ /* Not the end of the string or empty string. */
+ if (*endptr || endptr == str) {
+ DBG("Failed to parse string as unsigned long long number: string = '%s'",
+ str);
+ ret = -1;
+ goto end;
+ }
+
+ ret = 0;
+
+end:
+ return ret;
+}
projects / lttng-tools.git / blobdiff