Merge branch 'collectd-5.4' into collectd-5.5

[collectd.git] / src / utils_cmd_putval.c

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index 2522819..43244f6 100644 (file)
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -1,22 +1,27 @@
 /**
- * collectd - src/utils_cms_putval.c
+ * collectd - src/utils_cmd_putval.c
  * Copyright (C) 2007-2009  Florian octo Forster
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * 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.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * 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 St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
- * Author:
- *   Florian octo Forster <octo at verplant.org>
+ * Authors:
+ *   Florian octo Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
@@ -24,6 +29,7 @@
 #include "plugin.h"
 
 #include "utils_parse_option.h"
+#include "utils_cmd_putval.h"
 
 #define print_to_socket(fh, ...) \
     do { \
@@ -31,26 +37,11 @@
             char errbuf[1024]; \
             WARNING ("handle_putval: failed to write to socket #%i: %s", \
                     fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+            sfree (vl.values); \
             return -1; \
         } \
         fflush(fh); \
-    } while (0);
-
-static int dispatch_values (const data_set_t *ds, value_list_t *vl,
-               FILE *fh, char *buffer)
-{
-       int status;
-
-       status = parse_values (buffer, vl, ds);
-       if (status != 0)
-       {
-               print_to_socket (fh, "-1 Parsing the values string failed.\n");
-               return (-1);
-       }
-
-       plugin_dispatch_values (vl);
-       return (0);
-} /* int dispatch_values */
+    } while (0)
 
 static int set_option (value_list_t *vl, const char *key, const char *value)
 {
@@ -92,6 +83,7 @@ int handle_putval (FILE *fh, char *buffer)
 
        const data_set_t *ds;
        value_list_t vl = VALUE_LIST_INIT;
+       vl.values = NULL;
 
        DEBUG ("utils_cmd_putval: handle_putval (fh = %p, buffer = %s);",
                        (void *) fh, buffer);
@@ -191,6 +183,7 @@ int handle_putval (FILE *fh, char *buffer)
                        /* parse_option failed, buffer has been modified.
                         * => we need to abort */
                        print_to_socket (fh, "-1 Misformatted option.\n");
+                       sfree (vl.values);
                        return (-1);
                }
                else if (status == 0)
@@ -207,16 +200,20 @@ int handle_putval (FILE *fh, char *buffer)
                if (status != 0)
                {
                        print_to_socket (fh, "-1 Misformatted value.\n");
+                       sfree (vl.values);
                        return (-1);
                }
                assert (string != NULL);
 
-               status = dispatch_values (ds, &vl, fh, string);
+               status = parse_values (string, &vl, ds);
                if (status != 0)
                {
-                       /* An error has already been printed. */
+                       print_to_socket (fh, "-1 Parsing the values string failed.\n");
+                       sfree (vl.values);
                        return (-1);
                }
+
+               plugin_dispatch_values (&vl);
                values_submitted++;
        } /* while (*buffer != 0) */
        /* Done parsing the options. */
@@ -225,8 +222,7 @@ int handle_putval (FILE *fh, char *buffer)
                        values_submitted,
                        (values_submitted == 1) ? "value has" : "values have");
 
-       sfree (vl.values); 
-
+       sfree (vl.values);
        return (0);
 } /* int handle_putval */