projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
validate_recipients() remove extra copy of recipients
[citadel.git]
/
citadel
/
server
/
modules
/
imap
/
imap_fetch.c
diff --git
a/citadel/server/modules/imap/imap_fetch.c
b/citadel/server/modules/imap/imap_fetch.c
index 42dc3d7cab15b676163a76b056113922c8e30f5a..75e49e8e764938d4f672795c166a661d410c7b55 100644
(file)
--- a/
citadel/server/modules/imap/imap_fetch.c
+++ b/
citadel/server/modules/imap/imap_fetch.c
@@
-1201,21
+1201,21
@@
int imap_extract_data_items(citimap_command *Cmd) {
// message included in the specified range.
//
// Set is_uid to 1 to fetch by UID instead of sequence number.
// message included in the specified range.
//
// Set is_uid to 1 to fetch by UID instead of sequence number.
-void imap_pick_range(const char *
supplied_range
, int is_uid) {
+void imap_pick_range(const char *
range_in
, int is_uid) {
citimap *Imap = IMAP;
int i;
int num_sets;
int s;
char setstr[SIZ], lostr[SIZ], histr[SIZ];
long lo, hi;
citimap *Imap = IMAP;
int i;
int num_sets;
int s;
char setstr[SIZ], lostr[SIZ], histr[SIZ];
long lo, hi;
- char
actual_
range[SIZ];
+ char range[SIZ];
// Handle the "ALL" macro
// Handle the "ALL" macro
- if (!strcasecmp(
supplied_range
, "ALL")) {
- safestrncpy(
actual_range, "1:*", sizeof actual_
range);
+ if (!strcasecmp(
range_in
, "ALL")) {
+ safestrncpy(
range, "1:*", sizeof
range);
}
else {
}
else {
- safestrncpy(
actual_range, supplied_range, sizeof actual_
range);
+ safestrncpy(
range, range_in, sizeof
range);
}
// Clear out the IMAP_SELECTED flags for all messages.
}
// Clear out the IMAP_SELECTED flags for all messages.
@@
-1224,9
+1224,9
@@
void imap_pick_range(const char *supplied_range, int is_uid) {
}
// Now set it for all specified messages.
}
// Now set it for all specified messages.
- num_sets = num_tokens(
actual_
range, ',');
+ num_sets = num_tokens(range, ',');
for (s=0; s<num_sets; ++s) {
for (s=0; s<num_sets; ++s) {
- extract_token(setstr,
actual_
range, s, ',', sizeof setstr);
+ extract_token(setstr, range, s, ',', sizeof setstr);
extract_token(lostr, setstr, 0, ':', sizeof lostr);
if (num_tokens(setstr, ':') >= 2) {
extract_token(lostr, setstr, 0, ':', sizeof lostr);
if (num_tokens(setstr, ':') >= 2) {