added mput, mget (UNTESTED) and removed compiler warnings

4 files changed, 111 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 9583933..35ac855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-04  Andreas Buesching  <crunchy@tzi.de>
+
+	* mpio_tool/mpiosh.c (mpiosh_cmd_mput): 
+	added command mput. The arguments can be extended regular
+	expressions. UNTESTED!
+	(mpiosh_cmd_ldir): removed compiler warnings
+	(mpiosh_cmd_mget): added command mget. The arguments can be
+	extended regular expressions. UNTESTED!
+	(mpiosh_cmd_help): updated help text
+
 2002-09-03  Markus Germeier  <mager@tzi.de>
 
 	* first part of "design" fixes
diff --git a/TODO b/TODO
index ca2a4c1..92563b9 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.3 2002/09/04 07:22:42 crunchy Exp $
+$Id: TODO,v 1.4 2002/09/04 07:55:08 crunchy Exp $
 
 * Kernel Module
   - the MPIO can no multitasking, so:
@@ -25,6 +25,6 @@ $Id: TODO,v 1.3 2002/09/04 07:22:42 crunchy Exp $
   - more completion functions
     + command completion [DONE]
     + correct completion of filenames (quoting)
-  - handle regexps in command arguments
+  - handle regexps in command arguments [DONE]
   - use indices for files as possible arguments for put/get
 
diff --git a/mpio_tool/mpiosh.c b/mpio_tool/mpiosh.c
index f424509..29f92d5 100644
--- a/mpio_tool/mpiosh.c
+++ b/mpio_tool/mpiosh.c
@@ -2,7 +2,7 @@
 
 /* 
  *
- * $Id: mpiosh.c,v 1.3 2002/09/01 18:27:49 crunchy Exp $
+ * $Id: mpiosh.c,v 1.4 2002/09/04 07:55:08 crunchy Exp $
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
@@ -28,6 +28,7 @@
 #include <dirent.h>
 #include <grp.h>
 #include <pwd.h>
+#include <regex.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -56,7 +57,9 @@ static mpiosh_cmd_t commands[] = {
   { "quit",	mpiosh_cmd_quit,	NO },
   { "exit",	mpiosh_cmd_quit,	NO },
   { "get",	mpiosh_cmd_get,		YES },
+  { "mget",	mpiosh_cmd_mget,	YES },
   { "put",	mpiosh_cmd_put,		YES },
+  { "mput",	mpiosh_cmd_mput,	YES },
   { "del",	mpiosh_cmd_del,		YES },
   { "dump",	mpiosh_cmd_dump,	NO },
   { "free",	mpiosh_cmd_free,	NO },
@@ -302,8 +305,14 @@ mpiosh_cmd_help(char *args[])
 	 "  display amount of available bytes of current memory card\n");
   printf("put <filename>\n"
 	 "  write <filename> to memory card\n");
+  printf("mput <regexp>\n"
+	 "  write all local files matching the regular expression\n"
+	 "  to the selected memory card\n");
   printf("get <filename>\n"
 	 "  read <filename> from memory card\n");
+  printf("mput <regexp>\n"
+	 "  read all files matching the regular expression\n"
+	 "  from the selected memory card\n");
   printf("del <filename>\n"
 	 "  deletes <filename> from memory card\n");
   printf("exit, quit\n"
@@ -471,6 +480,49 @@ mpiosh_cmd_get(char *args[])
   printf("\n");
 }
 
+void
+mpiosh_cmd_mget(char *args[])
+{
+  BYTE *	p;
+  int		size, i = 0;
+  regex_t	regex;
+  BYTE		fname[100];
+  BYTE		month, day, hour, minute;
+  WORD		year;  
+  DWORD		fsize;  
+
+  if (mpiosh.dev == NULL) {
+    printf("connection to MPIO player already closed\n");
+    return;
+  }
+  
+  if (args[0] == NULL) {
+    printf("error: no argument given\n");
+    return;
+  }
+  
+  while (args[i] != NULL) {
+    if (regcomp(&regex, args[i], REG_EXTENDED | REG_ICASE)) {
+      fprintf(stderr, "error in regular expression: %s\n", args[i]);
+      continue;
+    }
+
+    p = mpio_directory_open(mpiosh.dev, mpiosh.card);
+    while (p != NULL) {
+      memset(fname, '\0', 100);
+      mpio_dentry_get(mpiosh.dev, p, fname, 100,
+		      &year, &month, &day, &hour, &minute, &fsize);
+      
+      if (!regexec(&regex, fname, 0, NULL, 0)) {
+	size = mpio_file_get(mpiosh.dev, mpiosh.card,
+			     fname, mpiosh_callback_put);
+      }
+      p = mpio_dentry_next(mpiosh.dev, p);
+    }
+    i++;
+  }
+}
+
 BYTE
 mpiosh_callback_put(int read, int total) 
 {
@@ -499,6 +551,46 @@ mpiosh_cmd_put(char *args[])
   printf("\n");
 }
 
+void
+mpiosh_cmd_mput(char *args[])
+{
+  char			dir_buf[NAME_MAX];
+  int			size, j, i = 0;
+  struct dirent **	dentry, **run;
+
+  regex_t	regex;
+  if (mpiosh.dev == NULL) {
+    printf("connection to MPIO player already closed\n");
+    return;
+  }
+  
+  if (args[0] == NULL) {
+    printf("error: no argument given\n");
+    return;
+  }
+  
+  getcwd(dir_buf, NAME_MAX);
+  while (args[i] != NULL) {
+    if (regcomp(&regex, args[i], REG_EXTENDED | REG_ICASE)) {
+      fprintf(stderr, "error in regular expression: %s\n", args[i]);
+      continue;
+    }
+
+    if ((size = scandir(dir_buf, &dentry, NULL, alphasort)) != -1) {
+      run = dentry;
+      for (j = 0; j < size; j++, run++) {
+	if (!regexec(&regex, (*run)->d_name, 0, NULL, 0)) {
+	  size = mpio_file_put(mpiosh.dev, mpiosh.card,
+			       (*run)->d_name, mpiosh_callback_put);
+	}
+	free(*run);
+      }
+      free(dentry);
+    }
+    i++;
+  }
+}
+
 BYTE
 mpiosh_callback_del(int read, int total) 
 {
@@ -637,7 +729,7 @@ mpiosh_cmd_ldir(char *args[])
   getcwd(dir_buf, NAME_MAX);
   if (dir_buf != '\0') {
     if ((count = scandir(dir_buf, &dentry, NULL, alphasort)) != -1) {
-      int		j, i, len = 0;
+      int		j, i;
       struct stat	st;
       struct passwd *	pwd;
       struct group *	grp;
@@ -660,8 +752,8 @@ mpiosh_cmd_ldir(char *args[])
 	pwd = getpwuid(st.st_uid);
 	grp = getgrgid(st.st_gid);
 	strftime(time, 12, "%b %2d", localtime(&(st.st_mtime)));
-	printf("%s %08s %08s %8d %10s %s\n",
-	       rights, pwd->pw_name, grp->gr_name, st.st_size,
+	printf("%s %8s %8s %8d %10s %s\n",
+	       rights, pwd->pw_name, grp->gr_name, (int)st.st_size,
 	       time,
 	       (*run)->d_name);
 	free(*run);
diff --git a/mpio_tool/mpiosh.h b/mpio_tool/mpiosh.h
index c3d550a..9f9b297 100644
--- a/mpio_tool/mpiosh.h
+++ b/mpio_tool/mpiosh.h
@@ -2,7 +2,7 @@
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
- * $Id: mpiosh.h,v 1.3 2002/09/01 18:27:49 crunchy Exp $
+ * $Id: mpiosh.h,v 1.4 2002/09/04 07:55:08 crunchy Exp $
  *
  * Copyright (C) 2002 Andreas Büsching <crunchy@tzi.de>
  *
@@ -72,7 +72,9 @@ void mpiosh_cmd_open(char *args[]);
 void mpiosh_cmd_close(char *args[]);
 void mpiosh_cmd_quit(char *args[]);
 void mpiosh_cmd_get(char *args[]);
+void mpiosh_cmd_mget(char *args[]);
 void mpiosh_cmd_put(char *args[]);
+void mpiosh_cmd_mput(char *args[]);
 void mpiosh_cmd_del(char *args[]);
 void mpiosh_cmd_dump(char *args[]);
 void mpiosh_cmd_free(char *args[]);