r24872: Use torture API a bit more

[kai/samba.git] / source4 / torture / masktest.c

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index c37efc0472dc0320e434fb5f5a1271d30d45199c..3eac50cbca4f84e91b3e2a25c824daea57b431fb 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,16 +14,17 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "system/dir.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "pstring.h"
+#include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 
 static struct cli_credentials *credentials;
@@ -41,9 +42,9 @@ static BOOL reg_match_one(struct smbcli_state *cli, const char *pattern, const c
        /* oh what a weird world this is */
        if (old_list && strcmp(pattern, "*.*") == 0) return True;
 
-       if (strcmp(pattern,".") == 0) return False;
+       if (ISDOT(pattern)) return False;
 
-       if (strcmp(file,"..") == 0) file = ".";
+       if (ISDOTDOT(file)) file = ".";
 
        return ms_fnmatch(pattern, file, cli->transport->negotiate.protocol)==0;
 }
@@ -101,9 +102,9 @@ static BOOL f_info_hit;
 
 static void listfn(struct clilist_file_info *f, const char *s, void *state)
 {
-       if (strcmp(f->name,".") == 0) {
+       if (ISDOT(f->name)) {
                resultp[0] = '+';
-       } else if (strcmp(f->name,"..") == 0) {
+       } else if (ISDOTDOT(f->name)) {
                resultp[1] = '+';               
        } else {
                resultp[2] = '+';
@@ -127,7 +128,7 @@ static void get_real_name(struct smbcli_state *cli,
 
        smbcli_list_new(cli->tree, mask, 
                        FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, 
-                       RAW_SEARCH_BOTH_DIRECTORY_INFO,
+                       RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
                        listfn, NULL);
 
        if (f_info_hit) {
@@ -168,7 +169,7 @@ static void testpair(struct smbcli_state *cli, char *mask, char *file)
        fstrcpy(res1, "---");
        smbcli_list_new(cli->tree, mask, 
                        FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, 
-                       RAW_SEARCH_BOTH_DIRECTORY_INFO,
+                       RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
                        listfn, NULL);
 
        res2 = reg_test(cli, mask, long_name, short_name);
@@ -227,9 +228,9 @@ static void test_mask(int argc, char *argv[],
                }
                file[l+l2] = 0;
 
-               if (strcmp(file+l,".") == 0 || 
-                   strcmp(file+l,"..") == 0 ||
-                   strcmp(mask+l,"..") == 0) continue;
+               if (ISDOT(file+l) || ISDOTDOT(file+l) || ISDOTDOT(mask+l)) {
+                       continue;
+               }
 
                if (strspn(file+l, ".") == strlen(file+l)) continue;