Fix: poll max size should be checked during resize

[lttng-tools.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index 0494b23bdcd0bd356f45c0f4f8c5bf8a0f99c871..2f114934fd78c654a43a9b5563f6929bc7422ec6 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -32,6 +33,7 @@
  * /tmp/test1 does, the real path is returned. In normal time, realpath(3)
  * fails if the end point directory does not exist.
  */
+__attribute__((visibility("hidden")))
 char *utils_expand_path(const char *path)
 {
        const char *end_path = path;
@@ -70,7 +72,7 @@ char *utils_expand_path(const char *path)
        }
 
        /* Add end part to expanded path */
-       strncat(expanded_path, end_path, PATH_MAX);
+       strncat(expanded_path, end_path, PATH_MAX - strlen(expanded_path) - 1);
 
        free(cut_path);
        return expanded_path;
@@ -84,6 +86,7 @@ error:
 /*
  * Create a pipe in dst.
  */
+__attribute__((visibility("hidden")))
 int utils_create_pipe(int *dst)
 {
        int ret;
@@ -106,6 +109,7 @@ int utils_create_pipe(int *dst)
  * Make sure the pipe opened by this function are closed at some point. Use
  * utils_close_pipe().
  */
+__attribute__((visibility("hidden")))
 int utils_create_pipe_cloexec(int *dst)
 {
        int ret, i;
@@ -134,6 +138,7 @@ error:
 /*
  * Close both read and write side of the pipe.
  */
+__attribute__((visibility("hidden")))
 void utils_close_pipe(int *src)
 {
        int i, ret;
@@ -158,6 +163,7 @@ void utils_close_pipe(int *src)
 /*
  * Create a new string using two strings range.
  */
+__attribute__((visibility("hidden")))
 char *utils_strdupdelim(const char *begin, const char *end)
 {
        char *str;
@@ -174,3 +180,55 @@ char *utils_strdupdelim(const char *begin, const char *end)
 error:
        return str;
 }
+
+/*
+ * Set CLOEXEC flag to the give file descriptor.
+ */
+__attribute__((visibility("hidden")))
+int utils_set_fd_cloexec(int fd)
+{
+       int ret;
+
+       if (fd < 0) {
+               ret = -EINVAL;
+               goto end;
+       }
+
+       ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
+       if (ret < 0) {
+               PERROR("fcntl cloexec");
+               ret = -errno;
+       }
+
+end:
+       return ret;
+}
+
+/*
+ * Create pid file to the given path and filename.
+ */
+__attribute__((visibility("hidden")))
+int utils_create_pid_file(pid_t pid, const char *filepath)
+{
+       int ret;
+       FILE *fp;
+
+       assert(filepath);
+
+       fp = fopen(filepath, "w");
+       if (fp == NULL) {
+               PERROR("open pid file %s", filepath);
+               ret = -1;
+               goto error;
+       }
+
+       ret = fprintf(fp, "%d\n", pid);
+       if (ret < 0) {
+               PERROR("fprintf pid file");
+       }
+
+       fclose(fp);
+       DBG("Pid %d written in file %s", pid, filepath);
+error:
+       return ret;
+}