Ooops - fixed Win95 crash bugs with earlier code.

Jeremy
(This used to be commit 6baeb4ad96bc58cf1bd53f6621067af8344c9556)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 44821405d4fed367548421053171196991ec87dc..3086c6cd242e55969bb90219d428b7ba65d8adfc 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2013,7 +2013,6 @@ BOOL string_init(char **dest,char *src);
 void string_free(char **s);
 BOOL string_set(char **dest,char *src);
 BOOL string_sub(char *s,char *pattern,char *insert);
-BOOL mask_match(char *str, char *regexp, int case_sig, BOOL trans2);
 BOOL do_match(char *str, char *regexp, int case_sig);
 BOOL mask_match(char *str, char *regexp, int case_sig,BOOL trans2);
 void become_daemon(void);

diff --git a/source3/lib/util.c b/source3/lib/util.c
index dc8619cdc6bb19d0a65cf5f686bd84771c60cb22..b5e52374d9d3ee6c2dfa52e9f06aeedac4f4a347 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3077,8 +3077,13 @@ BOOL mask_match(char *str, char *regexp, int case_sig,BOOL trans2)
   pstrcpy(t_pattern,regexp);
   pstrcpy(t_filename,str);
 
+#if 0
+  /* 
+   * Not sure if this is a good idea. JRA.
+   */
   if(trans2 && is_8_3(t_pattern,False) && is_8_3(t_filename,False))
     trans2 = False;
+#endif
 
 #if 0
   if (!strchr(t_filename,'.')) {
@@ -3147,12 +3152,11 @@ BOOL mask_match(char *str, char *regexp, int case_sig,BOOL trans2)
             if(fp)
               *fp = '\0';
 
-            if(do_match( cp2, cp1, case_sig)) {
-              cp1 = rp ? rp + 1 : NULL;
+            if((cp1 != NULL) && do_match( cp2, cp1, case_sig)) {
               cp2 = fp ? fp + 1 : "";
               break;
             }
-            cp2 = fp + 1;
+            cp2 = fp ? fp + 1 : "";
           }
           num_path_components -= i;
         }