Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2024-07-07 10:28:59 +00:00
Code Issues Projects Releases Wiki Activity

Bail out gracefully if not able to seek empty mbox in reverse view

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-07-07 22:52:36 -04:00
parent c2617a21e4
commit 3c88170354
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/email.c
View File

@ -7,8 +7,7 @@
// - TODO: Bunch of small bugs ... // - TODO: Bunch of small bugs ...
// 1) If there is no trailing newlines, the last line of the // 1) If there is no trailing newlines, the last line of the
// message seems to be shown twice. Probably get_line() error. // message seems to be shown twice. Probably get_line() error.
// This is most obvious in SENT box. // This is most obvious in SENT box if you don't CR final line.
// 2) If there are no messages in mailbox, reverse view is not happy.
// 3) If there are no message in mailbox attempting to open a message // 3) If there are no message in mailbox attempting to open a message
// tries to fetch some random EMAIL.xxxx // tries to fetch some random EMAIL.xxxx
// - TODO: Get rid of all uses of malloc(). Don't need it. // - TODO: Get rid of all uses of malloc(). Don't need it.
@ -291,17 +290,20 @@ uint8_t read_email_db(uint16_t startnum, uint8_t initialize, uint8_t switchmbox)
if (reverse) { if (reverse) {
// TODO Streamline this once it works // TODO Streamline this once it works
if (fseek(fp, 0, SEEK_END)) { if (fseek(fp, 0, SEEK_END)) {
fclose(fp);
error(switchmbox ? ERR_NONFATAL : ERR_FATAL, "Can't seek in %s", filename); error(switchmbox ? ERR_NONFATAL : ERR_FATAL, "Can't seek in %s", filename);
if (switchmbox) if (switchmbox)
return 1; return 1;
} }
// If the mailbox is empty this seek will fail
if (fseek(fp, ftell(fp) - startnum * EMAILHDRS_SZ_ON_DISK, SEEK_SET)) { if (fseek(fp, ftell(fp) - startnum * EMAILHDRS_SZ_ON_DISK, SEEK_SET)) {
error(switchmbox ? ERR_NONFATAL : ERR_FATAL, "Can't seek in %s", filename); fclose(fp);
if (switchmbox) num_msgs = total_new = total_msgs = total_tag = 0;
return 1; return 0;
} }
} else { } else {
if (fseek(fp, (startnum - 1) * EMAILHDRS_SZ_ON_DISK, SEEK_SET)) { if (fseek(fp, (startnum - 1) * EMAILHDRS_SZ_ON_DISK, SEEK_SET)) {
fclose(fp);
error(switchmbox ? ERR_NONFATAL : ERR_FATAL, "Can't seek in %s", filename); error(switchmbox ? ERR_NONFATAL : ERR_FATAL, "Can't seek in %s", filename);
if (switchmbox) if (switchmbox)
return 1; return 1;
@ -755,10 +757,9 @@ void load_screen_from_scrollback(FILE *fp, uint8_t screen) {
* Display email with simple pager functionality * Display email with simple pager functionality
* Includes support for decoding MIME headers * Includes support for decoding MIME headers
*/ */
void email_pager(void) { void email_pager(struct emailhdrs *h) {
uint32_t pos = 0; uint32_t pos = 0;
uint8_t *cursorrow = (uint8_t*)CURSORROW, mime = 0; uint8_t *cursorrow = (uint8_t*)CURSORROW, mime = 0;
struct emailhdrs *h = get_headers(selection);
FILE *sbackfp = NULL; FILE *sbackfp = NULL;
FILE *attachfp; FILE *attachfp;
uint16_t linecount, chars; uint16_t linecount, chars;
@ -1588,7 +1589,7 @@ void keyboard_hdlr(void) {
h->status = 'R'; // Mark email read h->status = 'R'; // Mark email read
write_updated_headers(h, get_db_index()); write_updated_headers(h, get_db_index());
} }
email_pager(); email_pager(h);
email_summary(); email_summary();
break; break;
case 'd': case 'd':