#include <fcntl.h>
#include <limits.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <common/common.h>
#include <common/runas.h>
#include <common/compat/getenv.h>
+#include <common/compat/string.h>
#include "utils.h"
#include "defaults.h"
LTTNG_HIDDEN
char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
{
- char *cut_path, *try_path = NULL, *try_path_prev = NULL;
+ char *cut_path = NULL, *try_path = NULL, *try_path_prev = NULL;
const char *next, *prev, *end;
/* Safety net */
}
/* Cut the part we will be trying to resolve */
- cut_path = strndup(path, next - path);
+ cut_path = lttng_strndup(path, next - path);
if (cut_path == NULL) {
- PERROR("strndup");
+ PERROR("lttng_strndup");
goto error;
}
/* Free the allocated memory */
free(cut_path);
- };
+ cut_path = NULL;
+ }
/* Allocate memory for the resolved path if necessary */
if (resolved_path == NULL) {
/* Free the allocated memory */
free(cut_path);
free(try_path_prev);
+ cut_path = NULL;
+ try_path_prev = NULL;
/*
* Else, we just copy the path in our resolved_path to
* return it as is
error:
free(resolved_path);
+ free(cut_path);
return NULL;
}
while ((next = strstr(absolute_path, "/./"))) {
/* We prepare the start_path not containing it */
- start_path = strndup(absolute_path, next - absolute_path);
+ start_path = lttng_strndup(absolute_path, next - absolute_path);
if (!start_path) {
- PERROR("strndup");
+ PERROR("lttng_strndup");
goto error;
}
/* And we concatenate it with the part after this string */
}
/* Then we prepare the start_path not containing it */
- start_path = strndup(absolute_path, previous - absolute_path);
+ start_path = lttng_strndup(absolute_path, previous - absolute_path);
if (!start_path) {
- PERROR("strndup");
+ PERROR("lttng_strndup");
goto error;
}
ret = unlink(path);
} else {
ret = run_as_unlink(path, uid, gid);
- if (ret < 0) {
- errno = -ret;
- ret = -1;
- }
}
if (ret < 0) {
goto error;