Skip to content

Fixed imap import message removal #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsuto merged 1 commit into from
Jan 2, 2026
Merged

Fixed imap import message removal #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 50 additions & 29 deletions src/import_imap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,55 +214,76 @@ int examine_imap_folder(CURL *curl, struct data *data, const char *folder){
return n_messages;
}

static CURLcode send_imap_command(CURL *curl, struct data *data, const char *url, struct MemoryStruct *chunk, const char *command){
curl_easy_reset(curl);
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_USERNAME, data->import->username);
curl_easy_setopt(curl, CURLOPT_PASSWORD, data->import->password);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)chunk);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, command);

SSL_SETUP(curl, data);

return curl_easy_perform(curl);
}

int delete_emails_from_imap(CURL *curl, struct data *data, const char *url, int *seq_nums, int count){
CURLcode res;
struct MemoryStruct chunk;
char command[MAXBUFSIZE];
int offset = 0;
int i = 0;

if(count <= 0) return 0;

chunk.memory = malloc(1);
chunk.written_size = 0;
chunk.size = 0;

// Build STORE command to mark messages as deleted
// Build and send STORE commands in batches to avoid buffer overflow
// Reserve space for "STORE " prefix (6) and " +FLAGS (\Deleted)" suffix (18) plus safety margin
const int max_offset = sizeof(command) - 32;

offset = snprintf(command, sizeof(command), "STORE ");
for(int i=0; i<count; i++){
if(i > 0) offset += snprintf(command + offset, sizeof(command) - offset, ",");
offset += snprintf(command + offset, sizeof(command) - offset, "%d", seq_nums[i]);
}
snprintf(command + offset, sizeof(command) - offset, " +FLAGS (\\Deleted)");

curl_easy_reset(curl);
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_USERNAME, data->import->username);
curl_easy_setopt(curl, CURLOPT_PASSWORD, data->import->password);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, command);
for(i = 0; i < count; i++){
int needed = snprintf(NULL, 0, "%s%d", (offset > 6) ? "," : "", seq_nums[i]);

SSL_SETUP(curl, data);
if(offset + needed >= max_offset){
// Buffer full, send current batch
snprintf(command + offset, sizeof(command) - offset, " +FLAGS (\\Deleted)");

res = curl_easy_perform(curl);
if(res != CURLE_OK){
fprintf(stderr, "Failed to mark messages as deleted: %s\n", curl_easy_strerror(res));
free(chunk.memory);
return -1;
res = send_imap_command(curl, data, url, &chunk, command);
if(res != CURLE_OK){
fprintf(stderr, "Failed to mark messages as deleted: %s\n", curl_easy_strerror(res));
free(chunk.memory);
return -1;
}

// Start new batch
offset = snprintf(command, sizeof(command), "STORE ");
}

// Add sequence number to current batch
if(offset > 6) offset += snprintf(command + offset, sizeof(command) - offset, ",");
offset += snprintf(command + offset, sizeof(command) - offset, "%d", seq_nums[i]);
}

// Now expunge to permanently remove the deleted messages
curl_easy_reset(curl);
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_USERNAME, data->import->username);
curl_easy_setopt(curl, CURLOPT_PASSWORD, data->import->password);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "EXPUNGE");
// Send remaining batch
if(offset > 6){
snprintf(command + offset, sizeof(command) - offset, " +FLAGS (\\Deleted)");

SSL_SETUP(curl, data);
res = send_imap_command(curl, data, url, &chunk, command);
if(res != CURLE_OK){
fprintf(stderr, "Failed to mark messages as deleted: %s\n", curl_easy_strerror(res));
free(chunk.memory);
return -1;
}
}

res = curl_easy_perform(curl);
// Now expunge to permanently remove the deleted messages
res = send_imap_command(curl, data, url, &chunk, "EXPUNGE");
if(res != CURLE_OK){
fprintf(stderr, "Failed to expunge deleted messages: %s\n", curl_easy_strerror(res));
free(chunk.memory);
Expand Down