Fix segfault in mail folder (SF: 3007493)

[monky] / src / fs.c

diff --git a/src/fs.c b/src/fs.c
index c330f61..54617c6 100644 (file)
--- a/src/fs.c
+++ b/src/fs.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -65,13 +65,13 @@ static void update_fs_stat(struct fs_stat *fs);
 
 void get_fs_type(const char *path, char *result);
 
-void update_fs_stats(void)
+int update_fs_stats(void)
 {
        unsigned i;
        static double last_fs_update = 0.0;
 
        if (current_update_time - last_fs_update < 13)
-               return;
+               return 0;
 
        for (i = 0; i < MAX_FS_STATS; ++i) {
                if (fs_stats[i].set) {
@@ -79,6 +79,7 @@ void update_fs_stats(void)
                }
        }
        last_fs_update = current_update_time;
+       return 0;
 }
 
 void clear_fs_stats(void)
@@ -197,8 +198,7 @@ void get_fs_type(const char *path, char *result)
 
 void init_fs_bar(struct text_object *obj, const char *arg)
 {
-       SIZE_DEFAULTS(bar);
-       arg = scan_bar(arg, &obj->data.fsbar.w, &obj->data.fsbar.h);
+       arg = scan_bar(obj, arg);
        if (arg) {
                while (isspace(*arg)) {
                        arg++;
@@ -209,31 +209,64 @@ void init_fs_bar(struct text_object *obj, const char *arg)
        } else {
                arg = "/";
        }
-       obj->data.fsbar.fs = prepare_fs_stat(arg);
+       obj->data.opaque = prepare_fs_stat(arg);
 }
 
 void print_fs_bar(struct text_object *obj, int be_free_bar, char *p, int p_max_size)
 {
-       double val;
+       double val = 1.0;
+       struct fs_stat *fs = obj->data.opaque;
 
-       if (!obj->data.fsbar.fs)
+       if (!fs)
                return;
 
-       if (!obj->data.fsbar.fs->size)
-               val = 1.0;
-       else
-               val = (double)obj->data.fsbar.fs->avail / (double)obj->data.fsbar.fs->size;
+       if (fs->size)
+               val = (double)fs->avail / (double)fs->size;
 
        if (!be_free_bar)
                val = 1.0 - val;
 
-#ifdef X11
-               if(output_methods & TO_X) {
-                       new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h, (int)(255 * val));
-               }else
-#endif /* X11 */
-               {
-                       if(!obj->data.fsbar.w) obj->data.fsbar.w = DEFAULT_BAR_WIDTH_NO_X;
-                       new_bar_in_shell(p, p_max_size, (int)(100 * val), obj->data.fsbar.w);
-               }
+       new_bar(obj, p, p_max_size, (int)(255 * val));
+}
+
+void init_fs(struct text_object *obj, const char *arg)
+{
+       obj->data.opaque = prepare_fs_stat(arg ? arg : "/");
+}
+
+void print_fs_perc(struct text_object *obj, int be_free, char *p, int p_max_size)
+{
+       struct fs_stat *fs = obj->data.opaque;
+       int val = 100;
+
+       if (!fs)
+               return;
+
+       if (fs->size)
+               val = fs->avail * 100 / fs->size;
+
+       if (!be_free)
+               val = 100 - val;
+
+       percent_print(p, p_max_size, val);
+}
+
+#define HUMAN_PRINT_FS_GENERATOR(name, expr)                           \
+void print_fs_##name(struct text_object *obj, char *p, int p_max_size) \
+{                                                                      \
+       struct fs_stat *fs = obj->data.opaque;                             \
+       if (fs)                                                            \
+               human_readable(expr, p, p_max_size);                           \
+}
+
+HUMAN_PRINT_FS_GENERATOR(free, fs->avail)
+HUMAN_PRINT_FS_GENERATOR(size, fs->size)
+HUMAN_PRINT_FS_GENERATOR(used, fs->size - fs->free)
+
+void print_fs_type(struct text_object *obj, char *p, int p_max_size)
+{
+       struct fs_stat *fs = obj->data.opaque;
+
+       if (fs)
+               snprintf(p, p_max_size, "%s", fs->type);
 }