sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Ooops - fixed Win95 crash bugs with earlier code.

Browse Source 
Jeremy
(This used to be commit 6baeb4ad96)
This commit is contained in:
Jeremy Allison 1998-05-27 23:50:30 +00:00
parent ad53f02511
commit 459ecfec83
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -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);

10
source3/lib/util.c
View File

@ -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;
}