Correctly check for errors in strlower_m() returns.

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

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index c999e12a2179efc825753bf04a66f99315697746..a2db3ba0fea934a26a708d785554df2a3fdeed79 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -14,17 +14,21 @@
    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 "torture/proto.h"
+#include "../libcli/security/security.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
 
-BOOL torture_utable(int dummy)
+bool torture_utable(int dummy)
 {
        struct cli_state *cli;
        fstring fname, alt_name;
-       int fnum;
+       uint16_t fnum;
        smb_ucs2_t c2;
        int c, len, fd;
        int chars_allowed=0, alt_allowed=0;
@@ -39,23 +43,29 @@ BOOL torture_utable(int dummy)
        memset(valid, 0, sizeof(valid));
 
        cli_mkdir(cli, "\\utable");
-       cli_unlink(cli, "\\utable\\*");
+       cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        for (c=1; c < 0x10000; c++) {
+               size_t size = 0;
                char *p;
 
                SSVAL(&c2, 0, c);
                fstrcpy(fname, "\\utable\\x");
                p = fname+strlen(fname);
-               len = convert_string(CH_UTF16LE, CH_UNIX, 
+               if (!convert_string(CH_UTF16LE, CH_UNIX,
                                     &c2, 2, 
-                                    p, sizeof(fname)-strlen(fname), True);
+                                    p, sizeof(fname)-strlen(fname),&size)) {
+                       d_printf("convert_string %s failed !\n", fname);
+                       continue;
+               }
+               len = size;
                p[len] = 0;
                fstrcat(fname,"_a_long_extension");
 
-               fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
-                               DENY_NONE);
-               if (fnum == -1) continue;
+               if (!NT_STATUS_IS_OK(cli_openx(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+                               DENY_NONE, &fnum))) {
+                       continue;
+               }
 
                chars_allowed++;
 
@@ -68,7 +78,7 @@ BOOL torture_utable(int dummy)
                }
 
                cli_close(cli, fnum);
-               cli_unlink(cli, fname);
+               cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
                if (c % 100 == 0) {
                        printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);
@@ -85,7 +95,11 @@ BOOL torture_utable(int dummy)
                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");
 
@@ -98,24 +112,28 @@ static char *form_name(int c)
        static fstring fname;
        smb_ucs2_t c2;
        char *p;
-       int len;
+       size_t len = 0;
 
        fstrcpy(fname, "\\utable\\");
        p = fname+strlen(fname);
        SSVAL(&c2, 0, c);
 
-       len = convert_string(CH_UTF16LE, CH_UNIX, 
+       if (!convert_string(CH_UTF16LE, CH_UNIX,
                             &c2, 2, 
-                            p, sizeof(fname)-strlen(fname), True);
+                            p, sizeof(fname)-strlen(fname), &len)) {
+               d_printf("form_name: convert string %s failed\n",
+                       fname);
+               return NULL;
+       }
        p[len] = 0;
        return fname;
 }
 
-BOOL torture_casetable(int dummy)
+bool torture_casetable(int dummy)
 {
        static struct cli_state *cli;
        char *fname;
-       int fnum;
+       uint16_t fnum;
        int c, i;
 #define MAX_EQUIVALENCE 8
        smb_ucs2_t equiv[0x10000][MAX_EQUIVALENCE];
@@ -127,36 +145,37 @@ BOOL torture_casetable(int dummy)
 
        memset(equiv, 0, sizeof(equiv));
 
-       cli_unlink(cli, "\\utable\\*");
+       cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, "\\utable");
-       if (!cli_mkdir(cli, "\\utable")) {
+       if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\utable"))) {
                printf("Failed to create utable directory!\n");
                return False;
        }
 
        for (c=1; c < 0x10000; c++) {
-               SMB_OFF_T size;
+               off_t size;
 
                if (c == '.' || c == '\\') continue;
 
                printf("%04x (%c)\n", c, isprint(c)?c:'.');
 
                fname = form_name(c);
-               fnum = cli_nt_create_full(cli, fname, 0,
+               if (!NT_STATUS_IS_OK(cli_ntcreate(cli, fname, 0,
                                          GENERIC_ALL_ACCESS, 
                                          FILE_ATTRIBUTE_NORMAL,
                                          FILE_SHARE_NONE,
-                                         FILE_OPEN_IF, 0, 0);
-
-               if (fnum == -1) {
+                                         FILE_OPEN_IF, 0, 0, &fnum))) {
                        printf("Failed to create file with char %04x\n", c);
                        continue;
                }
 
                size = 0;
 
-               if (!cli_qfileinfo(cli, fnum, NULL, &size, 
-                                  NULL, NULL, NULL, NULL, NULL)) continue;
+               if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                            cli, fnum, NULL, &size,
+                                            NULL, NULL, NULL, NULL, NULL))) {
+                       continue;
+               }
 
                if (size > 0) {
                        /* found a character equivalence! */
@@ -169,7 +188,7 @@ BOOL torture_casetable(int dummy)
                                return False;
                        }
 
-                       cli_read(cli, fnum, (char *)c2, 0, size);
+                       cli_read(cli, fnum, (char *)c2, 0, size, NULL);
                        printf("%04x: ", c);
                        equiv[c][0] = c;
                        for (i=0; i<size/sizeof(int); i++) {
@@ -180,11 +199,12 @@ BOOL torture_casetable(int dummy)
                        fflush(stdout);
                }
 
-               cli_write(cli, fnum, 0, (char *)&c, size, sizeof(c));
+               cli_writeall(cli, fnum, 0, (uint8_t *)&c, size, sizeof(c),
+                            NULL);
                cli_close(cli, fnum);
        }
 
-       cli_unlink(cli, "\\utable\\*");
+       cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, "\\utable");
 
        return True;