small fixesRelease_0-6-0

3 files changed, 12 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 01ea342..3fdf452 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
-2003-03-08    <mager@tzi.de>
+2003-03-08  Markus Germeier  <mager@tzi.de>
 
 	* mpio.spec.in, etc/Makefile.am: fixed packaging problems
+	* libmpio/mpio.c (mpio_init): re-added memset, this time at the
+	  correct location
+	* mpiosh/callback.c (mpiosh_cmd_mem): removes warning messages
+	  (this should hopefully work now ;-)
+	  (mpiosh_cmd_dump): fixed core dump in "dump" command
 
 2003-02-21    <crunchy@tzi.de>
 
diff --git a/libmpio/mpio.c b/libmpio/mpio.c
index 691d925..7a25c52 100644
--- a/libmpio/mpio.c
+++ b/libmpio/mpio.c
@@ -1,6 +1,6 @@
 /* 
  *
- * $Id: mpio.c,v 1.39 2003/02/21 18:28:55 crunchy Exp $
+ * $Id: mpio.c,v 1.40 2003/03/08 17:28:19 germeier Exp $
  *
  * Library for USB MPIO-*
  *
@@ -179,6 +179,8 @@ mpio_init_external(mpio_t *m)
     } else {
       sm->manufacturer = 0;
       sm->id = 0;
+      sm->chips = 0;
+      sm->size = 0;
     }  
 
   /* init memory parameters if external memory is found */
@@ -212,11 +214,11 @@ mpio_init(mpio_callback_init_t progress_callback)
   int id_offset;
 
   new_mpio = malloc(sizeof(mpio_t));
-
   if (!new_mpio) {
     debug ("Error allocating memory for mpio_t");
     return NULL;
   }  
+  memset(new_mpio, 0, sizeof(mpio_t));
 
   new_mpio->fd = open(MPIO_DEVICE, O_RDWR);
 
diff --git a/mpiosh/callback.c b/mpiosh/callback.c
index 7d3596e..fd86825 100644
--- a/mpiosh/callback.c
+++ b/mpiosh/callback.c
@@ -2,7 +2,7 @@
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
- * $Id: callback.c,v 1.33 2003/02/26 16:34:45 crunchy Exp $
+ * $Id: callback.c,v 1.34 2003/03/08 17:28:20 germeier Exp $
  *
  * Copyright (C) 2001 Andreas Büsching <crunchy@tzi.de>
  *
@@ -177,13 +177,6 @@ mpiosh_cmd_mem(char *args[])
     if (mpio_memory_free(mpiosh.dev, MPIO_EXTERNAL_MEM, &free)) {
       mpiosh.card = MPIO_EXTERNAL_MEM;
       mpiosh.prompt = PROMPT_EXT;
-      printf("WARNING\n");
-      printf("Support for external memory is work in progress!!\n");
-      printf("Assumed status:\n");
-      printf("reading   : works (untested)\n");
-      printf("deleting  : works (untested)\n");
-      printf("writing   : works (untested)\n");
-      printf("formatting: complete (untested)\n");
       printf("external memory card is selected\n");
     } else {
       printf("no external memory card is available\n");
@@ -552,11 +545,11 @@ mpiosh_cmd_dump(char *args[])
   
   UNUSED(args);
   
-  arg[0] = fname;
   arg[1] = NULL;
   
   p = mpio_directory_open(mpiosh.dev, mpiosh.card);
   while ((p != NULL) && (!mpiosh_cancel)) {
+    arg[0] = fname; /* is this a memory leak?? -mager */
     memset(fname, '\0', 256);
     
     mpio_dentry_get(mpiosh.dev, mpiosh.card, p,