Allow method to pass execgraph arguments containing spaces.

[monky] / src / conf_cookie.c

diff --git a/src/conf_cookie.c b/src/conf_cookie.c
index 568b5b6..a8769ad 100644 (file)
--- a/src/conf_cookie.c
+++ b/src/conf_cookie.c
@@ -1,12 +1,47 @@
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * Conky, a system monitor, based on torsmo
+ *
+ * Please see COPYING for details
+ *
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
+ *     (see AUTHORS)
+ * All rights reserved.
+ *
+ * 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 #define _GNU_SOURCE
+#include "config.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include "defconfig.h"
 
-ssize_t conf_read(void *cookie, char *buf, size_t size)
+#if defined(HAVE_FOPENCOOKIE)
+#define COOKIE_LEN_T   size_t
+#define COOKIE_RET_T   ssize_t
+#else
+#define COOKIE_LEN_T   int
+#define COOKIE_RET_T   int
+#endif
+
+static COOKIE_RET_T
+conf_read(void *cookie, char *buf, COOKIE_LEN_T size)
 {
        static int col = 0, row = 0;
-       size_t i = 0;
+       COOKIE_LEN_T i = 0;
        const char *conf[] = defconfig;
 
        (void)cookie;
@@ -24,11 +59,22 @@ ssize_t conf_read(void *cookie, char *buf, size_t size)
        return i;
 }
 
-#if defined(__linux__)
-cookie_io_functions_t conf_cookie = {
+#if defined(HAVE_FOPENCOOKIE)
+static cookie_io_functions_t conf_cookie = {
        .read = &conf_read,
        .write = NULL,
        .seek = NULL,
        .close = NULL,
 };
+FILE *conf_cookie_open(void)
+{
+       return fopencookie(NULL, "r", conf_cookie);
+}
+#elif defined(HAVE_FUNOPEN)
+FILE *conf_cookie_open(void)
+{
+       return funopen(NULL, &conf_read, NULL, NULL, NULL);
+}
+#else
+FILE *conf_cookie_open(void) { return NULL; }
 #endif