/*
* $Id$
*
- * Citadel/UX message support routines
+ * Citadel message support routines
* see copyright.txt for copyright information
*/
char text[MAXWORDBUF];
};
-void sttybbs(int cmd);
+void stty_ctdl(int cmd);
int haschar(const char *st, int ch);
void getline(char *string, int lim);
int file_checksum(char *filename);
-void progress(unsigned long curr, unsigned long cmax);
+void progress(CtdlIPC* ipc, unsigned long curr, unsigned long cmax);
unsigned long *msg_arr = NULL;
int msg_arr_size = 0;
extern char room_name[];
extern unsigned room_flags;
extern long highest_msg_read;
-extern struct CtdlServInfo serv_info;
extern char temp[];
extern char temp2[];
extern int screenwidth;
has_images = 0;
sigcaught = 0;
- sttybbs(1);
+ stty_ctdl(1);
strcpy(reply_to, NO_REPLY_TO);
strcpy(reply_subject, "");
++lines_printed;
lines_printed =
checkpagin(lines_printed, pagin, screenheight);
- sttybbs(0);
+ stty_ctdl(0);
return (0);
}
}
}
pprintf("\n");
- sttybbs(0);
+ stty_ctdl(0);
return (0);
}
}
if (strlen(message->node)) {
if ((room_flags & QR_NETWORK)
- || ((strcasecmp(message->node, serv_info.serv_nodename)
- && (strcasecmp(message->node, serv_info.serv_fqdn))))) {
+ || ((strcasecmp(message->node, ipc->ServInfo.nodename)
+ && (strcasecmp(message->node, ipc->ServInfo.fqdn))))) {
if (strlen(message->email) == 0) {
if (dest) {
fprintf(dest, "@%s ", message->node);
}
}
}
- if (strcasecmp(message->hnod, serv_info.serv_humannode)
+ if (strcasecmp(message->hnod, ipc->ServInfo.humannode)
&& (strlen(message->hnod)) && (!strlen(message->email))) {
if (dest) {
fprintf(dest, "(%s) ", message->hnod);
if (pagin == 1 && !dest)
color(DIM_WHITE);
- sttybbs(0);
+ stty_ctdl(0);
return (fr);
}
} else if (strlen(editor_paths[0]) > 0) {
editor_path = editor_paths[0];
} else {
- err_printf
- ("*** No editor available, using built-in editor\n");
+ err_printf("*** No editor available, "
+ "using built-in editor\n");
mode = 0;
}
}
if (mode == 0) {
fp = fopen(filename, "r");
if (fp != NULL) {
- fmout(screenwidth, fp, NULL, NULL, 0, screenheight, 0, 0);
+ fmout(screenwidth, fp, NULL, NULL, 0,
+ screenheight, 0, 0);
beg = ftell(fp);
fclose(fp);
} else {
case 2:
default: /* allow 2+ modes */
e_ex_code = 1; /* start with a failed exit code */
+ screen_reset();
+ stty_ctdl(SB_RESTORE);
editor_pid = fork();
cksum = file_checksum(filename);
- screen_reset();
- sttybbs(SB_RESTORE);
if (editor_pid == 0) {
char tmp[SIZ];
b = ka_wait(&e_ex_code);
} while ((b != editor_pid) && (b >= 0));
editor_pid = (-1);
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
break;
}
}
/* Now compose the message... */
- if (client_make_message(ipc, temp, message.recipient, message.anonymous, 0, c, message.subject) != 0) {
+ if (client_make_message(ipc, temp, message.recipient,
+ message.anonymous, 0, c, message.subject) != 0) {
return (2);
}
/* Reopen the temp file that was created, so we can send it */
fp = fopen(temp, "r");
- /* Yes, unlink it now, so it doesn't stick around if we crash */
- unlink(temp);
-
if (!fp || !(message.text = load_message_from_file(fp))) {
err_printf("*** Internal error while trying to save message!\n"
"%s: %s\n",
temp, strerror(errno));
+ unlink(temp);
return(errno);
}
return (1);
}
+ /* Yes, unlink it now, so it doesn't stick around if we crash */
+ unlink(temp);
+
if (num_msgs >= 1) highmsg = msgarr[num_msgs - 1];
if (msgarr) free(msgarr);
void *file = NULL; /* The downloaded file */
int r;
- // view image
+ /* view image */
found = -found;
r = CtdlIPCAttachmentDownload(ipc, msg, ptr->number, &file, progress, buf);
if (r / 100 != 2) {
size_t len;
len = (size_t)extract_long(buf, 0);
- progress(len, len);
+ progress(ipc, len, len);
scr_flush();
snprintf(tmp, sizeof tmp, "%s.%s",
tmpnam(NULL),
if (f == 0) {
freopen(prtfile, "r", stdin);
screen_reset();
- sttybbs(SB_RESTORE);
+ stty_ctdl(SB_RESTORE);
ka_system(printcmd);
- sttybbs(SB_NO_INTR);
+ stty_ctdl(SB_NO_INTR);
screen_set();
unlink(prtfile);
exit(0);
if (r / 100 != 2) {
scr_printf("%s\n", cmd);
} else {
- extract(filename, cmd, 2);
+ extract_token(filename, cmd, 2, '|', sizeof filename);
/*
* Part 1 won't have a filename; use the
* subject of the message instead. IO
int lasta = a;
for (finda = a; ((finda < num_msgs) && (finda >= 0)); finda += rdir)
{
- /* This is repetitively dumb, but that's what computers are for.
- We have to load up messages until we find one by us */
- char buf[SIZ];
- int founda = 0;
+ /* This is repetitively dumb, but that's what computers are for.
+ We have to load up messages until we find one by us */
+ char buf[SIZ];
+ int founda = 0;
+ struct ctdlipcmessage *msg = NULL;
/* read the header so we can get 'from=' */
- snprintf(buf, sizeof buf, "MSG0 %ld|1", msg_arr[finda]);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000"))
- {
- if ((!strncasecmp(buf, "from=", 5)) && (finda != a)) /* Skip current message. */
- {
- if (strcasecmp(buf+5, fullname) == 0)
- {
- a = lasta; /* meesa current */
- founda = 1;
- }
- }
- }
- /* we are now in synch with the server */
- if (founda)
- break; /* for */
- lasta = finda; /* keep one behind or we skip on the reentrance to the for */
+ r = CtdlIPCGetSingleMessage(ipc, msg_arr[finda], 1, 0, &msg, buf);
+ if (!strncasecmp(msg->author, fullname, sizeof(fullname))) {
+ a = lasta; /* meesa current */
+ founda = 1;
+ }
+
+ free(msg);
+
+ if (founda)
+ break; /* for */
+ lasta = finda; /* keep one behind or we skip on the reentrance to the for */
} /* for */
} /* case 'y' */
} /* switch */
while (transcript && strlen(transcript)) {
lines_printed = 1;
- extract_token(buf, transcript, 0, '\n');
+ extract_token(buf, transcript, 0, '\n', sizeof buf);
remove_token(transcript, 0, '\n');
pprintf("%s\n", buf);
}
projects / citadel.git / blobdiff