fixed regex handling in mpiosh.c

3 files changed, 59 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 35ac855..179167a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-08  Markus Germeier  <mager@tzi.de>
+
+	* mpio_tool/mpiosh.c: 
+	  (mpiosh_cmd_mput): fixed regex handling
+	  (mpiosh_cmd_mget): fixed regex handling
+	* regex for mput/mget does now work but uses "hard"
+	  regular expressions instead of shell-like regex, e.g.:
+	    "^0.*\.mp3$" ("hard" regular expression) 
+	    "0*.mp3"     (shell-like)
+
 2002-09-04  Andreas Buesching  <crunchy@tzi.de>
 
 	* mpio_tool/mpiosh.c (mpiosh_cmd_mput): 
diff --git a/TODO b/TODO
index 92563b9..245ca4f 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.4 2002/09/04 07:55:08 crunchy Exp $
+$Id: TODO,v 1.5 2002/09/08 17:03:50 germeier Exp $
 
 * Kernel Module
   - the MPIO can no multitasking, so:
@@ -27,4 +27,4 @@ $Id: TODO,v 1.4 2002/09/04 07:55:08 crunchy Exp $
     + correct completion of filenames (quoting)
   - handle regexps in command arguments [DONE]
   - use indices for files as possible arguments for put/get
-
+  - use shell-like regular expressions
diff --git a/mpio_tool/mpiosh.c b/mpio_tool/mpiosh.c
index 29f92d5..b592d35 100644
--- a/mpio_tool/mpiosh.c
+++ b/mpio_tool/mpiosh.c
@@ -2,7 +2,7 @@
 
 /* 
  *
- * $Id: mpiosh.c,v 1.4 2002/09/04 07:55:08 crunchy Exp $
+ * $Id: mpiosh.c,v 1.5 2002/09/08 17:03:50 germeier Exp $
  *
  * Author: Andreas Büsching  <crunchy@tzi.de>
  *
@@ -485,8 +485,10 @@ mpiosh_cmd_mget(char *args[])
 {
   BYTE *	p;
   int		size, i = 0;
+  int           error;
   regex_t	regex;
   BYTE		fname[100];
+  BYTE          errortext[100];
   BYTE		month, day, hour, minute;
   WORD		year;  
   DWORD		fsize;  
@@ -502,22 +504,28 @@ mpiosh_cmd_mget(char *args[])
   }
   
   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);
+    if (error = regcomp(&regex, args[i], REG_NOSUB)) {
+      regerror(error, &regex, errortext, 100);
+      debugn (2, "error in regular expression: %s (%s)\n", args[i], errortext);
+    } else {
+      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 (!(error = regexec(&regex, fname, 0, NULL, 0))) {
+	  printf("getting file \"%s\"\n", fname);
+	  size = mpio_file_get(mpiosh.dev, mpiosh.card,
+			       fname, mpiosh_callback_put);
+	  printf("\n");
+	} else {
+	  regerror(error, &regex, errortext, 100);
+	  debugn (2, "file does not match: %s (%s)\n", fname, errortext);
+	}
+	
+	p = mpio_dentry_next(mpiosh.dev, p);
       }
-      p = mpio_dentry_next(mpiosh.dev, p);
     }
     i++;
   }
@@ -557,8 +565,11 @@ mpiosh_cmd_mput(char *args[])
   char			dir_buf[NAME_MAX];
   int			size, j, i = 0;
   struct dirent **	dentry, **run;
+  regex_t	        regex;
+  int                   error;
+  BYTE                  errortext[100];
+  int                   fsize;
 
-  regex_t	regex;
   if (mpiosh.dev == NULL) {
     printf("connection to MPIO player already closed\n");
     return;
@@ -571,21 +582,27 @@ mpiosh_cmd_mput(char *args[])
   
   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);
+    if (error = regcomp(&regex, args[i], REG_NOSUB)) {
+      regerror(error, &regex, errortext, 100);
+      debugn (2, "error in regular expression: %s (%s)\n", args[i], errortext);
+    } else {
+      if ((size = scandir(dir_buf, &dentry, NULL, alphasort)) != -1) {
+	run = dentry;
+	for (j = 0; j < size; j++, run++) {
+	  if (!(error = regexec(&regex, (*run)->d_name, 0, NULL, 0))) {
+	    printf("putting file \"%s\"\n", (*run)->d_name);	    
+	    fsize = mpio_file_put(mpiosh.dev, mpiosh.card,
+				 (*run)->d_name, mpiosh_callback_put);
+	    printf("\n");
+	  } else {
+	    regerror(error, &regex, errortext, 100);
+	    debugn (2, "file does not match: %s (%s)\n", 
+		    (*run)->d_name, errortext);
+	  }
+	  free(*run);
 	}
-	free(*run);
+	free(dentry);
       }
-      free(dentry);
     }
     i++;
   }