diff --git a/src/filesystem.c b/src/filesystem.c
index a5eeb81f73771fe4c63979e5bf574b3bad5a74fa..ab57357ad99119860704739799c77ee5ee519c9b 100644 (file)
--- a/src/filesystem.c
+++ b/src/filesystem.c
+/**
+ * collection4 - filesystem.c
+ * Copyright (C) 2010 Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ *
+ * Authors:
+ * Florian octo Forster <ff at octo.it>
+ **/
+
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
typedef struct fs_scan_dir_data_s fs_scan_dir_data_t;
typedef int (*callback_type_t) (const char *type, void *user_data);
-typedef int (*callback_plugin_t) (const char *plugin, void *user_data);
-typedef int (*callback_host_t) (const char *host, void *user_data);
+typedef int (*callback_plugin_t) (const char *base_dir,
+ const char *plugin, void *user_data);
+typedef int (*callback_host_t) (const char *base_dir,
+ const char *host, void *user_data);
/*
* Directory and file walking functions
return (status);
} /* }}} int foreach_rrd_file */
-static int foreach_dir (const char *dir, /* {{{ */
- int (*callback) (const char *, void *),
- void *user_data)
-{
- DIR *dh;
- struct dirent *entry;
- int status = 0;
-
- if (callback == NULL)
- return (EINVAL);
-
- dh = opendir (dir);
- if (dh == NULL)
- return (errno);
-
- while ((entry = readdir (dh)) != NULL)
- {
- struct stat statbuf;
- char abspath[PATH_MAX + 1];
-
- if (entry->d_name[0] == '.')
- continue;
-
- snprintf (abspath, sizeof (abspath), "%s/%s", dir, entry->d_name);
- abspath[sizeof (abspath) - 1] = 0;
-
- memset (&statbuf, 0, sizeof (statbuf));
-
- status = stat (abspath, &statbuf);
- if (status != 0)
- continue;
-
- if (!S_ISDIR (statbuf.st_mode))
- continue;
-
- status = (*callback) (entry->d_name, user_data);
- if (status != 0)
- break;
- } /* while (readdir) */
-
- closedir (dh);
- return (status);
-} /* }}} int foreach_dir */
-
static int foreach_type (const char *host, const char *plugin, /* {{{ */
callback_type_t callback, void *user_data)
{
snprintf (abspath, sizeof (abspath), "%s/%s", DATA_DIR, host);
abspath[sizeof (abspath) - 1] = 0;
- return (foreach_dir (abspath, callback, user_data));
+ return (fs_foreach_dir (abspath, callback, user_data));
} /* }}} int foreach_plugin */
static int foreach_host (callback_host_t callback, /* {{{ */
void *user_data)
{
- return (foreach_dir (DATA_DIR, callback, user_data));
+ return (fs_foreach_dir (DATA_DIR, callback, user_data));
} /* }}} int foreach_host */
/*
return (status);
} /* }}} int scan_type */
-static int scan_plugin (const char *plugin, void *user_data) /* {{{ */
+static int scan_plugin (__attribute__((unused)) const char *base_dir, /* {{{ */
+ const char *plugin, void *user_data)
{
fs_scan_dir_data_t *data = user_data;
int status;
return (status);
} /* }}} int scan_plugin */
-static int scan_host (const char *host, void *user_data) /* {{{ */
+static int scan_host (__attribute__((unused)) const char *base_dir, /* {{{ */
+ const char *host, void *user_data)
{
fs_scan_dir_data_t *data = user_data;
int status;
/*
* Public function
*/
+int fs_foreach_dir (const char *base_dir, /* {{{ */
+ int (*callback) (const char *base_dir, const char *entry, void *),
+ void *user_data)
+{
+ DIR *dh;
+ struct dirent *entry;
+ int status = 0;
+
+ if (callback == NULL)
+ return (EINVAL);
+
+ dh = opendir (base_dir);
+ if (dh == NULL)
+ return (errno);
+
+ while ((entry = readdir (dh)) != NULL)
+ {
+ struct stat statbuf;
+ char abspath[PATH_MAX + 1];
+
+ if (entry->d_name[0] == '.')
+ continue;
+
+ snprintf (abspath, sizeof (abspath), "%s/%s", base_dir, entry->d_name);
+ abspath[sizeof (abspath) - 1] = 0;
+
+ memset (&statbuf, 0, sizeof (statbuf));
+
+ status = stat (abspath, &statbuf);
+ if (status != 0)
+ continue;
+
+ if (!S_ISDIR (statbuf.st_mode))
+ continue;
+
+ status = (*callback) (base_dir, entry->d_name, user_data);
+ if (status != 0)
+ break;
+ } /* while (readdir) */
+
+ closedir (dh);
+ return (status);
+} /* }}} int fs_foreach_dir */
+
+int fs_foreach_file (const char *base_dir, /* {{{ */
+ int (*callback) (const char *base_dir, const char *entry, void *),
+ void *user_data)
+{
+ DIR *dh;
+ struct dirent *entry;
+ int status = 0;
+
+ if (callback == NULL)
+ return (EINVAL);
+
+ dh = opendir (base_dir);
+ if (dh == NULL)
+ return (errno);
+
+ while ((entry = readdir (dh)) != NULL)
+ {
+ struct stat statbuf;
+ char abspath[PATH_MAX + 1];
+
+ if (entry->d_name[0] == '.')
+ continue;
+
+ snprintf (abspath, sizeof (abspath), "%s/%s", base_dir, entry->d_name);
+ abspath[sizeof (abspath) - 1] = 0;
+
+ memset (&statbuf, 0, sizeof (statbuf));
+
+ status = stat (abspath, &statbuf);
+ if (status != 0)
+ continue;
+
+ if (!S_ISREG (statbuf.st_mode))
+ continue;
+
+ status = (*callback) (base_dir, entry->d_name, user_data);
+ if (status != 0)
+ break;
+ } /* while (readdir) */
+
+ closedir (dh);
+ return (status);
+} /* }}} int fs_foreach_file */
+
int fs_scan (fs_ident_cb_t callback, void *user_data) /* {{{ */
{
fs_scan_dir_data_t data;