int was_seen = 0;
long lo = (-1L);
long hi = (-1L);
- long t = (-1L);
- int trimming = 0;
struct visit vbuf;
long *msglist;
int num_msgs = 0;
char *is_set; /* actually an array of booleans */
int num_sets;
int s;
+ int w = 0;
char setstr[SIZ], lostr[SIZ], histr[SIZ];
- size_t tmp;
/* Don't bother doing *anything* if we were passed a list of zero messages */
if (num_target_msgnums < 1) {
which_user = &CC->user;
}
- CtdlLogPrintf(CTDL_DEBUG, "\e[31mCtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\e[0m\n",
+ CtdlLogPrintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n",
num_target_msgnums, target_msgnums[0],
(target_setting ? "SET" : "CLEAR"),
which_set,
CtdlGetRelationship(&vbuf, which_user, which_room);
/* Load the message list */
- cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &which_room->QRnumber, sizeof(long));
if (cdbfr != NULL) {
msglist = (long *) cdbfr->ptr;
cdbfr->ptr = NULL; /* CtdlSetSeen() now owns this memory */
break;
}
- CtdlLogPrintf(CTDL_DEBUG, "\e[31mbefore optimize: %s\e[0m\n", vset);
+
+#if 0 /* This is a special diagnostic section. Do not allow it to run during normal operation. */
+ CtdlLogPrintf(CTDL_DEBUG, "There are %d messages in the room.\n", num_msgs);
+ for (i=0; i<num_msgs; ++i) {
+ if ((i > 0) && (msglist[i] <= msglist[i-1])) abort();
+ }
+ CtdlLogPrintf(CTDL_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums);
+ for (k=0; k<num_target_msgnums; ++k) {
+ if ((k > 0) && (target_msgnums[k] <= target_msgnums[k-1])) abort();
+ }
+#endif
+
+ CtdlLogPrintf(CTDL_DEBUG, "before update: %s\n", vset);
/* Translate the existing sequence set into an array of booleans */
num_sets = num_tokens(vset, ',');
}
}
- CtdlLogPrintf(CTDL_DEBUG, "\e[31m after optimize: %s\e[0m\n", vset);
/* Now translate the array of booleans back into a sequence set */
strcpy(vset, "");
- lo = (-1L);
- hi = (-1L);
- was_seen = ((which_set == ctdlsetseen_seen) ? 1 : 0);
+ was_seen = 0;
+ lo = (-1);
+ hi = (-1);
for (i=0; i<num_msgs; ++i) {
+ is_seen = is_set[i];
- is_seen = is_set[i]; /* Default to existing setting */
-
+ /* Apply changes */
for (k=0; k<num_target_msgnums; ++k) {
if (msglist[i] == target_msgnums[k]) {
is_seen = target_setting;
}
}
- if (is_seen) {
- if (lo < 0L) lo = msglist[i];
- hi = msglist[i];
- }
+ w = 0; /* set to 1 if we write something to the string */
- if ( ((is_seen == 0) && (was_seen == 1))
- || ((is_seen == 1) && (i == num_msgs-1)) ) {
+ if ((was_seen == 0) && (is_seen == 1)) {
+ lo = msglist[i];
+ }
+ else if ((was_seen == 1) && (is_seen == 0)) {
+ hi = msglist[i-1];
+ w = 1;
- /* begin trim-o-matic code */
- j=9;
- trimming = 0;
- while ( (strlen(vset) + 20) > sizeof vset) {
- remove_token(vset, 0, ',');
- trimming = 1;
- if (j--) break; /* loop no more than 9 times */
+ if (!IsEmptyStr(vset)) {
+ strcat(vset, ",");
}
- if ( (trimming) && (which_set == ctdlsetseen_seen) ) {
- t = atol(vset);
- if (t<2) t=2;
- --t;
- snprintf(lostr, sizeof lostr,
- "1:%ld,%s", t, vset);
- safestrncpy(vset, lostr, sizeof vset);
+ if (lo == hi) {
+ sprintf(&vset[strlen(vset)], "%ld", hi);
}
- if (trimming) {
- CtdlLogPrintf(CTDL_DEBUG, "\e32m ** TRIMMING ** \e[0m\n");
+ else {
+ sprintf(&vset[strlen(vset)], "%ld:%ld", lo, hi);
}
- /* end trim-o-matic code */
-
- tmp = strlen(vset);
- if (tmp > 0) {
+ }
+ else if ((is_seen) && (i == num_msgs - 1)) {
+ w = 1;
+ if (!IsEmptyStr(vset)) {
strcat(vset, ",");
- ++tmp;
- }
- if ((lo == -1) && (hi == -1)) {
- /* bogus pair, do nothing */
}
- else if (lo == hi) {
- snprintf(&vset[tmp], (sizeof vset) - tmp, "%ld", lo);
+ if ((i==0) || (was_seen == 0)) {
+ sprintf(&vset[strlen(vset)], "%ld", msglist[i]);
}
else {
- snprintf(&vset[tmp], (sizeof vset) - tmp, "%ld:%ld", lo, hi);
+ sprintf(&vset[strlen(vset)], "%ld:%ld", lo, msglist[i]);
+ }
+ }
+
+ /* If the string is getting too long, truncate it at the beginning; repeat up to 9 times */
+ if (w) for (j=0; j<9; ++j) {
+ if ((strlen(vset) + 20) > sizeof vset) {
+ remove_token(vset, 0, ',');
+ if (which_set == ctdlsetseen_seen) {
+ char temp[SIZ];
+ sprintf(temp, "1:%ld,", atol(vset)-1L);
+ strcat(temp, vset);
+ strcpy(vset, temp);
+ }
}
- lo = (-1L);
- hi = (-1L);
}
+
was_seen = is_seen;
}
+ CtdlLogPrintf(CTDL_DEBUG, " after update: %s\n", vset);
+
/* Decide which message set we're manipulating */
switch (which_set) {
case ctdlsetseen_seen:
safestrncpy(vbuf.v_answered, vset, sizeof vbuf.v_answered);
break;
}
- free(is_set);
- CtdlLogPrintf(CTDL_DEBUG, "\e[31m after update: %s\e[0m\n", vset);
+ free(is_set);
free(msglist);
CtdlSetRelationship(&vbuf, which_user, which_room);
}
int need_to_free_re = 0;
regmatch_t pm;
- if (content_type) if (!IsEmptyStr(content_type)) {
+ if ((content_type) && (!IsEmptyStr(content_type))) {
regcomp(&re, content_type, 0);
need_to_free_re = 1;
}
/* If the caller is looking for a specific MIME type, filter
* out all messages which are not of the type requested.
*/
- if (content_type != NULL) if (!IsEmptyStr(content_type)) {
+ if ((content_type != NULL) && (!IsEmptyStr(content_type))) {
/* This call to GetMetaData() sits inside this loop
* so that we only do the extra database read per msg
*/
void list_this_part(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ char *cbid, void *cbuserdata)
{
struct ma_info *ma;
ma = (struct ma_info *)cbuserdata;
if (ma->is_ma == 0) {
- cprintf("part=%s|%s|%s|%s|%s|%ld\n",
- name, filename, partnum, disp, cbtype, (long)length);
+ cprintf("part=%s|%s|%s|%s|%s|%ld|%s\n",
+ name, filename, partnum, disp, cbtype, (long)length, cbid);
}
}
*/
void list_this_pref(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ char *cbid, void *cbuserdata)
{
struct ma_info *ma;
*/
void list_this_suff(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ char *cbid, void *cbuserdata)
{
struct ma_info *ma;
*/
void mime_download(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
- /* Silently go away if there's already a download open... */
+ /* Silently go away if there's already a download open. */
if (CC->download_fp != NULL)
return;
- /* ...or if this is not the desired section */
- if (strcasecmp(CC->download_desired_section, partnum))
- return;
-
- CC->download_fp = tmpfile();
- if (CC->download_fp == NULL)
- return;
-
- fwrite(content, length, 1, CC->download_fp);
- fflush(CC->download_fp);
- rewind(CC->download_fp);
-
- OpenCmdResult(filename, cbtype);
+ if (
+ (!IsEmptyStr(partnum) && (!strcasecmp(CC->download_desired_section, partnum)))
+ || (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
+ ) {
+ CC->download_fp = tmpfile();
+ if (CC->download_fp == NULL)
+ return;
+
+ fwrite(content, length, 1, CC->download_fp);
+ fflush(CC->download_fp);
+ rewind(CC->download_fp);
+
+ OpenCmdResult(filename, cbtype);
+ }
}
/*
- * Callback function for mime parser that outputs a section all at once
+ * Callback function for mime parser that outputs a section all at once.
+ * We can specify the desired section by part number *or* content-id.
*/
void mime_spew_section(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
int *found_it = (int *)cbuserdata;
- /* ...or if this is not the desired section */
- if (strcasecmp(CC->download_desired_section, partnum))
- return;
-
- *found_it = 1;
-
- cprintf("%d %d\n", BINARY_FOLLOWS, (int)length);
- client_write(content, length);
+ if (
+ (!IsEmptyStr(partnum) && (!strcasecmp(CC->download_desired_section, partnum)))
+ || (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
+ ) {
+ *found_it = 1;
+ cprintf("%d %d\n", BINARY_FOLLOWS, (int)length);
+ client_write(content, length);
+ }
}
*/
void fixed_output_pre(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ char *cbid, void *cbuserdata)
{
struct ma_info *ma;
*/
void fixed_output_post(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
struct ma_info *ma;
*/
void fixed_output(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
char *ptr;
char *wptr;
*/
void choose_preferred(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
char buf[1024];
int i;
*/
void output_preferred(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
int i;
char buf[128];
/* No translations required or possible: output as text/plain */
cprintf("Content-type: text/plain\n\n");
fixed_output(name, filename, partnum, disp, content, cbtype, cbcharset,
- length, encoding, cbuserdata);
+ length, encoding, cbid, cbuserdata);
}
*/
void extract_encapsulated_message(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
- char *encoding, void *cbuserdata)
+ char *encoding, char *cbid, void *cbuserdata)
{
struct encapmsg *encap;
/* FIXME: check message id against msglist for this room */
/*
- * Fetch the message from disk. If we're in any sort of headers
- * only mode, request that we don't even bother loading the body
- * into memory.
+ * Fetch the message from disk. If we're in HEADERS_FAST mode,
+ * request that we don't even bother loading the body into memory.
*/
- if ( (headers_only == HEADERS_FAST) || (headers_only == HEADERS_ONLY) ) {
+ if (headers_only == HEADERS_FAST) {
TheMessage = CtdlFetchMessage(msg_num, 0);
}
else {
char luser[100];
char fuser[100];
char snode[100];
- char lnode[100];
char mid[100];
char datestamp[100];
strcpy(luser, "");
strcpy(fuser, "");
strcpy(snode, NODENAME);
- strcpy(lnode, HUMANNODE);
if (mode == MT_RFC822) {
for (i = 0; i < 256; ++i) {
if (TheMessage->cm_fields[i]) {
}
else if (i == 'I')
safestrncpy(mid, mptr, sizeof mid);
- else if (i == 'H')
- safestrncpy(lnode, mptr, sizeof lnode);
else if (i == 'F')
safestrncpy(fuser, mptr, sizeof fuser);
/* else if (i == 'O')
{
if (haschar(mptr, '@') == 0)
{
- cprintf("To: %s@%s%s", mptr, config.c_fqdn, nl);
+ cprintf("To: %s@%s", mptr, config.c_fqdn);
+ cprintf("%s", nl);
}
else
{
if ((flags & QP_EADDR) != 0)
mptr = qp_encode_email_addrs(mptr);
- cprintf("To: %s%s", mptr, nl);
+ cprintf("To: %s", mptr);
+ cprintf("%s", nl);
}
}
else if (i == 'T') {
cprintf("From: \"%s\" <%s@%s>%s", luser, suser, snode, nl);
}
- cprintf("Organization: %s%s", lnode, nl);
-
/* Blank line signifying RFC822 end-of-headers */
if (TheMessage->cm_format_type != FMT_RFC822) {
cprintf("%s", nl);
* is set, or if there is one or more Internet email recipients.
*/
if (CC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
- if (valid_to) if (valid_to->num_internet > 0) subject_required = 1;
- if (valid_cc) if (valid_cc->num_internet > 0) subject_required = 1;
- if (valid_bcc) if (valid_bcc->num_internet > 0) subject_required = 1;
+ if ((valid_to) && (valid_to->num_internet > 0)) subject_required = 1;
+ if ((valid_cc) && (valid_cc->num_internet > 0)) subject_required = 1;
+ if ((valid_bcc) && (valid_bcc->num_internet > 0)) subject_required = 1;
/* If we're only checking the validity of the request, return
* success without creating the message.
projects / citadel.git / blobdiff