summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-04-30 11:04:28 +0000
committerAndrew Tridgell <tridge@samba.org>2000-04-30 11:04:28 +0000
commit700f72453ed8dfd356a5591b9447127b5066ac4b (patch)
tree46a30958a2f160cf389a9309355c3ebc39c584fd /source3/client
parent71e7974f3f847759ba6f844ea7f482786cc5db02 (diff)
downloadsamba-700f72453ed8dfd356a5591b9447127b5066ac4b.tar.gz
samba-700f72453ed8dfd356a5591b9447127b5066ac4b.tar.bz2
samba-700f72453ed8dfd356a5591b9447127b5066ac4b.zip
- removed all our old wildcard matching code and replaced it with a
call to ms_fnmatch(). This also removes all the Win9X semantics stuff and a bunch of other associated cruft. - moved the stat cache code into statcache.c - fixed the uint16 alignment requirements of ascii_to_unistr() and unistr_to_ascii() - trans2 SMB_FIND_FILE_BOTH_DIRECTORY_INFO returns the short name as unicode always (at least thats what NT4 does) - fixed some errors in the in-memory tdb code. Still ugly, but doesn't crash as much (This used to be commit 03e9cea004bbba72161a5323cf3b4556c94aed8e)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c2
-rw-r--r--source3/client/clitar.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 08dd8970fc..ade1436871 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -302,7 +302,7 @@ static BOOL do_this_one(file_info *finfo)
if (finfo->mode & aDIR) return(True);
if (*fileselection &&
- !mask_match(finfo->name,fileselection,False,False)) {
+ !mask_match(finfo->name,fileselection,False)) {
DEBUG(3,("match_match %s failed\n", finfo->name));
return False;
}
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index d71eff1c9e..efa4fa8815 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -820,7 +820,7 @@ static void do_tar(file_info *finfo)
#ifdef HAVE_REGEX_H
(tar_re_search && !regexec(preg, exclaim, 0, NULL, 0))) {
#else
- (tar_re_search && mask_match(exclaim, cliplist[0], True, False))) {
+ (tar_re_search && mask_match(exclaim, cliplist[0], True))) {
#endif
DEBUG(3,("Skipping file %s\n", exclaim));
return;
@@ -1234,7 +1234,7 @@ static void do_tarput(void)
#ifdef HAVE_REGEX_H
|| (tar_re_search && !regexec(preg, finfo.name, 0, NULL, 0)));
#else
- || (tar_re_search && mask_match(finfo.name, cliplist[0], True, False)));
+ || (tar_re_search && mask_match(finfo.name, cliplist[0], True)));
#endif
DEBUG(5, ("Skip = %i, cliplist=%s, file=%s\n", skip, (cliplist?cliplist[0]:NULL), finfo.name));