Attachment #34404 for bug #55537




	prot_printf(conn->pout, "RETURN (");
	for (i = 0; i < ret_attrs->n_attrs; i++) {
	    if (i > 0) prot_putc(' ', conn->pout);
	    prot_printf(conn->pout, "{%lu+}\r\n%s", 
			strlen(ret_attrs->attrs[i].attrname), 
			ret_attrs->attrs[i].attrname);


    if (sort_order) {
	prot_printf(conn->pout, "SORT (");
	while (sort_order) {
	    prot_printf(conn->pout, "{%lu+}\r\n%s {%lu+}\r\n%s", 
			strlen(sort_order->attrname), sort_order->attrname,
			strlen(sort_order->comparator),sort_order->comparator);
	    if (sort_order->next) prot_putc(' ', conn->pout);

	prot_printf(conn->pout, "RETURN (");
	for (i = 0; i < ret_attrs->n_attrs; i++) {
	    if (i > 0) prot_putc(' ', conn->pout);
	    prot_printf(conn->pout, "{%lu+}\r\n%s", 
			strlen(ret_attrs->attrs[i].attrname), 
			ret_attrs->attrs[i].attrname);


    if (sort_order) {
	prot_printf(conn->pout, "SORT (");
	while (sort_order) {
	    prot_printf(conn->pout, "{%lu+}\r\n%s {%lu+}\r\n%s", 
			strlen(sort_order->attrname), sort_order->attrname,
			strlen(sort_order->comparator),sort_order->comparator);
	    if (sort_order->next) prot_putc(' ', conn->pout);




    memset(&tmp, 0, sizeof(struct buf));
    memset(&user, 0, sizeof(struct buf));

    prot_printf(pout, "ACL0 GETACL {%ld+}\r\n%s\r\n",
		strlen(mailbox), mailbox);

    while(1) {


		snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
		
		prot_printf(pout, "%s DELETEACL {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
			    tagbuf, strlen(mailbox), mailbox,
			    strlen(user.s), user.s);
		if(c == '\r') {


	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
	
	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
		    tag,
		    mailboxlen, mailbox,
		    strlen(acl), acl,

    if(!r) {
	if(topart) {
	    /* need to send partition as an atom */
	    prot_printf(be->out, "LC1 LOCALCREATE {%ld+}\r\n%s %s\r\n",
			strlen(name), name, topart);
	} else {
	    prot_printf(be->out, "LC1 LOCALCREATE {%ld+}\r\n%s\r\n",
			strlen(name), name);
	}
	r = getresult(be->in, "LC1");

    if(!r) {
	backout_mupdate = 1;

	prot_printf(be->out, "D01 UNDUMP {%ld+}\r\n%s ", strlen(name), name);

	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
			 imapd_authstate);


	/* 6.5) Kick remote server to correct mupdate entry */
	/* Note that we don't really care if this succeeds or not */
	prot_printf(be->out, "MP1 MUPDATEPUSH {%ld+}\r\n%s\r\n",
		    strlen(name), name);
	rerr = getresult(be->in, "MP1");
	if(rerr) {

    }
    if(r && backout_remotebox) {
	rerr = 0;
	prot_printf(be->out, "LD1 LOCALDELETE {%ld+}\r\n%s\r\n",
		    strlen(name), name);
	rerr = getresult(be->in, "LD1");
 	if(rerr) {

		if(!r) {
		    /* note use of + to force the setting of a nonexistant
		     * quotaroot */
		    prot_printf(be->out, "Q01 SETQUOTA {%ld+}\r\n" \
				         "+%s (STORAGE %d)\r\n",
				strlen(name)+1, name, quota.limit);
		    r = getresult(be->in, "Q01");


    /* if it's too long, literal it */
    if (*p || len >= 1024) {
	prot_printf(imapd_out, "{%lu}\r\n%s", strlen(s), s);
    } else {
	prot_printf(imapd_out, "\"%s\"", s);
    }


    /* if it's too long, literal it */
    if (*p || len >= 1024) {
	prot_printf(imapd_out, "{%lu}\r\n%s", strlen(s), s);
    } else {
	prot_printf(imapd_out, "\"%s\"", s);
    }





	/* send filename, size, and contents */
	if(first) {
	    prot_printf(pout, "{%ld}\r\n",
			strlen(name));

	    if(!tag) {


	    first = 0;
	} else {
	    prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
			strlen(name),
			(!tag ? "+" : ""),
			name, len,


	/* send filename, size, and contents */
	if(first) {
	    prot_printf(pout, "{%ld}\r\n",
			strlen(data_files[i]));
	    
	    if(!tag) {

			(!tag ? "+" : ""));
	    first = 0;
	} else {
	    prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
			strlen(data_files[i]),
			(!tag ? "+" : ""),
			data_files[i], len,

				snprintf(ext_fname, sizeof(ext_fname),
					 "SIEVE-%s", next->d_name);
			    }
			    prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
					strlen(ext_fname), 
					(!tag ? "+" : ""),
					ext_fname,

Lines 2075-2081 Link Here

(-)cyrus-imapd-2.1.15/imap/message.c (-1 / +1 lines)
2075	if (*p \|\| len >= 1024) {	2075	if (*p \|\| len >= 1024) {
2076	/* Write out as literal */	2076	/* Write out as literal */
2077	char buf[100];	2077	char buf[100];
2078	snprintf(buf, sizeof(buf), "{%u}\r\n", strlen(s));	2078	snprintf(buf, sizeof(buf), "{%lu}\r\n", strlen(s));
2079	message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));	2079	message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
2080	for (p = buf; p; p++) (ibuf->end)++ = *p;	2080	for (p = buf; p; p++) (ibuf->end)++ = *p;
2081	for (p = s; p; p++) (ibuf->end)++ = *p;	2081	for (p = s; p; p++) (ibuf->end)++ = *p;




	if(r != SASL_OK) return 1;
	
	/* it's always ok to send the mechname quoted */
	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\" {%ld+}\r\n%s\r\n",
		    mechusing, strlen(buf), buf);
    } else {
        prot_printf(h->pout, "A01 AUTHENTICATE \"%s\"\r\n", mechusing);

    if (!handle->saslcompleted) return MUPDATE_NOAUTH;

    prot_printf(handle->pout,
		"X%u ACTIVATE {%ld+}\r\n%s {%ld+}\r\n%s {%ld+}\r\n%s\r\n", 
		handle->tagn++, strlen(mailbox), mailbox, 
		strlen(server), server, strlen(acl), acl);


    if (!handle->saslcompleted) return MUPDATE_NOAUTH;

    prot_printf(handle->pout,
		"X%u RESERVE {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
		handle->tagn++, strlen(mailbox), mailbox, 
		strlen(server), server);


    if (!handle->saslcompleted) return MUPDATE_NOAUTH;

    prot_printf(handle->pout,
		"X%u DEACTIVATE {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
		handle->tagn++, strlen(mailbox), mailbox, 
		strlen(server), server);


    if (!handle->saslcompleted) return MUPDATE_NOAUTH;

    prot_printf(handle->pout,
		"X%u DELETE {%ld+}\r\n%s\r\n", handle->tagn++, 
		strlen(mailbox), mailbox);

    ret = mupdate_scarf(handle, mupdate_scarf_one, &called, 1, &response);

    if(!handle || !mailbox || !target) return MUPDATE_BADPARAM;

    prot_printf(handle->pout,
		"X%u FIND {%ld+}\r\n%s\r\n", handle->tagn++, 
		strlen(mailbox), mailbox);

    memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));


    if(prefix) {
	prot_printf(handle->pout,
		    "X%u LIST {%ld+}\r\n%s\r\n", handle->tagn++,
		    strlen(prefix), prefix);
    } else {
	prot_printf(handle->pout,




    for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
      SquatWordTableEntry* e = &(t->entries[i]);
      
      if (e->leaf_presence != NULL && ((long)e->leaf_presence & 1) == 0) {
        free(e->leaf_presence);
      }
    }


  if (word_entry == NULL) {
    /* We are in "per document" mode. */
    if (((long)e->leaf_presence & 1) != 0) {
      /* We currently have a singleton here. */
      int oldch = e->leaf_presence_singleton >> 1;



      word[0] = (char)i;

      if (((long)e->leaf_presence & 1) != 0) {
	/* Got a singleton at this branch point. Just output the single word. */
        word[1] = (char)(e->leaf_presence_singleton >> 1);
        e->leaf_presence = NULL; /* clear the leaf out */




	return (ret);

    if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
	printf("read from %08lX [%08lX] (%d bytes => %ld (0x%X))",
	       (unsigned long) bio, (unsigned long) argp,
	       argi, ret, (unsigned int) ret);
	tls_dump(argp, (int) ret);
	return (ret);
    } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
	printf("write to %08lX [%08lX] (%d bytes => %ld (0x%X))",
	       (unsigned long) bio, (unsigned long)argp,
	       argi, ret, (unsigned int) ret);
	tls_dump(argp, (int) ret);
    }




    ptr = db->map_base + DUMMY_OFFSET(db);
    end = db->map_base + db->map_size;
    while (ptr < end) {
	printf("%04lX: ", ptr - db->map_base);
	switch (TYPE(ptr)) {
	case DUMMY:
	    printf("DUMMY ");


	    if (offset > db->map_size) {
		fprintf(stdout, 
			"skiplist inconsistent: %04lX: ptr %d is %04X; "
			"eof is %04lX\n", 
			ptr - db->map_base,
			i, offset, (unsigned long) db->map_size);
		return CYRUSDB_INTERNAL;
	    }


		cmp = compare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q));
		if (cmp >= 0) {
		    fprintf(stdout, 
			    "skiplist inconsistent: %04lX: ptr %d is %04X; "
			    "compare() = %d\n", 
			    ptr - db->map_base,
			    i,

Lines 964-970 Link Here

(-)cyrus-imapd-2.1.15/master/master.c (-2 / +2 lines)
964		964
965	void add_service(const char name, struct entry e, void *rock)	965	void add_service(const char name, struct entry e, void *rock)
966	{	966	{
967	int ignore_err = (int) rock;	967	long ignore_err = (long)rock;
968	char *cmd = mystrdup(masterconf_getstring(e, "cmd", NULL));	968	char *cmd = mystrdup(masterconf_getstring(e, "cmd", NULL));
969	int prefork = masterconf_getint(e, "prefork", 0);	969	int prefork = masterconf_getint(e, "prefork", 0);
970	int babysit = masterconf_getswitch(e, "babysit", 0);	970	int babysit = masterconf_getswitch(e, "babysit", 0);
Lines 1143-1149 Link Here
1143		1143
1144	void add_event(const char name, struct entry e, void *rock)	1144	void add_event(const char name, struct entry e, void *rock)
1145	{	1145	{
1146	int ignore_err = (int) rock;	1146	long ignore_err = (long) rock;
1147	char *cmd = mystrdup(masterconf_getstring(e, "cmd", NULL));	1147	char *cmd = mystrdup(masterconf_getstring(e, "cmd", NULL));
1148	int period = 60 * masterconf_getint(e, "period", 0);	1148	int period = 60 * masterconf_getint(e, "period", 0);
1149	int at = masterconf_getint(e, "at", -1), hour, min;	1149	int at = masterconf_getint(e, "at", -1), hour, min;

Lines 336-342 Link Here

(-)cyrus-imapd-2.1.15/timsieved/actions.c (-1 / +1 lines)
336		336
337	if (result != TIMSIEVE_OK) {	337	if (result != TIMSIEVE_OK) {
338	if (errstr && *errstr) {	338	if (errstr && *errstr) {
339	prot_printf(conn, "NO {%d}\r\n%s\r\n", strlen(errstr), errstr);	339	prot_printf(conn, "NO {%ld}\r\n%s\r\n", strlen(errstr), errstr);
340	free(errstr);	340	free(errstr);
341	} else {	341	} else {
342	if (errstr) free(errstr);	342	if (errstr) free(errstr);

Return to bug 55537

Lines 5847-5853 Link Here

(-)cyrus-imapd-2.1.15/imap/imapd.c (-11 / +11 lines)
5847	memset(&tmp, 0, sizeof(struct buf));	5847	memset(&tmp, 0, sizeof(struct buf));
5848	memset(&user, 0, sizeof(struct buf));	5848	memset(&user, 0, sizeof(struct buf));
5849		5849
5850	prot_printf(pout, "ACL0 GETACL {%d+}\r\n%s\r\n",	5850	prot_printf(pout, "ACL0 GETACL {%ld+}\r\n%s\r\n",
5851	strlen(mailbox), mailbox);	5851	strlen(mailbox), mailbox);
5852		5852
5853	while(1) {	5853	while(1) {
Lines 5898-5904 Link Here
5898		5898
5899	snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);	5899	snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
5900		5900
5901	prot_printf(pout, "%s DELETEACL {%d+}\r\n%s {%d+}\r\n%s\r\n",	5901	prot_printf(pout, "%s DELETEACL {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
5902	tagbuf, strlen(mailbox), mailbox,	5902	tagbuf, strlen(mailbox), mailbox,
5903	strlen(user.s), user.s);	5903	strlen(user.s), user.s);
5904	if(c == '\r') {	5904	if(c == '\r') {
Lines 5975-5981 Link Here
5975		5975
5976	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);	5976	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
5977		5977
5978	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",	5978	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
5979	tag,	5979	tag,
5980	mailboxlen, mailbox,	5980	mailboxlen, mailbox,
5981	strlen(acl), acl,	5981	strlen(acl), acl,
Lines 6093-6102 Link Here
6093	if(!r) {	6093	if(!r) {
6094	if(topart) {	6094	if(topart) {
6095	/* need to send partition as an atom */	6095	/* need to send partition as an atom */
6096	prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s %s\r\n",	6096	prot_printf(be->out, "LC1 LOCALCREATE {%ld+}\r\n%s %s\r\n",
6097	strlen(name), name, topart);	6097	strlen(name), name, topart);
6098	} else {	6098	} else {
6099	prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s\r\n",	6099	prot_printf(be->out, "LC1 LOCALCREATE {%ld+}\r\n%s\r\n",
6100	strlen(name), name);	6100	strlen(name), name);
6101	}	6101	}
6102	r = getresult(be->in, "LC1");	6102	r = getresult(be->in, "LC1");
Lines 6131-6137 Link Here
6131	if(!r) {	6131	if(!r) {
6132	backout_mupdate = 1;	6132	backout_mupdate = 1;
6133		6133
6134	prot_printf(be->out, "D01 UNDUMP {%d+}\r\n%s ", strlen(name), name);	6134	prot_printf(be->out, "D01 UNDUMP {%ld+}\r\n%s ", strlen(name), name);
6135		6135
6136	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,	6136	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
6137	imapd_authstate);	6137	imapd_authstate);
Lines 6176-6182 Link Here
6176		6176
6177	/* 6.5) Kick remote server to correct mupdate entry */	6177	/* 6.5) Kick remote server to correct mupdate entry */
6178	/* Note that we don't really care if this succeeds or not */	6178	/* Note that we don't really care if this succeeds or not */
6179	prot_printf(be->out, "MP1 MUPDATEPUSH {%d+}\r\n%s\r\n",	6179	prot_printf(be->out, "MP1 MUPDATEPUSH {%ld+}\r\n%s\r\n",
6180	strlen(name), name);	6180	strlen(name), name);
6181	rerr = getresult(be->in, "MP1");	6181	rerr = getresult(be->in, "MP1");
6182	if(rerr) {	6182	if(rerr) {
Lines 6215-6221 Link Here
6215	}	6215	}
6216	if(r && backout_remotebox) {	6216	if(r && backout_remotebox) {
6217	rerr = 0;	6217	rerr = 0;
6218	prot_printf(be->out, "LD1 LOCALDELETE {%d+}\r\n%s\r\n",	6218	prot_printf(be->out, "LD1 LOCALDELETE {%ld+}\r\n%s\r\n",
6219	strlen(name), name);	6219	strlen(name), name);
6220	rerr = getresult(be->in, "LD1");	6220	rerr = getresult(be->in, "LD1");
6221	if(rerr) {	6221	if(rerr) {
Lines 6426-6432 Link Here
6426	if(!r) {	6426	if(!r) {
6427	/* note use of + to force the setting of a nonexistant	6427	/* note use of + to force the setting of a nonexistant
6428	* quotaroot */	6428	* quotaroot */
6429	prot_printf(be->out, "Q01 SETQUOTA {%d+}\r\n" \	6429	prot_printf(be->out, "Q01 SETQUOTA {%ld+}\r\n" \
6430	"+%s (STORAGE %d)\r\n",	6430	"+%s (STORAGE %d)\r\n",
6431	strlen(name)+1, name, quota.limit);	6431	strlen(name)+1, name, quota.limit);
6432	r = getresult(be->in, "Q01");	6432	r = getresult(be->in, "Q01");
Lines 6972-6978 Link Here
6972		6972
6973	/* if it's too long, literal it */	6973	/* if it's too long, literal it */
6974	if (*p \|\| len >= 1024) {	6974	if (*p \|\| len >= 1024) {
6975	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);	6975	prot_printf(imapd_out, "{%lu}\r\n%s", strlen(s), s);
6976	} else {	6976	} else {
6977	prot_printf(imapd_out, "\"%s\"", s);	6977	prot_printf(imapd_out, "\"%s\"", s);
6978	}	6978	}
Lines 7002-7008 Link Here
7002		7002
7003	/* if it's too long, literal it */	7003	/* if it's too long, literal it */
7004	if (*p \|\| len >= 1024) {	7004	if (*p \|\| len >= 1024) {
7005	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);	7005	prot_printf(imapd_out, "{%lu}\r\n%s", strlen(s), s);
7006	} else {	7006	} else {
7007	prot_printf(imapd_out, "\"%s\"", s);	7007	prot_printf(imapd_out, "\"%s\"", s);
7008	}	7008	}

Lines 239-245 Link Here

(-)cyrus-imapd-2.1.15/imap/mbdump.c (-5 / +5 lines)
239		239
240	/* send filename, size, and contents */	240	/* send filename, size, and contents */
241	if(first) {	241	if(first) {
242	prot_printf(pout, "{%d}\r\n",	242	prot_printf(pout, "{%ld}\r\n",
243	strlen(name));	243	strlen(name));
244		244
245	if(!tag) {	245	if(!tag) {
Lines 260-266 Link Here
260		260
261	first = 0;	261	first = 0;
262	} else {	262	} else {
263	prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",	263	prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
264	strlen(name),	264	strlen(name),
265	(!tag ? "+" : ""),	265	(!tag ? "+" : ""),
266	name, len,	266	name, len,
Lines 295-301 Link Here
295		295
296	/* send filename, size, and contents */	296	/* send filename, size, and contents */
297	if(first) {	297	if(first) {
298	prot_printf(pout, "{%d}\r\n",	298	prot_printf(pout, "{%ld}\r\n",
299	strlen(data_files[i]));	299	strlen(data_files[i]));
300		300
301	if(!tag) {	301	if(!tag) {
Lines 315-321 Link Here
315	(!tag ? "+" : ""));	315	(!tag ? "+" : ""));
316	first = 0;	316	first = 0;
317	} else {	317	} else {
318	prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",	318	prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
319	strlen(data_files[i]),	319	strlen(data_files[i]),
320	(!tag ? "+" : ""),	320	(!tag ? "+" : ""),
321	data_files[i], len,	321	data_files[i], len,
Lines 425-431 Link Here
425	snprintf(ext_fname, sizeof(ext_fname),	425	snprintf(ext_fname, sizeof(ext_fname),
426	"SIEVE-%s", next->d_name);	426	"SIEVE-%s", next->d_name);
427	}	427	}
428	prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",	428	prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
429	strlen(ext_fname),	429	strlen(ext_fname),
430	(!tag ? "+" : ""),	430	(!tag ? "+" : ""),
431	ext_fname,	431	ext_fname,

Lines 156-162 Link Here

(-)cyrus-imapd-2.1.15/imap/mupdate-client.c (-7 / +7 lines)
156	if(r != SASL_OK) return 1;	156	if(r != SASL_OK) return 1;
157		157
158	/* it's always ok to send the mechname quoted */	158	/* it's always ok to send the mechname quoted */
159	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\" {%d+}\r\n%s\r\n",	159	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\" {%ld+}\r\n%s\r\n",
160	mechusing, strlen(buf), buf);	160	mechusing, strlen(buf), buf);
161	} else {	161	} else {
162	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\"\r\n", mechusing);	162	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\"\r\n", mechusing);
Lines 428-434 Link Here
428	if (!handle->saslcompleted) return MUPDATE_NOAUTH;	428	if (!handle->saslcompleted) return MUPDATE_NOAUTH;
429		429
430	prot_printf(handle->pout,	430	prot_printf(handle->pout,
431	"X%u ACTIVATE {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",	431	"X%u ACTIVATE {%ld+}\r\n%s {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
432	handle->tagn++, strlen(mailbox), mailbox,	432	handle->tagn++, strlen(mailbox), mailbox,
433	strlen(server), server, strlen(acl), acl);	433	strlen(server), server, strlen(acl), acl);
434		434
Lines 454-460 Link Here
454	if (!handle->saslcompleted) return MUPDATE_NOAUTH;	454	if (!handle->saslcompleted) return MUPDATE_NOAUTH;
455		455
456	prot_printf(handle->pout,	456	prot_printf(handle->pout,
457	"X%u RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",	457	"X%u RESERVE {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
458	handle->tagn++, strlen(mailbox), mailbox,	458	handle->tagn++, strlen(mailbox), mailbox,
459	strlen(server), server);	459	strlen(server), server);
460		460
Lines 480-486 Link Here
480	if (!handle->saslcompleted) return MUPDATE_NOAUTH;	480	if (!handle->saslcompleted) return MUPDATE_NOAUTH;
481		481
482	prot_printf(handle->pout,	482	prot_printf(handle->pout,
483	"X%u DEACTIVATE {%d+}\r\n%s {%d+}\r\n%s\r\n",	483	"X%u DEACTIVATE {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
484	handle->tagn++, strlen(mailbox), mailbox,	484	handle->tagn++, strlen(mailbox), mailbox,
485	strlen(server), server);	485	strlen(server), server);
486		486
Lines 506-512 Link Here
506	if (!handle->saslcompleted) return MUPDATE_NOAUTH;	506	if (!handle->saslcompleted) return MUPDATE_NOAUTH;
507		507
508	prot_printf(handle->pout,	508	prot_printf(handle->pout,
509	"X%u DELETE {%d+}\r\n%s\r\n", handle->tagn++,	509	"X%u DELETE {%ld+}\r\n%s\r\n", handle->tagn++,
510	strlen(mailbox), mailbox);	510	strlen(mailbox), mailbox);
511		511
512	ret = mupdate_scarf(handle, mupdate_scarf_one, &called, 1, &response);	512	ret = mupdate_scarf(handle, mupdate_scarf_one, &called, 1, &response);
Lines 575-581 Link Here
575	if(!handle \|\| !mailbox \|\| !target) return MUPDATE_BADPARAM;	575	if(!handle \|\| !mailbox \|\| !target) return MUPDATE_BADPARAM;
576		576
577	prot_printf(handle->pout,	577	prot_printf(handle->pout,
578	"X%u FIND {%d+}\r\n%s\r\n", handle->tagn++,	578	"X%u FIND {%ld+}\r\n%s\r\n", handle->tagn++,
579	strlen(mailbox), mailbox);	579	strlen(mailbox), mailbox);
580		580
581	memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));	581	memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));
Lines 608-614 Link Here
608		608
609	if(prefix) {	609	if(prefix) {
610	prot_printf(handle->pout,	610	prot_printf(handle->pout,
611	"X%u LIST {%d+}\r\n%s\r\n", handle->tagn++,	611	"X%u LIST {%ld+}\r\n%s\r\n", handle->tagn++,
612	strlen(prefix), prefix);	612	strlen(prefix), prefix);
613	} else {	613	} else {
614	prot_printf(handle->pout,	614	prot_printf(handle->pout,

Lines 479-485 Link Here

(-)cyrus-imapd-2.1.15/imap/squat_build.c (-3 / +3 lines)
479	for (i = 0; i < VECTOR_SIZE(t->entries); i++) {	479	for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
480	SquatWordTableEntry* e = &(t->entries[i]);	480	SquatWordTableEntry* e = &(t->entries[i]);
481		481
482	if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) {	482	if (e->leaf_presence != NULL && ((long)e->leaf_presence & 1) == 0) {
483	free(e->leaf_presence);	483	free(e->leaf_presence);
484	}	484	}
485	}	485	}
Lines 568-574 Link Here
568		568
569	if (word_entry == NULL) {	569	if (word_entry == NULL) {
570	/* We are in "per document" mode. */	570	/* We are in "per document" mode. */
571	if (((int)e->leaf_presence & 1) != 0) {	571	if (((long)e->leaf_presence & 1) != 0) {
572	/* We currently have a singleton here. */	572	/* We currently have a singleton here. */
573	int oldch = e->leaf_presence_singleton >> 1;	573	int oldch = e->leaf_presence_singleton >> 1;
574		574
Lines 787-793 Link Here
787		787
788	word[0] = (char)i;	788	word[0] = (char)i;
789		789
790	if (((int)e->leaf_presence & 1) != 0) {	790	if (((long)e->leaf_presence & 1) != 0) {
791	/* Got a singleton at this branch point. Just output the single word. */	791	/* Got a singleton at this branch point. Just output the single word. */
792	word[1] = (char)(e->leaf_presence_singleton >> 1);	792	word[1] = (char)(e->leaf_presence_singleton >> 1);
793	e->leaf_presence = NULL; /* clear the leaf out */	793	e->leaf_presence = NULL; /* clear the leaf out */

Lines 1998-2004 Link Here

(-)cyrus-imapd-2.1.15/acap/acap.c (-4 / +4 lines)
1998	prot_printf(conn->pout, "RETURN (");	1998	prot_printf(conn->pout, "RETURN (");
1999	for (i = 0; i < ret_attrs->n_attrs; i++) {	1999	for (i = 0; i < ret_attrs->n_attrs; i++) {
2000	if (i > 0) prot_putc(' ', conn->pout);	2000	if (i > 0) prot_putc(' ', conn->pout);
2001	prot_printf(conn->pout, "{%d+}\r\n%s",	2001	prot_printf(conn->pout, "{%lu+}\r\n%s",
2002	strlen(ret_attrs->attrs[i].attrname),	2002	strlen(ret_attrs->attrs[i].attrname),
2003	ret_attrs->attrs[i].attrname);	2003	ret_attrs->attrs[i].attrname);
2004		2004
Lines 2034-2040 Link Here
2034	if (sort_order) {	2034	if (sort_order) {
2035	prot_printf(conn->pout, "SORT (");	2035	prot_printf(conn->pout, "SORT (");
2036	while (sort_order) {	2036	while (sort_order) {
2037	prot_printf(conn->pout, "{%d+}\r\n%s {%d+}\r\n%s",	2037	prot_printf(conn->pout, "{%lu+}\r\n%s {%lu+}\r\n%s",
2038	strlen(sort_order->attrname), sort_order->attrname,	2038	strlen(sort_order->attrname), sort_order->attrname,
2039	strlen(sort_order->comparator),sort_order->comparator);	2039	strlen(sort_order->comparator),sort_order->comparator);
2040	if (sort_order->next) prot_putc(' ', conn->pout);	2040	if (sort_order->next) prot_putc(' ', conn->pout);
Lines 2119-2125 Link Here
2119	prot_printf(conn->pout, "RETURN (");	2119	prot_printf(conn->pout, "RETURN (");
2120	for (i = 0; i < ret_attrs->n_attrs; i++) {	2120	for (i = 0; i < ret_attrs->n_attrs; i++) {
2121	if (i > 0) prot_putc(' ', conn->pout);	2121	if (i > 0) prot_putc(' ', conn->pout);
2122	prot_printf(conn->pout, "{%d+}\r\n%s",	2122	prot_printf(conn->pout, "{%lu+}\r\n%s",
2123	strlen(ret_attrs->attrs[i].attrname),	2123	strlen(ret_attrs->attrs[i].attrname),
2124	ret_attrs->attrs[i].attrname);	2124	ret_attrs->attrs[i].attrname);
2125		2125
Lines 2139-2145 Link Here
2139	if (sort_order) {	2139	if (sort_order) {
2140	prot_printf(conn->pout, "SORT (");	2140	prot_printf(conn->pout, "SORT (");
2141	while (sort_order) {	2141	while (sort_order) {
2142	prot_printf(conn->pout, "{%d+}\r\n%s {%d+}\r\n%s",	2142	prot_printf(conn->pout, "{%lu+}\r\n%s {%lu+}\r\n%s",
2143	strlen(sort_order->attrname), sort_order->attrname,	2143	strlen(sort_order->attrname), sort_order->attrname,
2144	strlen(sort_order->comparator),sort_order->comparator);	2144	strlen(sort_order->comparator),sort_order->comparator);
2145	if (sort_order->next) prot_putc(' ', conn->pout);	2145	if (sort_order->next) prot_putc(' ', conn->pout);

Lines 739-752 Link Here

(-)cyrus-imapd-2.1.15/imap/tls.c (-4 / +4 lines)
739	return (ret);	739	return (ret);
740		740
741	if (cmd == (BIO_CB_READ \| BIO_CB_RETURN)) {	741	if (cmd == (BIO_CB_READ \| BIO_CB_RETURN)) {
742	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))",	742	printf("read from %08lX [%08lX] (%d bytes => %ld (0x%X))",
743	(unsigned int) bio, (long unsigned int) argp,	743	(unsigned long) bio, (unsigned long) argp,
744	argi, ret, (unsigned int) ret);	744	argi, ret, (unsigned int) ret);
745	tls_dump(argp, (int) ret);	745	tls_dump(argp, (int) ret);
746	return (ret);	746	return (ret);
747	} else if (cmd == (BIO_CB_WRITE \| BIO_CB_RETURN)) {	747	} else if (cmd == (BIO_CB_WRITE \| BIO_CB_RETURN)) {
748	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))",	748	printf("write to %08lX [%08lX] (%d bytes => %ld (0x%X))",
749	(unsigned int) bio, (long unsigned int)argp,	749	(unsigned long) bio, (unsigned long)argp,
750	argi, ret, (unsigned int) ret);	750	argi, ret, (unsigned int) ret);
751	tls_dump(argp, (int) ret);	751	tls_dump(argp, (int) ret);
752	}	752	}

Lines 1674-1680 Link Here

(-)cyrus-imapd-2.1.15/lib/cyrusdb_skiplist.c (-5 / +5 lines)
1674	ptr = db->map_base + DUMMY_OFFSET(db);	1674	ptr = db->map_base + DUMMY_OFFSET(db);
1675	end = db->map_base + db->map_size;	1675	end = db->map_base + db->map_size;
1676	while (ptr < end) {	1676	while (ptr < end) {
1677	printf("%04X: ", ptr - db->map_base);	1677	printf("%04lX: ", ptr - db->map_base);
1678	switch (TYPE(ptr)) {	1678	switch (TYPE(ptr)) {
1679	case DUMMY:	1679	case DUMMY:
1680	printf("DUMMY ");	1680	printf("DUMMY ");
Lines 1747-1756 Link Here
1747		1747
1748	if (offset > db->map_size) {	1748	if (offset > db->map_size) {
1749	fprintf(stdout,	1749	fprintf(stdout,
1750	"skiplist inconsistent: %04X: ptr %d is %04X; "	1750	"skiplist inconsistent: %04lX: ptr %d is %04X; "
1751	"eof is %04X\n",	1751	"eof is %04lX\n",
1752	ptr - db->map_base,	1752	ptr - db->map_base,
1753	i, offset, (unsigned int) db->map_size);	1753	i, offset, (unsigned long) db->map_size);
1754	return CYRUSDB_INTERNAL;	1754	return CYRUSDB_INTERNAL;
1755	}	1755	}
1756		1756
Lines 1762-1768 Link Here
1762	cmp = compare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q));	1762	cmp = compare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q));
1763	if (cmp >= 0) {	1763	if (cmp >= 0) {
1764	fprintf(stdout,	1764	fprintf(stdout,
1765	"skiplist inconsistent: %04X: ptr %d is %04X; "	1765	"skiplist inconsistent: %04lX: ptr %d is %04X; "
1766	"compare() = %d\n",	1766	"compare() = %d\n",
1767	ptr - db->map_base,	1767	ptr - db->map_base,
1768	i,	1768	i,