DOS: expand glob patterns when opening files

* This is not done by the shell in DOS.
* As a side effect, we support all of the Csh-like constructs like
  {a,b,c} in contrast to Watcom's fnmatch().

3 files changed, 29 insertions, 12 deletions

diff --git a/tecexec.c b/tecexec.c
index d306c5b..e1099a3 100644
--- a/tecexec.c
+++ b/tecexec.c
@@ -53,7 +53,6 @@ char *tecexec_c_version = "tecexec.c: $Revision: 1.3 $";
     int find_conditional_end(struct cmd_token *);
     int compare_label(struct cmd_token *,struct cmd_token *);
     void extract_label(struct cmd_token *,char *);
-	struct wildcard_expansion *expand_filename( char *wildcard_string );
 
 
 
diff --git a/teco.c b/teco.c
index 4cbb35a..d5be9a6 100644
--- a/teco.c
+++ b/teco.c
@@ -1036,7 +1036,6 @@ char *cp, c;
 #if defined(UNIX) || defined(MSDOS)
 /*
  * FIXME: Perhaps DOS should have its own version with `/` arguments.
- * The Watcom C runtime probably also doesn't expand wildcards.
  */
 int
 handle_command_line( int which_time, int argc, char **argv )
@@ -1105,14 +1104,23 @@ int arg_skip;
 
 	if(!first_file_argument) first_file_argument = i;
 	if(!outof_memory){
+#ifdef MSDOS
+	    struct wildcard_expansion *name_list,*np;
+	    np = expand_filename(argv[i]);
+	    while(np){
+		buff_openbuffer(np->we_name,0,readonly_flag);
+		name_list = np;
+		np = np->we_next;
+		tec_release(TYPE_C_WILD,(char *)name_list);
+	    }/* End While */
+#else
 	    buff_openbuffer(argv[i],0,readonly_flag);
+#endif
 	}/* End IF */
 
     }/* End FOR */
 
-    if(first_file_argument){
-	buff_openbuffer(argv[first_file_argument],0,readonly_flag);
-    }/* End IF */
+    buff_openbuffnum(1,0);
 
     if(piped_input_flag){
 	buff_openbuffnum(-1,0);
@@ -1137,7 +1145,6 @@ register int i,j;
 int count;
 register char *cp,*dp;
 struct wildcard_expansion *name_list,*np;
-struct wildcard_expansion *expand_filename(char *);
 int number_of_buffers_opened = 0;
 char switch_buffer[TECO_FILENAME_TOTAL_LENGTH];
 char *command_line;
@@ -1444,7 +1451,7 @@ struct passwd *pw;
     }
 #endif
     else {
-	strcpy(temp_name,"./");
+	strcpy(temp_name,"." TECO_DIRSEP_S);
 	strcat(temp_name,wildcard_string);
 	process_directory(temp_name,".",1);
     }
@@ -1581,9 +1588,9 @@ read_directory:
     dirp = opendir(path);
 
     while((dp = readdir(dirp)) != NULL) {
-#ifndef _POSIX_SOURCE
+#if !defined(_POSIX_SOURCE) && !defined(MSDOS)
 	if(dp->d_ino == 0) continue;
-#endif /* _POSIX_SOURCE */
+#endif /* !_POSIX_SOURCE && !MSDOS */
 	if(match_name(dp->d_name,wildstr+1)){
 	    switch(flags){
 		case 2:
@@ -1607,6 +1614,16 @@ read_directory:
 
 }/* End Routine */
 
+#ifdef MSDOS
+/* case-insensitive */
+#define MATCH_CHR(A,B) (TOUPPER(A) == TOUPPER(B))
+#define MATCH_WITHIN(L,X,H) (TOUPPER(L) <= TOUPPER(X) && TOUPPER(X) <= TOUPPER(H))
+#else
+/* case-sensitive */
+#define MATCH_CHR(A,B) ((A) == (B))
+#define MATCH_WITHIN(L,X,H) ((L) <= (X) && (X) <= (H))
+#endif
+
 /**
  * \brief Check whether a name satisfies a wildcard specification
  *
@@ -1641,7 +1658,7 @@ int pattern_char;
 		c = *name;
 		previous_char = 'A';
 		while((pattern_char = *pattern++)){
-		    if(pattern_char == c) match = 1;
+		    if(MATCH_CHR(pattern_char,c)) match = 1;
 		    if(pattern_char == ']'){
 			if(match) break;
 			return(0);
@@ -1652,7 +1669,7 @@ int pattern_char;
 			    pattern--;
 			    pattern_char = 'z';
 			}/* End IF */
-			if(c >= previous_char && c <= pattern_char){
+			if(MATCH_WITHIN(previous_char,c,pattern_char)){
 			    match = 1;
 			}/* End IF */
 		    }/* End IF */
@@ -1692,7 +1709,7 @@ int pattern_char;
 		}/* End FOR */
 		return(0);
 	    default:
-		if(pattern_char != *name) return(0);
+		if(!MATCH_CHR(pattern_char,*name)) return(0);
 		break;
 	}/* End Switch */
 	name++;
diff --git a/teco.h b/teco.h
index 8cd22b6..1a2bdc1 100644
--- a/teco.h
+++ b/teco.h
@@ -731,3 +731,4 @@ void term_delete_line(int,int);
 struct buff_header *buff_find(char *);
 struct buff_header *buff_duplicate(struct buff_header *);
 struct window *screen_split_window(struct window *,int,int);
+struct wildcard_expansion *expand_filename(char *);