mailbox.[ch]: v20 - grow size and time fields to 64-bits

Author: ksmurchison

cassandane/Cassandane/Cyrus/Reconstruct.pm

@@ -617,7 +617,7 @@ sub test_downgrade_upgrade
     $msg{A}->set_attribute(flags => ['\\Seen']);
     $self->check_messages(\%msg);
 
-    for my $version (12, 14, 16, 'max') {
+    for my $version (12, 14, 16, 19, 'max') {
         xlog $self, "Set to version $version";
         $self->{instance}->run_command({ cyrus => 1 }, 'reconstruct', '-V', $version);
 

cunit/mailbox.testc

@@ -123,15 +123,15 @@ static void test_aligned_record_offsets(void)
     CU_ASSERT_EQUAL(0, OFFSET_CACHE_OFFSET  % alignof(XXX_CACHE32_TYPE));
     CU_ASSERT_EQUAL(0, OFFSET_CACHE_VERSION % alignof(XXX_CACHE32_TYPE));
     CU_ASSERT_EQUAL(0, OFFSET_CREATEDMODSEQ % alignof(r.createdmodseq));
-    CU_ASSERT_EQUAL(0, OFFSET_GMTIME        % alignof(XXX_TIME32_TYPE));
+    CU_ASSERT_EQUAL(0, OFFSET_GMTIME        % alignof(r.gmtime));
     CU_ASSERT_EQUAL(0, OFFSET_HEADER_SIZE   % alignof(r.header_size));
-    CU_ASSERT_EQUAL(0, OFFSET_INTERNALDATE  % alignof(XXX_TIME32_TYPE));
-    CU_ASSERT_EQUAL(0, OFFSET_LAST_UPDATED  % alignof(XXX_TIME32_TYPE));
+    CU_ASSERT_EQUAL(0, OFFSET_INTERNALDATE  % alignof(r.internaldate));
+    CU_ASSERT_EQUAL(0, OFFSET_LAST_UPDATED  % alignof(r.last_updated));
     CU_ASSERT_EQUAL(0, OFFSET_MESSAGE_GUID  % alignof(char)); /* r/w uses memcpy */
     CU_ASSERT_EQUAL(0, OFFSET_MODSEQ        % alignof(r.modseq));
     CU_ASSERT_EQUAL(0, OFFSET_RECORD_CRC    % alignof(uint32_t)); /* not in struct */
-    CU_ASSERT_EQUAL(0, OFFSET_SAVEDATE      % alignof(XXX_TIME32_TYPE));
-    CU_ASSERT_EQUAL(0, OFFSET_SENTDATE      % alignof(XXX_TIME32_TYPE));
+    CU_ASSERT_EQUAL(0, OFFSET_SAVEDATE      % alignof(r.savedate));
+    CU_ASSERT_EQUAL(0, OFFSET_SENTDATE      % alignof(r.sentdate));
     CU_ASSERT_EQUAL(0, OFFSET_SIZE          % alignof(r.size));
     CU_ASSERT_EQUAL(0, OFFSET_SYSTEM_FLAGS  % alignof(r.system_flags));
     CU_ASSERT_EQUAL(0, OFFSET_THRID         % alignof(r.cid));
@@ -247,15 +247,15 @@ static void test_unique_record_offsets(void)
         OFFSET(OFFSET_CACHE_OFFSET,     sizeof(XXX_CACHE32_TYPE)),
         OFFSET(OFFSET_CACHE_VERSION,    sizeof(XXX_CACHE32_TYPE)),
         OFFSET(OFFSET_CREATEDMODSEQ,    sizeof(r.createdmodseq)),
-        OFFSET(OFFSET_GMTIME,           sizeof(XXX_TIME32_TYPE)),
+        OFFSET(OFFSET_GMTIME,           sizeof(r.gmtime)),
         OFFSET(OFFSET_HEADER_SIZE,      sizeof(r.header_size)),
-        OFFSET(OFFSET_INTERNALDATE,     sizeof(XXX_TIME32_TYPE)),
-        OFFSET(OFFSET_LAST_UPDATED,     sizeof(XXX_TIME32_TYPE)),
+        OFFSET(OFFSET_INTERNALDATE,     sizeof(r.internaldate)),
+        OFFSET(OFFSET_LAST_UPDATED,     sizeof(r.last_updated)),
         OFFSET(OFFSET_MESSAGE_GUID,     MESSAGE_GUID_SIZE),
         OFFSET(OFFSET_MODSEQ,           sizeof(r.modseq)),
         OFFSET(OFFSET_RECORD_CRC,       sizeof(uint32_t)), /* not in struct */
-        OFFSET(OFFSET_SAVEDATE,         sizeof(XXX_TIME32_TYPE)),
-        OFFSET(OFFSET_SENTDATE,         sizeof(XXX_TIME32_TYPE)),
+        OFFSET(OFFSET_SAVEDATE,         sizeof(r.savedate)),
+        OFFSET(OFFSET_SENTDATE,         sizeof(r.sentdate)),
         OFFSET(OFFSET_SIZE,             sizeof(r.size)),
         OFFSET(OFFSET_SYSTEM_FLAGS,     sizeof(r.system_flags)),
         OFFSET(OFFSET_THRID,            sizeof(r.cid)),

imap/backend.c

@@ -1336,8 +1336,12 @@ EXPORTED int backend_version(struct backend *be)
             return MAILBOX_MINOR_VERSION;
         }
         else if (major == 3) {
-            if (minor >= 10) {
-                /* all versions since 3.10 have been 19 so far */
+            if (minor >= 13) {
+                /* all versions since 3.13 have been 20 so far */
+                return 20;
+            }
+            else if (minor >= 10) {
+                /* version 3.10 - 3.12 were 19 */
                 return 19;
             }
             else if (minor >= 3) {

imap/http_dav.c

@@ -1946,7 +1946,7 @@ int propfind_getlength(const xmlChar *name, xmlNsPtr ns,
     buf_reset(&fctx->buf);
 
     if (fctx->record) {
-        buf_printf(&fctx->buf, "%u",
+        buf_printf(&fctx->buf, UINT64_FMT,
                    fctx->record->size - fctx->record->header_size);
     }
 
@@ -2974,7 +2974,7 @@ EXPORTED int propfind_quota(const xmlChar *name, xmlNsPtr ns,
     }
     else if (fctx->record) {
         /* Bytes used by resource */
-        buf_printf(&fctx->buf, "%u", fctx->record->size);
+        buf_printf(&fctx->buf, UINT64_FMT, fctx->record->size);
     }
     else if (fctx->mailbox) {
         /* Bytes used by calendar collection */

imap/index.c

@@ -4485,7 +4485,7 @@ static int index_fetchreply(struct index_state *state, uint32_t msgno,
         sepchar = ' ';
     }
     if (fetchitems & FETCH_SIZE) {
-        prot_printf(state->out, "%cRFC822.SIZE %u",
+        prot_printf(state->out, "%cRFC822.SIZE " UINT64_FMT,
                     sepchar, record.size);
         sepchar = ' ';
     }

imap/ipurge.c

@@ -387,7 +387,7 @@ static void print_record(struct mailbox *mailbox,
                          const struct index_record *record)
 {
     printf("UID: %u\n", record->uid);
-    printf("\tSize: %u\n", record->size);
+    printf("\tSize: " UINT64_FMT "\n", record->size);
     printf("\tSent: %s", ctime(&record->sentdate));
     printf("\tRecv: %s", ctime(&record->internaldate));