Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2025-02-20 10:29:01 +00:00
Code Issues Projects Releases Wiki Activity

EDIT/EMAIL: Made the command line arg passing more flexible

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-09-03 18:58:47 -04:00
parent f8378922e2
commit 5f5e0f4d65
2 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
apps/edit.c
View File

@ -28,7 +28,7 @@
#define IOSZ 1024 // Size of chunks to use when loading/saving file
#define CUTBUFSZ 8192 // Size of cut buffer. Must be >IOSZ.
#define EOL '\r' // For ProDOS
#define EOL '\r' // ProDOS uses CR line endings
#define BELL 0x07
#define BACKSPACE 0x08
@ -77,7 +77,10 @@ uint8_t row, col;
uint8_t cursrow, curscol; // Cursor position is kept here by draw_screen()
uint8_t quit_to_email; // If 1, launch EMAIL.SYSTEM on quit
uint8_t email_mode; // If 0 quit to ProDOS
// If 1 quit to EMAIL.SYSTEM
// If 2 ask about attachments and quit to either
// ATTACHER.SYSTEM (if y) or EMAIL.SYSTEM (if n)
enum editmode {SEL_NONE, SEL_SELECT, SRCH1, SRCH2, SRCH3};
enum editmode mode;
@ -2486,12 +2489,16 @@ int edit(char *fname) {
case 0x80 + 'Q': // OA-Q "Quit"
case 0x80 + 'q': // OA-q
save_all();
if (quit_to_email) {
switch (email_mode) {
case 2:
if (prompt_okay("Add attachments") == 0)
load_attacher();
// Fall through
case 1:
if (prompt_okay("Quit to EMAIL") == 0)
load_email();
} else {
break;
default:
if (prompt_okay("Quit to ProDOS") == 0) {
revers(0);
clrscr();
@ -2706,7 +2713,17 @@ donehelp:
}
}
/*
* Usage message
*/
void usage(void) {
printf("Usage: -EDIT.SYSTEM [filename.txt]");
printf(" or -EDIT.SYSTEM [-reademail|-compose] filename.txt");
exit(1);
}
void main(int argc, char *argv[]) {
uint8_t i;
#ifdef AUXMEM
uint8_t *pp = (uint8_t*)0xbf98;
if (!(*pp & 0x02)) {
@ -2722,12 +2739,27 @@ void main(int argc, char *argv[]) {
init_aux_banks();
getcwd(startdir, 80);
#endif
if (argc == 2) {
quit_to_email = 1;
email_mode = 0;
switch (argc) {
case 3:
if (strcmp(argv[1], "-reademail") == 0)
email_mode = 1;
else if (strcmp(argv[1], "-compose") == 0)
email_mode = 2;
else
usage();
edit(argv[2]);
break;
case 2:
if (argv[1][0] == '-')
usage();
edit(argv[1]);
} else {
quit_to_email = 0;
break;
case 1:
edit(NULL);
break;
default:
usage();
}
}

14
apps/email.c
View File

@ -78,11 +78,11 @@ static unsigned char buf[READSZ];
#define ERR_NONFATAL 0
#define ERR_FATAL 1
// Shove this up in the Language Card out of an abundance of caution
#pragma code-name (push, "LC")
void load_editor(void) {
sprintf(userentry, "%s/EDIT.SYSTEM", cfg_instdir);
exec(userentry, filename);
void load_editor(uint8_t compose) {
sprintf(userentry, "%s %s", (compose ? "-compose" : "-reademail"), filename);
sprintf(filename, "%s/EDIT.SYSTEM", cfg_instdir);
exec(filename, userentry);
}
#pragma code-name (pop)
@ -1714,7 +1714,7 @@ void copy_to_mailbox(struct emailhdrs *h, uint16_t idx,
error(ERR_NONFATAL, filename);
if (prompt_okay("Open in editor - ")) {
sprintf(filename, "%s/OUTBOX/EMAIL.%u", cfg_emaildir, num);
load_editor();
load_editor(1);
}
}
}
@ -1834,7 +1834,7 @@ void create_blank_outgoing() {
sprintf(filename, "Open %s/OUTBOX/EMAIL.%u in editor - ", cfg_emaildir, num);
if (prompt_okay(filename)) {
sprintf(filename, "%s/OUTBOX/EMAIL.%u", cfg_emaildir, num);
load_editor();
load_editor(1);
}
done:
fclose(fp);
@ -1996,7 +1996,7 @@ void keyboard_hdlr(void) {
case 0x80 + 'e': // OA-E "Open message in editor"
case 0x80 + 'E':
sprintf(filename, "%s/%s/EMAIL.%u", cfg_emaildir, curr_mbox, h->emailnum);
load_editor();
load_editor(0);
break;
case 0x80 + 'r': // OA-R "Retrieve messages from server"
case 0x80 + 'R':