add command config; no functionality at the moment

6 files changed, 45 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f3927b..bc218c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,22 @@
+2002-10-18  Andreas Buesching  <crunchy@tzi.de>
+
+	* mpiosh/global.c (commands): add config command with no
+	functionality at the moment
+	(commands): removed completion for mpio files on the put command
+
+<<<<<<< ChangeLog
+2002-10-14  Andreas Buesching  <crunchy@tzi.de>
+
+	* mpiosh/global.c (commands): reactivated switch command without
+	any functionality at the moment
+
+=======
 2002-10-18  Markus Germeier  <mager@tzi.de>
 
 	* libmpio/directory.c (mpio_dentry_get_real): 
 	  another fix for the 8.3 handling needed for the config file
 
+>>>>>>> 1.65
 2002-10-13  Markus Germeier  <mager@tzi.de>
 
 	* mpiosh/callback.c (mpiosh_cmd_dump): fixed compile and
diff --git a/mpiosh/callback.c b/mpiosh/callback.c
index e3c7c3c..8f4be03 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.26 2002/10/13 21:44:32 germeier Exp $
+ * $Id: callback.c,v 1.27 2002/10/18 08:39:23 crunchy Exp $
  *
  * Copyright (C) 2001 Andreas Büsching <crunchy@tzi.de>
  *
@@ -549,7 +549,6 @@ mpiosh_cmd_dump(char *args[])
 		    &year, &month, &day,
 		    &hour, &minute, &fsize);
 
-    arg[0] = fname;
     mpiosh_cmd_mget(arg);
     
     p = mpio_dentry_next(mpiosh.dev, mpiosh.card, p);
@@ -626,6 +625,14 @@ mpiosh_cmd_dump_mem(char *args[])
 
 }
 
+void
+mpiosh_cmd_config(char *args[])
+{
+  MPIOSH_CHECK_CONNECTION_CLOSED;
+
+  UNUSED(args);  
+}
+
 
 void
 mpiosh_cmd_ldir(char *args[])
diff --git a/mpiosh/callback.h b/mpiosh/callback.h
index 05019bf..a377a49 100644
--- a/mpiosh/callback.h
+++ b/mpiosh/callback.h
@@ -2,7 +2,7 @@
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
- * $Id: callback.h,v 1.5 2002/09/23 22:38:03 germeier Exp $
+ * $Id: callback.h,v 1.6 2002/10/18 08:39:23 crunchy Exp $
  *
  * Copyright (C) 2001 Andreas Büsching <crunchy@tzi.de>
  *
@@ -47,6 +47,7 @@ void mpiosh_cmd_free(char *args[]);
 void mpiosh_cmd_format(char *args[]);
 void mpiosh_cmd_switch(char *args[]);
 void mpiosh_cmd_dump_mem(char *args[]);
+void mpiosh_cmd_config(char *args[]);
 
 /* local command callbacks */
 void mpiosh_cmd_ldir(char *args[]);
diff --git a/mpiosh/global.c b/mpiosh/global.c
index 8a71c90..7fe21b6 100644
--- a/mpiosh/global.c
+++ b/mpiosh/global.c
@@ -2,7 +2,7 @@
  *
  * Author: Andreas Buesching  <crunchy@tzi.de>
  *
- * $Id: global.c,v 1.2 2002/10/14 12:52:01 crunchy Exp $
+ * $Id: global.c,v 1.3 2002/10/18 08:39:23 crunchy Exp $
  *
  * Copyright (C) 2001 Andreas Büsching <crunchy@tzi.de>
  *
@@ -72,7 +72,7 @@ mpiosh_cmd_t commands[] = {
   { "mput", (char *[]){ "put", NULL }, "list of filenames and <regexp>",
     "  write all local files matching the regular expression\n"
     "  to the selected memory card",
-    mpiosh_cmd_mput, mpiosh_readline_comp_mpio_file },
+    mpiosh_cmd_mput, NULL },
   { "mdel", (char *[]){ "rm", "del", NULL }, "<regexp>",
     "  deletes all files matching the regular expression\n"
     "  from the selected memory card",
@@ -105,6 +105,12 @@ mpiosh_cmd_t commands[] = {
     "  dump FAT, directory, spare area and the first 0x100 of the\n"
     "  selected memory card",
     mpiosh_cmd_dump_mem, NULL },
+  { "config", (char *[]) { "conf", NULL }, "-w -r -s",
+    "  give access to the configuration file of the MPIO player\n"
+    "   -w     write the configuration back to the MPIO player\n"
+    "   -r     read the configuration file and dumps it on the local disc\n"
+    "   -s     show the current configuration",
+    mpiosh_cmd_config, mpiosh_readline_comp_config },
   { NULL, NULL, NULL, NULL, NULL, NULL }
 };
 
diff --git a/mpiosh/readline.c b/mpiosh/readline.c
index cbff0a9..cd72591 100644
--- a/mpiosh/readline.c
+++ b/mpiosh/readline.c
@@ -2,7 +2,7 @@
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
- * $Id: readline.c,v 1.3 2002/10/13 19:46:51 crunchy Exp $
+ * $Id: readline.c,v 1.4 2002/10/18 08:39:23 crunchy Exp $
  *
  * Copyright (C) 2001 Andreas Büsching <crunchy@tzi.de>
  *
@@ -120,6 +120,15 @@ mpiosh_readline_comp_mpio_file(const char *text, int state)
   return arg;
 }
 
+char *
+mpiosh_readline_comp_config(const char *text, int state)
+{
+  char *arg = NULL;
+
+  return arg;
+}
+
+
 char **
 mpiosh_readline_completion(const char *text, int start, int end)
 {
diff --git a/mpiosh/readline.h b/mpiosh/readline.h
index 4c04f64..f4deb13 100644
--- a/mpiosh/readline.h
+++ b/mpiosh/readline.h
@@ -2,7 +2,7 @@
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
- * $Id: readline.h,v 1.1 2002/10/12 18:31:45 crunchy Exp $
+ * $Id: readline.h,v 1.2 2002/10/18 08:39:23 crunchy Exp $
  *
  * Copyright (C) 2001 Andreas Büsching <crunchy@tzi.de>
  *
@@ -39,6 +39,7 @@ int mpiosh_readline_cancel(void);
 
 char *mpiosh_readline_comp_cmd(const char *text, int state);
 char *mpiosh_readline_comp_mpio_file(const char *text, int state);
+char *mpiosh_readline_comp_config(const char *text, int state);
 
 #endif