[coreboot] r3582 - trunk/util/nvramtool

Author: stepan
Date: 2008-09-18 16:49:33 +0200 (Thu, 18 Sep 2008)
New Revision: 3582

Modified:
   trunk/util/nvramtool/layout.h
   trunk/util/nvramtool/lbtable.c
Log:
fix two minor bugs in nvramtool. (trivial)
Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/util/nvramtool/layout.h
===================================================================
--- trunk/util/nvramtool/layout.h	2008-09-18 07:48:59 UTC (rev 3581)
+++ trunk/util/nvramtool/layout.h	2008-09-18 14:49:33 UTC (rev 3582)
@@ -59,7 +59,7 @@
    unsigned length;
    cmos_entry_config_t config;
    unsigned config_id;
-   char name[CMOS_MAX_NAME_LENGTH];
+   char name[CMOS_MAX_NAME_LENGTH + 1];
  }
 cmos_entry_t;

@@ -69,7 +69,7 @@
 typedef struct
  { unsigned config_id;
    unsigned long long value;
-   char text[CMOS_MAX_TEXT_LENGTH];
+   char text[CMOS_MAX_TEXT_LENGTH + 1];
  }
 cmos_enum_t;

Modified: trunk/util/nvramtool/lbtable.c
===================================================================
--- trunk/util/nvramtool/lbtable.c	2008-09-18 07:48:59 UTC (rev 3581)
+++ trunk/util/nvramtool/lbtable.c	2008-09-18 14:49:33 UTC (rev 3582)
@@ -30,6 +30,7 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 *****************************************************************************/

+#include <string.h>
 #include <sys/mman.h>
 #include "common.h"
 #include "coreboot_tables.h"
@@ -556,7 +557,7 @@
    for (p = first_cmos_table_enum(); p != NULL; p = next_cmos_table_enum(p))
     { cmos_enum.config_id = p->config_id;
       cmos_enum.value = p->value;
-      strncpy(cmos_enum.text, p->text, CMOS_MAX_TEXT_LENGTH);
+      strncpy(cmos_enum.text, (char *)p->text, CMOS_MAX_TEXT_LENGTH);
       cmos_enum.text[CMOS_MAX_TEXT_LENGTH] = '\0';
       try_add_cmos_table_enum(&cmos_enum);
     }
@@ -589,7 +590,7 @@
        }

cmos_entry.config_id = q->config_id;
-      strncpy(cmos_entry.name, q->name, CMOS_MAX_NAME_LENGTH);
+      strncpy(cmos_entry.name, (char *)q->name, CMOS_MAX_NAME_LENGTH);
       cmos_entry.name[CMOS_MAX_NAME_LENGTH] = '\0';
       try_add_cmos_table_entry(&cmos_entry);
     }