bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-08 04:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug (-A) in pilerexport

Browse Source
This commit is contained in:
SJ 2013-01-03 15:14:07 +01:00
parent 96875b30b7
commit 7085f3c225
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pilerexport.c
View File

@ -139,7 +139,7 @@ int export_emails_matching_to_query(struct session_data *sdata, char *s, struct
MYSQL_RES *res; MYSQL_RES *res;
MYSQL_ROW row; MYSQL_ROW row;
FILE *f; FILE *f;
uint64 id; uint64 id, n=0;
char *digest=NULL, *bodydigest=NULL; char *digest=NULL, *bodydigest=NULL;
char filename[SMALLBUFSIZE]; char filename[SMALLBUFSIZE];
int rc=0; int rc=0;
@ -167,14 +167,17 @@ int export_emails_matching_to_query(struct session_data *sdata, char *s, struct
rc = retrieve_email_from_archive(sdata, f, cfg); rc = retrieve_email_from_archive(sdata, f, cfg);
fclose(f); fclose(f);
n++;
snprintf(sdata->filename, SMALLBUFSIZE-1, "%s", filename); snprintf(sdata->filename, SMALLBUFSIZE-1, "%s", filename);
make_digests(sdata, cfg); make_digests(sdata, cfg);
if(strcmp(digest, sdata->digest) == 0 && strcmp(bodydigest, sdata->bodydigest) == 0) if(strcmp(digest, sdata->digest) == 0 && strcmp(bodydigest, sdata->bodydigest) == 0){
printf("exported %s, verification: OK\n", filename); printf("exported: %10llu\r", n); fflush(stdout);
}
else else
printf("exported %s, verification: FAILED\n", filename); printf("verification FAILED. %s\n", filename);
} }
else printf("cannot open: %s\n", filename); else printf("cannot open: %s\n", filename);
@ -190,6 +193,8 @@ int export_emails_matching_to_query(struct session_data *sdata, char *s, struct
else rc = 1; else rc = 1;
} }
printf("\n");
return rc; return rc;
} }
@ -313,11 +318,15 @@ int main(int argc, char **argv){
(void) openlog("pilerexport", LOG_PID, LOG_MAIL); (void) openlog("pilerexport", LOG_PID, LOG_MAIL);
snprintf(s, sizeof(s)-1, "SELECT DISTINCT `id`, `piler_id`, `digest`, `bodydigest` FROM %s WHERE ", SQL_MESSAGES_VIEW); snprintf(s, sizeof(s)-1, "SELECT DISTINCT `id`, `piler_id`, `digest`, `bodydigest` FROM %s WHERE ", SQL_MESSAGES_VIEW);
rc = append_string_to_buffer(&query, s); rc = append_string_to_buffer(&query, s);
if(exportall == 1){
rc += append_string_to_buffer(&query, "1=1");
}
if(from){ if(from){
rc += append_string_to_buffer(&query, "`from` IN ("); rc += append_string_to_buffer(&query, "`from` IN (");
rc += append_string_to_buffer(&query, from); rc += append_string_to_buffer(&query, from);