#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);
int ret;
FILE *fp;
- assert(filepath);
+ LTTNG_ASSERT(filepath);
fp = fopen(filepath, "w");
if (fp == NULL) {
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 |
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",
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);
/* Section integer -> section string */
ret = sprintf(section_string, "%d", section);
- assert(ret > 0 && ret < 8);
+ LTTNG_ASSERT(ret > 0 && ret < 8);
/*
* Execute man pager.
{
int ret;
- assert(path);
+ LTTNG_ASSERT(path);
DBG("Changing working directory to \"%s\"", path);
ret = chdir(path);
int ret;
char *endptr;
- assert(str);
- assert(value);
+ LTTNG_ASSERT(str);
+ LTTNG_ASSERT(value);
errno = 0;
*value = strtoull(str, &endptr, 10);