NNTP65/NNTP65UP: Changed spool to NEWS.SPOOL. Cleaned up params file.

This commit is contained in:
Bobbi Webber-Manners 2020-09-15 21:24:26 -04:00
parent 71844373b1
commit 70eeaa45f2
3 changed files with 4 additions and 14 deletions

View File

@ -1,9 +1,6 @@
144.76.35.198:119 144.76.35.198:119
usergoeshere usergoeshere
passwordgoeshere passwordgoeshere
NODELETE
192.168.10.2:25
apple2.local
/IP65 /IP65
/DATA/EMAIL /DATA/EMAIL
bobbi.8bit@gmail.com bobbi.8bit@gmail.com

View File

@ -321,9 +321,6 @@ void readconfigfile(void) {
fscanf(fp, "%s", cfg_server); fscanf(fp, "%s", cfg_server);
fscanf(fp, "%s", cfg_user); fscanf(fp, "%s", cfg_user);
fscanf(fp, "%s", cfg_pass); fscanf(fp, "%s", cfg_pass);
fscanf(fp, "%s", cfg_pop_delete);
fscanf(fp, "%s", cfg_smtp_server);
fscanf(fp, "%s", cfg_smtp_domain);
fscanf(fp, "%s", cfg_instdir); fscanf(fp, "%s", cfg_instdir);
fscanf(fp, "%s", cfg_emaildir); fscanf(fp, "%s", cfg_emaildir);
fclose(fp); fclose(fp);
@ -431,11 +428,11 @@ void update_mailbox(char *mbox) {
uint8_t headers; uint8_t headers;
FILE *destfp; FILE *destfp;
DIR *dp; DIR *dp;
sprintf(filename, "%s/NEWSSPOOL", cfg_emaildir); sprintf(filename, "%s/NEWS.SPOOL", cfg_emaildir);
dp = opendir(filename); dp = opendir(filename);
while (d = readdir(dp)) { while (d = readdir(dp)) {
strcpy(linebuf, ""); strcpy(linebuf, "");
sprintf(filename, "%s/NEWSSPOOL/%s", cfg_emaildir, d->d_name); sprintf(filename, "%s/NEWS.SPOOL/%s", cfg_emaildir, d->d_name);
fp = fopen(filename, "r"); fp = fopen(filename, "r");
if (!fp) { if (!fp) {
printf("Can't open %s\n", filename); printf("Can't open %s\n", filename);
@ -493,7 +490,7 @@ void update_mailbox(char *mbox) {
fclose(destfp); fclose(destfp);
update_email_db(mbox, &hdrs); update_email_db(mbox, &hdrs);
sprintf(filename, "%s/NEWSSPOOL/NEWS.%u", cfg_emaildir, msg); sprintf(filename, "%s/NEWS.SPOOL/NEWS.%u", cfg_emaildir, msg);
if (unlink(filename)) if (unlink(filename))
printf("Can't delete %s\n", filename); printf("Can't delete %s\n", filename);
} }
@ -638,7 +635,7 @@ void main(int argc, char *argv[]) {
if (strncmp(buf, "223", 3) != 0) if (strncmp(buf, "223", 3) != 0)
break; // No more messages in group break; // No more messages in group
sscanf(buf, "223 %ld", &msg); sscanf(buf, "223 %ld", &msg);
sprintf(filename, "%s/NEWSSPOOL/NEWS.%lu", cfg_emaildir, msg); sprintf(filename, "%s/NEWS.SPOOL/NEWS.%lu", cfg_emaildir, msg);
_filetype = PRODOS_T_TXT; _filetype = PRODOS_T_TXT;
_auxtype = 0; _auxtype = 0;
fp = fopen(filename, "wb"); fp = fopen(filename, "wb");

View File

@ -354,9 +354,6 @@ void readconfigfile(void) {
fscanf(fp, "%s", cfg_server); fscanf(fp, "%s", cfg_server);
fscanf(fp, "%s", cfg_user); fscanf(fp, "%s", cfg_user);
fscanf(fp, "%s", cfg_pass); fscanf(fp, "%s", cfg_pass);
fscanf(fp, "%s", cfg_pop_delete);
fscanf(fp, "%s", cfg_smtp_server);
fscanf(fp, "%s", cfg_smtp_domain);
fscanf(fp, "%s", cfg_instdir); fscanf(fp, "%s", cfg_instdir);
fscanf(fp, "%s", cfg_emaildir); fscanf(fp, "%s", cfg_emaildir);
fscanf(fp, "%s", cfg_emailaddr); fscanf(fp, "%s", cfg_emailaddr);
@ -501,7 +498,6 @@ void main(int argc, char *argv[]) {
uint8_t linecount; uint8_t linecount;
DIR *dp; DIR *dp;
struct dirent *d; struct dirent *d;
char *p, *q;
uint8_t eth_init = ETH_INIT_DEFAULT, connected = 0; uint8_t eth_init = ETH_INIT_DEFAULT, connected = 0;
if ((argc == 2) && (strcmp(argv[1], "EMAIL") == 0)) if ((argc == 2) && (strcmp(argv[1], "EMAIL") == 0))