bin: compile lttng-consumerd as a C++

[lttng-tools.git] / src / lib / lttng-ctl / save.c

diff --git a/src/lib/lttng-ctl/save.c b/src/lib/lttng-ctl/save.c
index d414a9d1d8c31d100aff87145c968f57e6b667e9..c8d8ac9c24ed4e2118c4c036047888affd7a3bc1 100644 (file)
--- a/src/lib/lttng-ctl/save.c
+++ b/src/lib/lttng-ctl/save.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (C) 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library 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 Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include <assert.h>
+#define _LGPL_SOURCE
 #include <string.h>
 
 #include <lttng/lttng-error.h>
@@ -68,6 +57,18 @@ int lttng_save_session_attr_get_overwrite(
        return attr ? attr->overwrite : -LTTNG_ERR_INVALID;
 }
 
+int lttng_save_session_attr_get_omit_name(
+       struct lttng_save_session_attr *attr)
+{
+       return attr ? attr->omit_name : -LTTNG_ERR_INVALID;
+}
+
+int lttng_save_session_attr_get_omit_output(
+       struct lttng_save_session_attr *attr)
+{
+       return attr ? attr->omit_output : -LTTNG_ERR_INVALID;
+}
+
 int lttng_save_session_attr_set_session_name(
        struct lttng_save_session_attr *attr, const char *session_name)
 {
@@ -82,12 +83,17 @@ int lttng_save_session_attr_set_session_name(
                size_t len;
 
                len = strlen(session_name);
-               if (len >= NAME_MAX) {
+               if (len >= LTTNG_NAME_MAX) {
                        ret = -LTTNG_ERR_INVALID;
                        goto error;
                }
 
-               strncpy(attr->session_name, session_name, len);
+               ret = lttng_strncpy(attr->session_name, session_name,
+                               sizeof(attr->session_name));
+               if (ret) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto error;
+               }
        } else {
                attr->session_name[0] = '\0';
        }
@@ -127,8 +133,12 @@ int lttng_save_session_attr_set_output_url(
        }
 
        /* Copy string plus the NULL terminated byte. */
-       lttng_ctl_copy_string(attr->configuration_url, uris[0].dst.path,
-                       sizeof(attr->configuration_url));
+       ret = lttng_strncpy(attr->configuration_url, uris[0].dst.path,
+                           sizeof(attr->configuration_url));
+       if (ret) {
+               ret = -LTTNG_ERR_INVALID;
+               goto error;
+       }
 
 end:
 error:
@@ -151,6 +161,36 @@ end:
        return ret;
 }
 
+int lttng_save_session_attr_set_omit_name(
+       struct lttng_save_session_attr *attr, int omit_name)
+{
+       int ret = 0;
+
+       if (!attr) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+
+       attr->omit_name = !!omit_name;
+end:
+       return ret;
+}
+
+int lttng_save_session_attr_set_omit_output(
+       struct lttng_save_session_attr *attr, int omit_output)
+{
+       int ret = 0;
+
+       if (!attr) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+
+       attr->omit_output = !!omit_output;
+end:
+       return ret;
+}
+
 /*
  * The lttng-ctl API does not expose all the information needed to save the
  * session configurations. Thus, we must send a save command to the session