Changeset 745 for trunk/server/lib/replace/test

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/replace/test/os2_delete.c (modified) (2 diffs)
• lib/replace/test/snprintf.c (copied) (copied from vendor/current/lib/replace/test/snprintf.c )
• lib/replace/test/testsuite.c (modified) (4 diffs)

trunk/server/lib/replace/test/os2_delete.c

@@ -47 +47 @@
                 char fname[40];
                 int fd;
-                sprintf(fname, TESTDIR "/test%u.txt", i);
+                snprintf(fname, sizeof(fname), TESTDIR "/test%u.txt", i);
                 fd = open(fname, O_CREAT|O_RDWR, 0600);
                 if (fd < 0) {
@@ -80 +80 @@
         for (j=0; j<MIN(i, DELETE_SIZE); j++) {
                 char fname[40];
-                sprintf(fname, TESTDIR "/%s", names[j]);
+                snprintf(fname, sizeof(fname), TESTDIR "/%s", names[j]);
                 unlink(fname) == 0 || FAILED("unlink");
         }

trunk/server/lib/replace/test/testsuite.c

@@ -752 +752 @@
 bool
 socklen_t
-uint_t
 uint{8,16,32,64}_t
 int{8,16,32,64}_t
@@ -773 +772 @@
         printf("test: FUNCTION\n");
         if (strcmp(__FUNCTION__, "test_FUNCTION") != 0) {
-                printf("failure: FAILURE [\nFAILURE invalid\n]\n");
+                printf("failure: FUNCTION [\nFUNCTION invalid\n]\n");
                 return false;
         }
@@ -1015 +1014 @@
         return true;
 }
+
+static int test_memmem(void)
+{
+        char *s;
+
+        printf("test: memmem\n");
+
+        s = (char *)memmem("foo", 3, "fo", 2);
+        if (strcmp(s, "foo") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        s = (char *)memmem("foo", 3, "", 0);
+        /* it is allowable for this to return NULL (as happens on
+           FreeBSD) */
+        if (s && strcmp(s, "foo") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        s = (char *)memmem("foo", 4, "o", 1);
+        if (strcmp(s, "oo") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        s = (char *)memmem("foobarfodx", 11, "fod", 3);
+        if (strcmp(s, "fodx") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        printf("success: memmem\n");
+
+        return true;
+}
+
 
 struct torture_context;
@@ -1066 +1103 @@
         ret &= test_utime();
         ret &= test_utimes();
+        ret &= test_memmem();
 
         return ret;