X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=646ebbbc7d34e6705d82fa654773ccbc387c5c66;hp=fda43152d30905fc278515277f79a11eb0104282;hb=11f8d2f7f00b61b467bf78518036d7cb96e8b9fc;hpb=4f00620d66e81d89a546b29a774dad49d38983b3 diff --git a/src/common/utils.c b/src/common/utils.c index fda43152d..646ebbbc7 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1,20 +1,10 @@ /* - * Copyright (C) 2012 - David Goulet - * Copyright (C) 2013 - Raphaël Beamonte - * Copyright (C) 2013 - Jérémie Galarneau + * Copyright (C) 2012 David Goulet + * Copyright (C) 2013 Raphaël Beamonte + * Copyright (C) 2013 Jérémie Galarneau * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE @@ -324,7 +314,7 @@ error: * The returned string was allocated in the function, it is thus of * the responsibility of the caller to free this memory. */ -LTTNG_HIDDEN +static char *_utils_expand_path(const char *path, bool keep_symlink) { int ret; @@ -379,6 +369,9 @@ char *_utils_expand_path(const char *path, bool keep_symlink) /* Resolve partially our path */ absolute_path = utils_partial_realpath(absolute_path, absolute_path, LTTNG_PATH_MAX); + if (!absolute_path) { + goto error; + } } ret = expand_double_slashes_dot_and_dotdot(absolute_path); @@ -544,6 +537,7 @@ void utils_close_pipe(int *src) if (ret) { PERROR("close pipe"); } + src[i] = -1; } } @@ -679,21 +673,22 @@ LTTNG_HIDDEN int utils_mkdir(const char *path, mode_t mode, int uid, int gid) { int ret; - struct lttng_directory_handle handle; + struct lttng_directory_handle *handle; const struct lttng_credentials creds = { .uid = (uid_t) uid, .gid = (gid_t) gid, }; - ret = lttng_directory_handle_init(&handle, NULL); - if (ret) { + handle = lttng_directory_handle_create(NULL); + if (!handle) { + ret = -1; goto end; } ret = lttng_directory_handle_create_subdirectory_as_user( - &handle, path, mode, + handle, path, mode, (uid >= 0 || gid >= 0) ? &creds : NULL); - lttng_directory_handle_fini(&handle); end: + lttng_directory_handle_put(handle); return ret; } @@ -707,21 +702,22 @@ LTTNG_HIDDEN int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid) { int ret; - struct lttng_directory_handle handle; + struct lttng_directory_handle *handle; const struct lttng_credentials creds = { .uid = (uid_t) uid, .gid = (gid_t) gid, }; - ret = lttng_directory_handle_init(&handle, NULL); - if (ret) { + handle = lttng_directory_handle_create(NULL); + if (!handle) { + ret = -1; goto end; } ret = lttng_directory_handle_create_subdirectory_recursive_as_user( - &handle, path, mode, + handle, path, mode, (uid >= 0 || gid >= 0) ? &creds : NULL); - lttng_directory_handle_fini(&handle); end: + lttng_directory_handle_put(handle); return ret; } @@ -739,7 +735,8 @@ int utils_stream_file_path(const char *path_name, const char *file_name, char count_str[MAX_INT_DEC_LEN(count) + 1] = {}; const char *path_separator; - if (path_name && path_name[strlen(path_name) - 1] == '/') { + if (path_name && (path_name[0] == '\0' || + path_name[strlen(path_name) - 1] == '/')) { path_separator = ""; } else { path_separator = "/"; @@ -765,74 +762,6 @@ int utils_stream_file_path(const char *path_name, const char *file_name, return ret; } -/* - * Create the stream file on disk. - * - * Return 0 on success or else a negative value. - */ -LTTNG_HIDDEN -int utils_create_stream_file(const char *path_name, char *file_name, uint64_t size, - uint64_t count, int uid, int gid, char *suffix) -{ - int ret, flags, mode; - char path[LTTNG_PATH_MAX]; - - ret = utils_stream_file_path(path_name, file_name, - size, count, suffix, path, sizeof(path)); - if (ret < 0) { - goto error; - } - - /* - * With the session rotation feature on the relay, we might need to seek - * and truncate a tracefile, so we need read and write access. - */ - flags = O_RDWR | O_CREAT | O_TRUNC; - /* Open with 660 mode */ - mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP; - - if (uid < 0 || gid < 0) { - ret = open(path, flags, mode); - } else { - ret = run_as_open(path, flags, mode, uid, gid); - } - if (ret < 0) { - PERROR("open stream path %s", path); - } -error: - return ret; -} - -/* - * Unlink the stream tracefile from disk. - * - * Return 0 on success or else a negative value. - */ -LTTNG_HIDDEN -int utils_unlink_stream_file(const char *path_name, char *file_name, uint64_t size, - uint64_t count, int uid, int gid, char *suffix) -{ - int ret; - char path[LTTNG_PATH_MAX]; - - ret = utils_stream_file_path(path_name, file_name, size, count, suffix, - path, sizeof(path)); - if (ret < 0) { - goto error; - } - if (uid < 0 || gid < 0) { - ret = unlink(path); - } else { - ret = run_as_unlink(path, uid, gid); - } - if (ret < 0) { - goto error; - } -error: - DBG("utils_unlink_stream_file %s returns %d", path, ret); - return ret; -} - /** * Parse a string that represents a size in human readable format. It * supports decimal integers suffixed by 'k', 'K', 'M' or 'G'. @@ -1079,7 +1008,7 @@ static inline unsigned int fls_u32(uint32_t x) #define HAS_FLS_U32 #endif -#if defined(__x86_64) +#if defined(__x86_64) && defined(__LP64__) static inline unsigned int fls_u64(uint64_t x) { @@ -1418,15 +1347,16 @@ LTTNG_HIDDEN int utils_recursive_rmdir(const char *path) { int ret; - struct lttng_directory_handle handle; + struct lttng_directory_handle *handle; - ret = lttng_directory_handle_init(&handle, NULL); - if (ret) { + handle = lttng_directory_handle_create(NULL); + if (!handle) { + ret = -1; goto end; } - ret = lttng_directory_handle_remove_subdirectory(&handle, path); - lttng_directory_handle_fini(&handle); + ret = lttng_directory_handle_remove_subdirectory(handle, path); end: + lttng_directory_handle_put(handle); return ret; } @@ -1566,3 +1496,35 @@ 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); + + DBG("Changing working directory to \"%s\"", path); + ret = chdir(path); + if (ret) { + PERROR("Failed to change working directory to \"%s\"", path); + goto end; + } + + /* Check for write access */ + if (access(path, W_OK)) { + if (errno == EACCES) { + /* + * Do not treat this as an error since the permission + * might change in the lifetime of the process + */ + DBG("Working directory \"%s\" is not writable", path); + } else { + PERROR("Failed to check if working directory \"%s\" is writable", + path); + } + } + +end: + return ret; +}