X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ffilecount.c;h=dc242ada10a54bf02f236645f7d283d0e9006e1e;hb=5b1f0319aec6b6bfe3f710badfd449dcdeecb82d;hp=55b3655ebaccd877b1a3c844839d1fbcd4e60e79;hpb=fd9c88963b04c9e9050a952ba0f018493e8b7638;p=collectd.git

diff --git a/src/filecount.c b/src/filecount.c
index 55b3655e..dc242ada 100644
--- a/src/filecount.c
+++ b/src/filecount.c
@@ -31,11 +31,16 @@
 #include <dirent.h>
 #include <fnmatch.h>
 
+#define FC_RECURSIVE 1
+#define FC_HIDDEN 2
+
 struct fc_directory_conf_s
 {
   char *path;
   char *instance;
 
+  int options;
+
   /* Data counters */
   uint64_t files_num;
   uint64_t files_size;
@@ -62,7 +67,6 @@ static void fc_submit_dir (const fc_directory_conf_t *dir)
 
   vl.values = values;
   vl.values_len = STATIC_ARRAY_SIZE (values);
-  vl.time = time (NULL);
   sstrncpy (vl.host, hostname_g, sizeof (vl.host));
   sstrncpy (vl.plugin, "filecount", sizeof (vl.plugin));
   sstrncpy (vl.plugin_instance, dir->instance, sizeof (vl.plugin_instance));
@@ -307,6 +311,44 @@ static int fc_config_add_dir_size (fc_directory_conf_t *dir,
   return (0);
 } /* int fc_config_add_dir_size */
 
+static int fc_config_add_dir_recursive (fc_directory_conf_t *dir,
+    oconfig_item_t *ci)
+{
+  if ((ci->values_num != 1)
+      || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
+  {
+    WARNING ("filecount plugin: The `Recursive' config options needs exactly "
+        "one boolean argument.");
+    return (-1);
+  }
+
+  if (ci->values[0].value.boolean)
+    dir->options |= FC_RECURSIVE;
+  else
+    dir->options &= ~FC_RECURSIVE;
+
+  return (0);
+} /* int fc_config_add_dir_recursive */
+
+static int fc_config_add_dir_hidden (fc_directory_conf_t *dir,
+    oconfig_item_t *ci)
+{
+  if ((ci->values_num != 1)
+      || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
+  {
+    WARNING ("filecount plugin: The `Hidden' config options needs exactly "
+        "one boolean argument.");
+    return (-1);
+  }
+
+  if (ci->values[0].value.boolean)
+    dir->options |= FC_HIDDEN;
+  else
+    dir->options &= ~FC_HIDDEN;
+
+  return (0);
+} /* int fc_config_add_dir_hidden */
+
 static int fc_config_add_dir (oconfig_item_t *ci)
 {
   fc_directory_conf_t *dir;
@@ -338,6 +380,8 @@ static int fc_config_add_dir (oconfig_item_t *ci)
 
   fc_config_set_instance (dir, dir->path);
 
+  dir->options = FC_RECURSIVE;
+
   dir->name = NULL;
   dir->mtime = 0;
   dir->size = 0;
@@ -355,6 +399,10 @@ static int fc_config_add_dir (oconfig_item_t *ci)
       status = fc_config_add_dir_mtime (dir, option);
     else if (strcasecmp ("Size", option->key) == 0)
       status = fc_config_add_dir_size (dir, option);
+    else if (strcasecmp ("Recursive", option->key) == 0)
+      status = fc_config_add_dir_recursive (dir, option);
+    else if (strcasecmp ("Hidden", option->key) == 0)
+      status = fc_config_add_dir_hidden (dir, option);
     else
     {
       WARNING ("filecount plugin: fc_config_add_dir: "
@@ -371,7 +419,7 @@ static int fc_config_add_dir (oconfig_item_t *ci)
     fc_directory_conf_t **temp;
 
     temp = (fc_directory_conf_t **) realloc (directories,
-        sizeof (*directories) * directories_num);
+        sizeof (*directories) * (directories_num + 1));
     if (temp == NULL)
     {
       ERROR ("filecount plugin: realloc failed.");
@@ -447,9 +495,12 @@ static int fc_read_dir_callback (const char *dirname, const char *filename,
     return (-1);
   }
 
-  if (S_ISDIR (statbuf.st_mode))
+  if (S_ISDIR (statbuf.st_mode) && (dir->options & FC_RECURSIVE))
   {
-    status = walk_directory (abs_path, fc_read_dir_callback, dir);
+    if(dir->options & FC_HIDDEN)
+	status = walk_directory (abs_path, fc_read_dir_callback, dir,/* include hidden */1);
+    else
+	status = walk_directory (abs_path, fc_read_dir_callback, dir,/* include hidden */ 0);
     return (status);
   }
   else if (!S_ISREG (statbuf.st_mode))
@@ -511,8 +562,11 @@ static int fc_read_dir (fc_directory_conf_t *dir)
 
   if (dir->mtime != 0)
     dir->now = time (NULL);
-
-  status = walk_directory (dir->path, fc_read_dir_callback, dir);
+    
+  if(dir->options & FC_HIDDEN)
+    status = walk_directory (dir->path, fc_read_dir_callback, dir,/* include hidden */ 1);
+  else
+    status = walk_directory (dir->path, fc_read_dir_callback, dir,/* include hidden */ 0);
   if (status != 0)
   {
     WARNING ("filecount plugin: walk_directory (%s) failed.", dir->path);