s3-util: for convenience, provide format comments in tdb_unpack().

[jra/samba/.git] / source3 / torture / utable.c

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 720614cea37a51b6fc1b91f0123a9cb43e904818..e36b0388c4ed42a1c1b80ff30a5d6ed13006ea9a 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,


@@ -14,17 +14,14 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
    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/>.

 */
 
 */
 

-#define NO_SYSLOG
-

 #include "includes.h"
 
 #include "includes.h"
 

-BOOL torture_utable(int dummy)
+bool torture_utable(int dummy)

 {
 {

-       static struct cli_state cli;
+       struct cli_state *cli;

        fstring fname, alt_name;
        int fnum;
        smb_ucs2_t c2;
        fstring fname, alt_name;
        int fnum;
        smb_ucs2_t c2;


@@ -34,14 +31,14 @@ BOOL torture_utable(int dummy)
 
        printf("starting utable\n");
 
 
        printf("starting utable\n");
 

-       if (!torture_open_connection(&cli)) {
+       if (!torture_open_connection(&cli, 0)) {

                return False;
        }
 
        memset(valid, 0, sizeof(valid));
 
                return False;
        }
 
        memset(valid, 0, sizeof(valid));
 

-       cli_mkdir(&cli, "\\utable");
-       cli_unlink(&cli, "\\utable\\*");
+       cli_mkdir(cli, "\\utable");
+       cli_unlink(cli, "\\utable\\*");

 
        for (c=1; c < 0x10000; c++) {
                char *p;
 
        for (c=1; c < 0x10000; c++) {
                char *p;


@@ -49,19 +46,19 @@ BOOL torture_utable(int dummy)
                SSVAL(&c2, 0, c);
                fstrcpy(fname, "\\utable\\x");
                p = fname+strlen(fname);
                SSVAL(&c2, 0, c);
                fstrcpy(fname, "\\utable\\x");
                p = fname+strlen(fname);

-               len = convert_string(CH_UCS2, CH_UNIX, 
+               len = convert_string(CH_UTF16LE, CH_UNIX, 

                                     &c2, 2, 
                                     &c2, 2, 

-                                    p, sizeof(fname)-strlen(fname));
+                                    p, sizeof(fname)-strlen(fname), True);

                p[len] = 0;
                fstrcat(fname,"_a_long_extension");
 
                p[len] = 0;
                fstrcat(fname,"_a_long_extension");
 

-               fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+               fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 

                                DENY_NONE);
                if (fnum == -1) continue;
 
                chars_allowed++;
 
                                DENY_NONE);
                if (fnum == -1) continue;
 
                chars_allowed++;
 

-               cli_qpathinfo_alt_name(&cli, fname, alt_name);
+               cli_qpathinfo_alt_name(cli, fname, alt_name);

 
                if (strncmp(alt_name, "X_A_L", 5) != 0) {
                        alt_allowed++;
 
                if (strncmp(alt_name, "X_A_L", 5) != 0) {
                        alt_allowed++;


@@ -69,8 +66,8 @@ BOOL torture_utable(int dummy)
                        d_printf("fname=[%s] alt_name=[%s]\n", fname, alt_name);
                }
 
                        d_printf("fname=[%s] alt_name=[%s]\n", fname, alt_name);
                }
 

-               cli_close(&cli, fnum);
-               cli_unlink(&cli, fname);
+               cli_close(cli, fnum);
+               cli_unlink(cli, fname);

 
                if (c % 100 == 0) {
                        printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);
 
                if (c % 100 == 0) {
                        printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);


@@ -78,7 +75,7 @@ BOOL torture_utable(int dummy)
        }
        printf("%d (%d/%d)\n", c, chars_allowed, alt_allowed);
 
        }
        printf("%d (%d/%d)\n", c, chars_allowed, alt_allowed);
 

-       cli_rmdir(&cli, "\\utable");
+       cli_rmdir(cli, "\\utable");

 
        d_printf("%d chars allowed   %d alt chars allowed\n", chars_allowed, alt_allowed);
 
 
        d_printf("%d chars allowed   %d alt chars allowed\n", chars_allowed, alt_allowed);
 


@@ -87,7 +84,11 @@ BOOL torture_utable(int dummy)
                d_printf("Failed to create valid.dat - %s", strerror(errno));
                return False;
        }
                d_printf("Failed to create valid.dat - %s", strerror(errno));
                return False;
        }

-       write(fd, valid, 0x10000);
+       if (write(fd, valid, 0x10000) != 0x10000) {
+               d_printf("Failed to create valid.dat - %s", strerror(errno));
+               close(fd);
+               return false;
+       }

        close(fd);
        d_printf("wrote valid.dat\n");
 
        close(fd);
        d_printf("wrote valid.dat\n");
 


@@ -106,16 +107,16 @@ static char *form_name(int c)
        p = fname+strlen(fname);
        SSVAL(&c2, 0, c);
 
        p = fname+strlen(fname);
        SSVAL(&c2, 0, c);
 

-       len = convert_string(CH_UCS2, CH_UNIX, 
+       len = convert_string(CH_UTF16LE, CH_UNIX, 

                             &c2, 2, 
                             &c2, 2, 

-                            p, sizeof(fname)-strlen(fname));
+                            p, sizeof(fname)-strlen(fname), True);

        p[len] = 0;
        return fname;
 }
 
        p[len] = 0;
        return fname;
 }
 

-BOOL torture_casetable(int dummy)
+bool torture_casetable(int dummy)

 {
 {

-       static struct cli_state cli;
+       static struct cli_state *cli;

        char *fname;
        int fnum;
        int c, i;
        char *fname;
        int fnum;
        int c, i;


@@ -123,34 +124,41 @@ BOOL torture_casetable(int dummy)
        smb_ucs2_t equiv[0x10000][MAX_EQUIVALENCE];
        printf("starting casetable\n");
 
        smb_ucs2_t equiv[0x10000][MAX_EQUIVALENCE];
        printf("starting casetable\n");
 

-       if (!torture_open_connection(&cli)) {
+       if (!torture_open_connection(&cli, 0)) {

                return False;
        }
 
        memset(equiv, 0, sizeof(equiv));
 
                return False;
        }
 
        memset(equiv, 0, sizeof(equiv));
 

-       cli_mkdir(&cli, "\\utable");
-       cli_unlink(&cli, "\\utable\\*");
+       cli_unlink(cli, "\\utable\\*");
+       cli_rmdir(cli, "\\utable");
+       if (!cli_mkdir(cli, "\\utable")) {
+               printf("Failed to create utable directory!\n");
+               return False;
+       }

 
        for (c=1; c < 0x10000; c++) {
 
        for (c=1; c < 0x10000; c++) {

-               size_t size;
+               SMB_OFF_T size;

 
                if (c == '.' || c == '\\') continue;
 
 
                if (c == '.' || c == '\\') continue;
 

-               printf("%04x\n", c);
+               printf("%04x (%c)\n", c, isprint(c)?c:'.');

 
                fname = form_name(c);
 
                fname = form_name(c);

-               fnum = cli_nt_create_full(&cli, fname, 0,
+               fnum = cli_nt_create_full(cli, fname, 0,

                                          GENERIC_ALL_ACCESS, 
                                          FILE_ATTRIBUTE_NORMAL,
                                          FILE_SHARE_NONE,
                                          FILE_OPEN_IF, 0, 0);
 
                                          GENERIC_ALL_ACCESS, 
                                          FILE_ATTRIBUTE_NORMAL,
                                          FILE_SHARE_NONE,
                                          FILE_OPEN_IF, 0, 0);
 

-               if (fnum == -1) continue;
+               if (fnum == -1) {
+                       printf("Failed to create file with char %04x\n", c);
+                       continue;
+               }

 
                size = 0;
 
 
                size = 0;
 

-               if (!cli_qfileinfo(&cli, fnum, NULL, &size, 
+               if (!cli_qfileinfo(cli, fnum, NULL, &size, 

                                   NULL, NULL, NULL, NULL, NULL)) continue;
 
                if (size > 0) {
                                   NULL, NULL, NULL, NULL, NULL)) continue;
 
                if (size > 0) {


@@ -158,13 +166,13 @@ BOOL torture_casetable(int dummy)
                        int c2[MAX_EQUIVALENCE];
 
                        if (size/sizeof(int) >= MAX_EQUIVALENCE) {
                        int c2[MAX_EQUIVALENCE];
 
                        if (size/sizeof(int) >= MAX_EQUIVALENCE) {

-                               printf("too many chars match?? size=%d c=0x%04x\n",
-                                      size, c);
-                               cli_close(&cli, fnum);
+                               printf("too many chars match?? size=%ld c=0x%04x\n",
+                                      (unsigned long)size, c);
+                               cli_close(cli, fnum);

                                return False;
                        }
 
                                return False;
                        }
 

-                       cli_read(&cli, fnum, (char *)c2, 0, size);
+                       cli_read(cli, fnum, (char *)c2, 0, size);

                        printf("%04x: ", c);
                        equiv[c][0] = c;
                        for (i=0; i<size/sizeof(int); i++) {
                        printf("%04x: ", c);
                        equiv[c][0] = c;
                        for (i=0; i<size/sizeof(int); i++) {


@@ -175,12 +183,12 @@ BOOL torture_casetable(int dummy)
                        fflush(stdout);
                }
 
                        fflush(stdout);
                }
 

-               cli_write(&cli, fnum, 0, (char *)&c, size, sizeof(c));
-               cli_close(&cli, fnum);
+               cli_write(cli, fnum, 0, (char *)&c, size, sizeof(c));
+               cli_close(cli, fnum);

        }
 
        }
 

-       cli_unlink(&cli, "\\utable\\*");
-       cli_rmdir(&cli, "\\utable");
+       cli_unlink(cli, "\\utable\\*");
+       cli_rmdir(cli, "\\utable");

 
        return True;
 }
 
        return True;
 }