};
void sttybbs(int cmd);
-int fmout(int width, FILE * fp, char pagin, int height, int starting_lp,
- char subst);
int haschar(char *st, int ch);
int checkpagin(int lp, int pagin, int height);
void getline(char *string, int lim);
int file_checksum(char *filename);
void do_edit(char *desc, char *read_cmd, char *check_cmd, char *write_cmd);
-char reply_to[512];
+char reply_to[SIZ];
+char reply_subject[SIZ];
long msg_arr[MAXMSGS];
int num_msgs;
char rc_alt_semantics;
*/
int read_message(
long num, /* message number */
- char pagin) /* 0 = normal read, 1 = read with pagination, 2 = header */
+ char pagin, /* 0 = normal read, 1 = read with pagination, 2 = header */
+ FILE *dest) /* Destination file, NULL for screen */
{
char buf[SIZ];
char m_subject[SIZ];
sigcaught = 0;
sttybbs(1);
- sprintf(buf, "MSG0 %ld|%d", num, (pagin == READ_HEADER ? 1 : 0));
+ snprintf(buf, sizeof buf, "MSG0 %ld|%d", num, (pagin == READ_HEADER ? 1 : 0));
serv_puts(buf);
serv_gets(buf);
if (buf[0] != '1') {
strcpy(node, "");
strcpy(rfca, "");
- scr_printf("\n");
- ++lines_printed;
- lines_printed = checkpagin(lines_printed, pagin, screenheight);
- scr_printf(" ");
- if (pagin == 1) {
+ if (dest) {
+ fprintf(dest, "\n ");
+ } else {
+ scr_printf("\n");
+ ++lines_printed;
+ lines_printed = checkpagin(lines_printed, pagin, screenheight);
+ scr_printf(" ");
+ }
+ if (pagin == 1 && !dest) {
color(BRIGHT_CYAN);
}
if (pagin == 2) {
while (serv_gets(buf), strcmp(buf, "000")) {
if (buf[4] == '=') {
- scr_printf("%s\n", buf);
- ++lines_printed;
- lines_printed =
- checkpagin(lines_printed,
- pagin, screenheight);
+ if (dest) {
+ fprintf(dest, "%s\n", buf);
+ } else {
+ scr_printf("%s\n", buf);
+ ++lines_printed;
+ lines_printed =
+ checkpagin(lines_printed,
+ pagin, screenheight);
+ }
}
}
sttybbs(0);
}
if (nhdr == 1)
buf[0] = '_';
+
if (!strncasecmp(buf, "type=", 5))
format_type = atoi(&buf[5]);
- if ((!strncasecmp(buf, "msgn=", 5))
+ else if ((!strncasecmp(buf, "msgn=", 5))
&& (rc_display_message_numbers)) {
- color(DIM_WHITE);
- scr_printf("[");
- color(BRIGHT_WHITE);
- scr_printf("#%s", &buf[5]);
- color(DIM_WHITE);
- scr_printf("] ");
+ if (dest) {
+ fprintf(dest, "[#%s] ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("[");
+ color(BRIGHT_WHITE);
+ scr_printf("#%s", &buf[5]);
+ color(DIM_WHITE);
+ scr_printf("] ");
+ }
}
- if (!strncasecmp(buf, "from=", 5)) {
- color(DIM_WHITE);
- scr_printf("from ");
- color(BRIGHT_CYAN);
- scr_printf("%s ", &buf[5]);
+ else if (!strncasecmp(buf, "from=", 5)) {
+ if (dest) {
+ fprintf(dest, "from %s ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("from ");
+ color(BRIGHT_CYAN);
+ scr_printf("%s ", &buf[5]);
+ }
}
- if (!strncasecmp(buf, "subj=", 5))
+ else if (!strncasecmp(buf, "subj=", 5)) {
strcpy(m_subject, &buf[5]);
-
- if (!strncasecmp(buf, "rfca=", 5)) {
+ }
+ else if (!strncasecmp(buf, "rfca=", 5)) {
safestrncpy(rfca, &buf[5], sizeof(rfca) - 5);
- color(DIM_WHITE);
- scr_printf("<");
- color(BRIGHT_BLUE);
- scr_printf("%s", &buf[5]);
- color(DIM_WHITE);
- scr_printf("> ");
+ if (dest) {
+ fprintf(dest, "<%s> ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("<");
+ color(BRIGHT_BLUE);
+ scr_printf("%s", &buf[5]);
+ color(DIM_WHITE);
+ scr_printf("> ");
+ }
}
- if ((!strncasecmp(buf, "hnod=", 5))
+ else if ((!strncasecmp(buf, "hnod=", 5))
&& (strcasecmp(&buf[5], serv_info.serv_humannode))
&& (strlen(rfca) == 0)) {
- color(DIM_WHITE);
- scr_printf("(");
- color(BRIGHT_WHITE);
- scr_printf("%s", &buf[5]);
- color(DIM_WHITE);
- scr_printf(") ");
+ if (dest) {
+ fprintf(dest, "(%s) ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("(");
+ color(BRIGHT_WHITE);
+ scr_printf("%s", &buf[5]);
+ color(DIM_WHITE);
+ scr_printf(") ");
+ }
}
- if ((!strncasecmp(buf, "room=", 5))
+ else if ((!strncasecmp(buf, "room=", 5))
&& (strcasecmp(&buf[5], room_name))
&& (strlen(rfca) == 0)) {
- color(DIM_WHITE);
- scr_printf("in ");
- color(BRIGHT_MAGENTA);
- scr_printf("%s> ", &buf[5]);
+ if (dest) {
+ fprintf(dest, "in %s> ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("in ");
+ color(BRIGHT_MAGENTA);
+ scr_printf("%s> ", &buf[5]);
+ }
}
-
- if (!strncasecmp(buf, "node=", 5)) {
+ else if (!strncasecmp(buf, "node=", 5)) {
safestrncpy(node, &buf[5], sizeof(buf) - 5);
if ((room_flags & QR_NETWORK)
||
(strcasecmp(&buf[5], serv_info.serv_fqdn)))))
{
if (strlen(rfca) == 0) {
- color(DIM_WHITE);
- scr_printf("@");
- color(BRIGHT_YELLOW);
- scr_printf("%s ", &buf[5]);
+ if (dest) {
+ fprintf(dest, "@%s ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("@");
+ color(BRIGHT_YELLOW);
+ scr_printf("%s ", &buf[5]);
+ }
}
}
}
-
- if (!strncasecmp(buf, "rcpt=", 5)) {
- color(DIM_WHITE);
- scr_printf("to ");
- color(BRIGHT_CYAN);
- scr_printf("%s ", &buf[5]);
+ else if (!strncasecmp(buf, "rcpt=", 5)) {
+ if (dest) {
+ fprintf(dest, "to %s ", &buf[5]);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("to ");
+ color(BRIGHT_CYAN);
+ scr_printf("%s ", &buf[5]);
+ }
}
- if (!strncasecmp(buf, "time=", 5)) {
+ else if (!strncasecmp(buf, "time=", 5)) {
fmt_date(now, atol(&buf[5]), 0);
- scr_printf("%s ", now);
+ if (dest) {
+ fprintf(dest, "%s ", now);
+ } else {
+ scr_printf("%s ", now);
+ }
}
}
if (nhdr == 1) {
if (!is_room_aide) {
- scr_printf(" ****");
+ if (dest) {
+ fprintf(dest, " ****");
+ } else {
+ scr_printf(" ****");
+ }
} else {
- scr_printf(" %s", from);
+ if (dest) {
+ fprintf(dest, " %s", from);
+ } else {
+ scr_printf(" %s", from);
+ }
}
}
- scr_printf("\n");
+ if (dest) {
+ fprintf(dest, "\n");
+ } else {
+ scr_printf("\n");
+ }
if (strlen(rfca) > 0) {
strcpy(reply_to, rfca);
node);
}
- if (pagin == 1)
+ if (pagin == 1 && !dest)
color(BRIGHT_WHITE);
- ++lines_printed;
- lines_printed = checkpagin(lines_printed, pagin, screenheight);
+ if (!dest) {
+ ++lines_printed;
+ lines_printed = checkpagin(lines_printed, pagin, screenheight);
+ }
+ strcpy(reply_subject, m_subject);
if (strlen(m_subject) > 0) {
- scr_printf("Subject: %s\n", m_subject);
- ++lines_printed;
- lines_printed =
- checkpagin(lines_printed, pagin, screenheight);
+ if (dest) {
+ fprintf(dest, "Subject: %s\n", m_subject);
+ } else {
+ scr_printf("Subject: %s\n", m_subject);
+ ++lines_printed;
+ lines_printed = checkpagin(lines_printed,
+ pagin, screenheight);
+ }
}
if (format_type == 0) {
- fr = fmout(screenwidth, NULL,
+ fr = fmout(screenwidth, NULL, dest,
((pagin == 1) ? 1 : 0), screenheight, (-1), 1);
} else {
while (serv_gets(buf), strcmp(buf, "000")) {
if (sigcaught == 0) {
+ if (dest) {
+ fprintf(dest, "%s\n", buf);
+ } else {
scr_printf("%s\n", buf);
- lines_printed = lines_printed + 1 +
- (strlen(buf) / screenwidth);
- lines_printed =
- checkpagin(lines_printed, pagin,
- screenheight);
+ lines_printed = lines_printed + 1 +
+ (strlen(buf) / screenwidth);
+ lines_printed =
+ checkpagin(lines_printed, pagin,
+ screenheight);
+ }
}
}
fr = sigcaught;
}
- scr_printf("\n");
- scr_flush();
- ++lines_printed;
- lines_printed = checkpagin(lines_printed, pagin, screenheight);
+ if (dest) {
+ fprintf(dest, "\n");
+ } else {
+ scr_printf("\n");
+ /* scr_flush(); */
+ ++lines_printed;
+ lines_printed = checkpagin(lines_printed, pagin, screenheight);
+ }
- if (pagin == 1)
+ if (pagin == 1 && !dest)
color(DIM_WHITE);
sttybbs(0);
return (fr);
char *recipient, /* NULL if it's not mail */
int anon_type, /* see MES_ types in header file */
int format_type,
- int mode)
+ int mode,
+ char *subject) /* buffer to store subject line */
{
FILE *fp;
int a, b, e_ex_code;
header[0] = 0;
if (room_flags & QR_ANONONLY && !recipient) {
- sprintf(&header[strlen(header)], " ****");
+ snprintf(header, sizeof header, " ****");
}
else {
- sprintf(&header[strlen(header)],
+ snprintf(header, sizeof header,
" %s from %s", datestr, fullname);
if (strlen(recipient) > 0) {
- sprintf(&header[strlen(header)],
+ size_t tmp = strlen(header);
+ snprintf(&header[tmp], sizeof header - tmp,
" to %s", recipient);
}
}
scr_printf("%s\n", header);
+ if (subject != NULL) if (strlen(subject) > 0) {
+ scr_printf("Subject: %s\n", subject);
+ }
beg = 0L;
if (mode == 0) {
fp = fopen(filename, "r");
if (fp != NULL) {
- fmout(screenwidth, fp, 0, screenheight, 0, 0);
+ fmout(screenwidth, fp, NULL, 0, screenheight, 0, 0);
beg = ftell(fp);
fclose(fp);
} else {
editor_pid = fork();
cksum = file_checksum(filename);
if (editor_pid == 0) {
+ char tmp[SIZ];
+
chmod(filename, 0600);
screen_reset();
sttybbs(SB_RESTORE);
- setenv("WINDOW_TITLE", header, 1);
+ snprintf(tmp, sizeof tmp, "WINDOW_TITLE=%s", header);
+ putenv(tmp);
execlp(editor_path, editor_path, filename, NULL);
exit(1);
}
b = keymenu("Entry command (? for options)",
"<A>bort|<C>ontinue|<S>ave message|<P>rint formatted|"
+ "add s<U>bject|"
"<R>eplace string|<H>old message");
if (b == 'a')
if (strlen(recipient) > 0)
scr_printf(" to %s", recipient);
scr_printf("\n");
+ if (subject != NULL) if (strlen(subject) > 0) {
+ scr_printf("Subject: %s\n", subject);
+ }
fp = fopen(filename, "r");
if (fp != NULL) {
- fmout(screenwidth, fp,
+ fmout(screenwidth, fp, NULL,
((userflags & US_PAGINATOR) ? 1 : 0),
screenheight, 0, 0);
beg = ftell(fp);
if (b == 'h') {
return (2);
}
+ if (b == 'u') {
+ if (subject != NULL) {
+ newprompt("Subject: ", subject, 70);
+ }
+ goto MECR;
+ }
MEFIN: return (0);
int mode;
long highmsg;
FILE *fp;
+ char subject[SIZ];
if (c > 0)
mode = 1;
else
mode = 0;
+ strcpy(subject, "");
+
/*
* First, check to see if we have permission to enter a message in
* this room. The server will return an error code if we can't.
*/
- sprintf(cmd, "ENT0 0||0|%d", mode);
+ snprintf(cmd, sizeof cmd, "ENT0 0||0|%d", mode);
serv_puts(cmd);
serv_gets(cmd);
strcpy(buf, "sysop");
}
+ if (is_reply) {
+ if (strlen(reply_subject) > 0) {
+ if (!strncasecmp(reply_subject,
+ "Re: ", 3)) {
+ strcpy(subject, reply_subject);
+ }
+ else {
+ snprintf(subject,
+ sizeof subject,
+ "Re: %s",
+ reply_subject);
+ }
+ }
+ }
+
b = 0;
if (room_flags & QR_ANONOPT) {
scr_printf("Anonymous (Y/N)? ");
/* If it's mail, we've got to check the validity of the recipient... */
if (strlen(buf) > 0) {
- sprintf(cmd, "ENT0 0|%s|%d|%d", buf, b, mode);
+ snprintf(cmd, sizeof cmd, "ENT0 0|%s|%d|%d|%s", buf, b, mode, subject);
serv_puts(cmd);
serv_gets(cmd);
if (cmd[0] != '2') {
}
/* Now compose the message... */
- if (client_make_message(temp, buf, b, 0, c) != 0) {
+ if (client_make_message(temp, buf, b, 0, c, subject) != 0) {
return (2);
}
}
/* Transmit message to the server */
- sprintf(cmd, "ENT0 1|%s|%d|%d||", buf, b, mode);
+ snprintf(cmd, sizeof cmd, "ENT0 1|%s|%d|%d|%s|", buf, b, mode, subject);
serv_puts(cmd);
serv_gets(cmd);
if (cmd[0] != '4') {
if ((i = num_urls) != 1)
i = intprompt("Display which one", 1, 1, num_urls);
- sprintf(cmd, rc_url_cmd, urls[i - 1]);
+ snprintf(cmd, sizeof cmd, rc_url_cmd, urls[i - 1]);
system(cmd);
scr_printf("\n");
}
char cmd[SIZ];
char targ[ROOMNAMELEN];
char filename[SIZ];
+ FILE *dest = NULL; /* Alternate destination other than screen */
if (c < 0)
b = (MAXMSGS - 1);
strcat(cmd, "OLD");
break;
case 3:
- sprintf(&cmd[strlen(cmd)], "LAST|%d", q);
+ snprintf(&cmd[5], sizeof cmd - 5, "LAST|%d", q);
break;
}
serv_puts(cmd);
}
/* now read the message... */
- e = read_message(msg_arr[a], pagin);
+ e = read_message(msg_arr[a], pagin, dest);
/* ...and set the screenwidth back if we have to */
if ((quotflag) || (arcflag)) {
RMSGREAD: scr_flush();
highest_msg_read = msg_arr[a];
if (quotflag) {
- freopen("/dev/tty", "r+", stdout);
+ fclose(dest);
+ dest = NULL;
quotflag = 0;
enable_color = hold_color;
process_quote();
}
if (arcflag) {
- freopen("/dev/tty", "r+", stdout);
+ fclose(dest);
+ dest = NULL;
arcflag = 0;
enable_color = hold_color;
f = fork();
lines_printed = 2;
e = (inkey() & 127);
e = tolower(e);
-/* return key same as <N> */ if (e == 13)
+/* return key same as <N> */ if (e == 10)
e = 'n';
/* space key same as <N> */ if (e == 32)
e = 'n';
goto RMSGREAD;
case 'p':
scr_flush();
- freopen(prtfile, "w", stdout);
+ dest = fopen(prtfile, "w");
arcflag = 1;
hold_color = enable_color;
enable_color = 0;
goto RAGAIN;
case 'q':
scr_flush();
- freopen(temp2, "w", stdout);
+ dest = fopen(temp2, "w");
quotflag = 1;
hold_color = enable_color;
enable_color = 0;
newprompt("Enter target room: ",
targ, ROOMNAMELEN - 1);
if (strlen(targ) > 0) {
- sprintf(cmd, "MOVE %ld|%s|%d",
+ snprintf(cmd, sizeof cmd, "MOVE %ld|%s|%d",
msg_arr[a], targ,
(e == 'c' ? 1 : 0));
serv_puts(cmd);
case 'd':
scr_printf("*** Delete this message? ");
if (yesno() == 1) {
- sprintf(cmd, "DELE %ld", msg_arr[a]);
+ snprintf(cmd, sizeof cmd, "DELE %ld", msg_arr[a]);
serv_puts(cmd);
serv_gets(cmd);
scr_printf("%s\n", &cmd[4]);
}
break;
case 'h':
- read_message(msg_arr[a], READ_HEADER);
+ read_message(msg_arr[a], READ_HEADER, NULL);
goto RMSGREAD;
case 'r':
savedpos = num_msgs;
char buf[SIZ];
int founda = 0;
- sprintf(buf, "MSG0 %ld|%d", msg_arr[finda], 1); /* read the header so we can get 'from=' */
+ snprintf(buf, sizeof buf, "MSG0 %ld|%d", msg_arr[finda], 1); /* read the header so we can get 'from=' */
serv_puts(buf);
serv_gets(buf);
while (serv_gets(buf), strcmp(buf, "000"))
char read_cmd[64];
char write_cmd[64];
- sprintf(desc, "system message '%s'", which_message);
- sprintf(read_cmd, "MESG %s", which_message);
- sprintf(write_cmd, "EMSG %s", which_message);
+ snprintf(desc, sizeof desc, "system message '%s'", which_message);
+ snprintf(read_cmd, sizeof read_cmd, "MESG %s", which_message);
+ snprintf(write_cmd, sizeof write_cmd, "EMSG %s", which_message);
do_edit(desc, read_cmd, "NOOP", write_cmd);
}
projects / citadel.git / blobdiff