[lcd4linux @ 2006-09-13 05:33:39 by reinelt]

plugin_file: return empty string if file cannot be read; widget_text: load property as 'string', not as variable (triggered an ugly bug with variable list reallocated)

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@710 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/plugin_file.c b/plugin_file.c
index 368eec968f9849cdeeb829ea21fd972b19665c97..2fc9ea09dabbed1e7747e3c04b37b8d49a25b063 100644 (file)
--- a/plugin_file.c
+++ b/plugin_file.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_file.c,v 1.2 2006/07/19 01:57:01 cmay Exp $
+/* $Id: plugin_file.c,v 1.3 2006/09/13 05:33:39 reinelt Exp $
  *
  * plugin to perform simple file operations
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: plugin_file.c,v $
+ * Revision 1.3  2006/09/13 05:33:39  reinelt
+ * plugin_file: return empty string if file cannot be read; widget_text: load property as 'string', not as variable (triggered an ugly bug with variable list reallocated)
+ *
  * Revision 1.2  2006/07/19 01:57:01  cmay
  * fixed double read of last line in file
  *
@@ -70,6 +73,7 @@ static void my_readline(RESULT * result, RESULT * arg1, RESULT * arg2)
     fp = fopen(R2S(arg1), "r");
     if (!fp) {
        error("readline couldn't open file '%s'", R2S(arg1));
+       value[0] = '\0';
     } else {
        i = 0;
        while (!feof(fp) && i++ < reqline) {

diff --git a/widget_text.c b/widget_text.c
index d5435343235d916e3c6e908f0347fca43925c227..3b4f52e89af40a22c9459284135fedf79f516be4 100644 (file)
--- a/widget_text.c
+++ b/widget_text.c
@@ -1,4 +1,4 @@
-/* $Id: widget_text.c,v 1.27 2006/08/13 18:14:03 harbaum Exp $
+/* $Id: widget_text.c,v 1.28 2006/09/13 05:33:39 reinelt Exp $
  *
  * simple text widget handling
  *
@@ -21,6 +21,9 @@
  *
  *
  * $Log: widget_text.c,v $
+ * Revision 1.28  2006/09/13 05:33:39  reinelt
+ * plugin_file: return empty string if file cannot be read; widget_text: load property as 'string', not as variable (triggered an ugly bug with variable list reallocated)
+ *
  * Revision 1.27  2006/08/13 18:14:03  harbaum
  * Added KVV plugin
  *
@@ -363,7 +366,7 @@ int widget_text_init(WIDGET * Self)
     property_load(section, "prefix", NULL, &Text->prefix);
     property_load(section, "expression", NULL, &Text->value);
     property_load(section, "postfix", NULL, &Text->postfix);
-    property_load(section, "style", "norm", &Text->style);
+    property_load(section, "style", "'norm'", &Text->style);
 
     /* field width, default 10 */
     cfg_number(section, "width", 10, 0, -1, &(Text->width));