#include "tools.h"
#include "rooms.h"
#include "client_chat.h"
+#include "citadel_dirs.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
char buf[1024];
FILE *outpipe;
time_t timestamp;
- struct tm *stamp;
+ struct tm stamp;
int flags = 0;
char sender[64];
char node[64];
if (rc_exp_beep) {
ctdl_beep();
}
- if (strlen(rc_exp_cmd) == 0) {
+ if (IsEmptyStr(rc_exp_cmd)) {
color(BRIGHT_RED);
scr_printf("\r---");
}
instant_msgs = extract_int(buf, 0);
timestamp = extract_long(buf, 1);
flags = extract_int(buf, 2);
- extract(sender, buf, 3);
- extract(node, buf, 4);
+ extract_token(sender, buf, 3, '|', sizeof sender);
+ extract_token(node, buf, 4, '|', sizeof node);
strcpy(last_paged, sender);
- stamp = localtime(×tamp);
+ localtime_r(×tamp, &stamp);
/* If the page is a Logoff Request, honor it. */
if (flags & 2) {
return;
}
- if (strlen(rc_exp_cmd) > 0) {
+ if (!IsEmptyStr(rc_exp_cmd)) {
outpipe = popen(rc_exp_cmd, "w");
if (outpipe != NULL) {
/* Header derived from flags */
else
fprintf(outpipe, "Message ");
/* Timestamp. Can this be improved? */
- if (stamp->tm_hour == 0 || stamp->tm_hour == 12)
+ if (stamp.tm_hour == 0 || stamp.tm_hour == 12)
fprintf(outpipe, "at 12:%02d%cm",
- stamp->tm_min,
- stamp->tm_hour ? 'p' : 'a');
- else if (stamp->tm_hour > 12) /* pm */
+ stamp.tm_min,
+ stamp.tm_hour ? 'p' : 'a');
+ else if (stamp.tm_hour > 12) /* pm */
fprintf(outpipe, "at %d:%02dpm",
- stamp->tm_hour - 12,
- stamp->tm_min);
+ stamp.tm_hour - 12,
+ stamp.tm_min);
else /* am */
fprintf(outpipe, "at %d:%02dam",
- stamp->tm_hour, stamp->tm_min);
+ stamp.tm_hour, stamp.tm_min);
fprintf(outpipe, " from %s", sender);
if (strncmp(ipc_for_signal_handlers->ServInfo.nodename, node, 32))
fprintf(outpipe, " @%s", node);
scr_printf("Message ");
/* Timestamp. Can this be improved? */
- if (stamp->tm_hour == 0 || stamp->tm_hour == 12)/* 12am/12pm */
- scr_printf("at 12:%02d%cm", stamp->tm_min,
- stamp->tm_hour ? 'p' : 'a');
- else if (stamp->tm_hour > 12) /* pm */
+ if (stamp.tm_hour == 0 || stamp.tm_hour == 12)/* 12am/12pm */
+ scr_printf("at 12:%02d%cm", stamp.tm_min,
+ stamp.tm_hour ? 'p' : 'a');
+ else if (stamp.tm_hour > 12) /* pm */
scr_printf("at %d:%02dpm",
- stamp->tm_hour - 12, stamp->tm_min);
+ stamp.tm_hour - 12, stamp.tm_min);
else /* am */
- scr_printf("at %d:%02dam", stamp->tm_hour, stamp->tm_min);
+ scr_printf("at %d:%02dam", stamp.tm_hour, stamp.tm_min);
/* Sender */
scr_printf(" from %s", sender);
* (There's a hole in the bucket...)
*/
a = scr_getc(SCR_BLOCK);
- if (a == 127)
+ if (a == 127) {
a = 8;
- if (a > 126)
- a = 0;
- if (a == 13)
+ }
+ if (a == 13) {
a = 10;
+ }
+/* not so fast there dude, we have to handle UTF-8 and ISO-8859-1...
+ if (a > 126) {
+ a = 0;
+ }
if (((a != 23) && (a != 4) && (a != 10) && (a != 8) && (a != NEXT_KEY) && (a != STOP_KEY))
- && ((a < 32) || (a > 126)))
+ && ((a < 32) || (a > 126))) {
a = 0;
+ }
+ */
#ifndef DISABLE_CURSES
#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
/* Gets a line from the terminal */
/* string == Pointer to string buffer */
/* lim == Maximum length - if negative, no-show */
-void getline(char *string, int lim)
+void ctdl_getline(char *string, int lim)
{
int a, b;
char flag = 0;
strcpy(string, "");
gl_string = string;
async_ka_start();
- GLA:a = inkey();
- a = (a & 127);
- if ((a == 8 || a == 23) && (strlen(string) == 0))
+
+GLA: a = inkey();
+ /* a = (a & 127); ** commented out because it isn't just an ASCII world anymore */
+ if ((a == 8 || a == 23) && (IsEmptyStr(string)))
goto GLA;
if ((a != 10) && (a != 8) && (strlen(string) == lim))
goto GLA;
do {
string[strlen(string) - 1] = 0;
scr_putc(8); scr_putc(32); scr_putc(8);
- } while (strlen(string) && string[strlen(string) - 1] != ' ');
+ } while (!IsEmptyStr(string) && string[strlen(string) - 1] != ' ');
goto GLA;
}
if ((a == 10)) {
color(DIM_WHITE);
scr_printf(": ");
color(BRIGHT_CYAN);
- getline(buf, len);
+ ctdl_getline(buf, len);
if (buf[0] != 0)
strcpy(str, buf);
color(DIM_WHITE);
color(BRIGHT_MAGENTA);
scr_printf("%s", prompt);
color(DIM_MAGENTA);
- getline(str, len);
+ ctdl_getline(str, len);
color(DIM_WHITE);
}
rc_force_mail_prompts = 0;
rc_ansi_color = 0;
rc_color_use_bg = 0;
- rc_reply_extedit = 0;
strcpy(rc_url_cmd, "");
strcpy(rc_gotmail_cmd, "");
#ifdef HAVE_OPENSSL
ccfile = fopen(buf, "r");
}
if (ccfile == NULL) {
- snprintf(buf, sizeof buf, "%s/citadel.rc", BBSDIR);
- ccfile = fopen(buf, "r");
+ ccfile = fopen(file_citadel_rc, "r");
}
if (ccfile == NULL) {
ccfile = fopen("/etc/citadel.rc", "r");
logoff(NULL, 3);
}
while (fgets(buf, sizeof buf, ccfile) != NULL) {
- while ((strlen(buf) > 0) ? (isspace(buf[strlen(buf) - 1])) : 0)
+ while ((!IsEmptyStr(buf)) ? (isspace(buf[strlen(buf) - 1])) : 0)
buf[strlen(buf) - 1] = 0;
if (!strncasecmp(buf, "encrypt=", 8)) {
rc_alt_semantics = 0;
}
}
- if (!strncasecmp(buf, "reply_with_external_editor=", 27)) {
- if (!strncasecmp(&buf[27], "yes", 3)) {
- rc_reply_extedit = 1;
- }
- else {
- rc_reply_extedit = 0;
- }
- }
+
if (!strncasecmp(buf, "cmd=", 4)) {
strcpy(buf, &buf[4]);
a = 0;
b = 0;
buf[strlen(buf) + 1] = 0;
- while (strlen(buf) > 0) {
+ while (!IsEmptyStr(buf)) {
b = strlen(buf);
for (d = strlen(buf); d >= 0; --d)
if (buf[d] == ',')
for (a = 0; a < strlen(exp); ++a) {
if (strbuf[a] == '&') {
+ /* dont echo these non mnemonic command keys */
+ int noecho = strbuf[a+1] == '<' || strbuf[a+1] == '>' || strbuf[a+1] == '+' || strbuf[a+1] == '-';
+
if (mode == 0) {
- strcpy(&exp[a], &exp[a + 1]);
+ strcpy(&exp[a], &exp[a + 1 + noecho]);
}
if (mode == 1) {
exp[a] = '<';
if (cmdmatch(cmdbuf, cptr, 5)) {
/* We've found our command. */
if (requires_string(cptr, cmdpos)) {
- getline(argbuf, 32);
+ ctdl_getline(argbuf, 64);
} else {
scr_printf("\n");
}
for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
if (cmdmatch(cmdbuf, cptr, cmdpos)) {
for (a = 0; a < 5; ++a) {
- pprintf("%s ", cmd_expand(cptr->c_keys[a], 1));
+ keyopt(cmd_expand(cptr->c_keys[a], 1));
+ pprintf(" ");
}
pprintf("\n");
}
}
+ sigcaught = 0;
pprintf("\n%s%c ", room_name, room_prompt(room_flags));
got = 0;
/*
* set tty modes. commands are:
*
- * 01- set to bbs mode
+ * 01- set to Citadel mode
* 2 - save current settings for later restoral
* 3 - restore saved settings
*/
#ifdef HAVE_TERMIOS_H
-void sttybbs(int cmd)
-{ /* SysV version of sttybbs() */
+void stty_ctdl(int cmd)
+{ /* SysV version of stty_ctdl() */
struct termios live;
static struct termios saved_settings;
static int last_cmd = 0;
}
#else
-void sttybbs(int cmd)
-{ /* BSD version of sttybbs() */
+void stty_ctdl(int cmd)
+{ /* BSD version of stty_ctdl() */
struct sgttyb live;
static struct sgttyb saved_settings;
static int last_cmd = 0;
old = '\n';
continue;
}
- /* Are we looking at a nonprintable? */
+
+ /* Are we looking at a nonprintable?
+ * (This section is now commented out because we could be displaying
+ * a character set like UTF-8 or ISO-8859-1.)
if ( (*e < 32) || (*e > 126) ) {
e++;
continue;
- }
+ } */
+
/* Or are we looking at a space? */
if (*e == ' ') {
e++;
color(DIM_WHITE);
for (i=0; i<strlen(buf); ++i) {
if (buf[i]=='<') {
- scr_putc(buf[i]);
+ pprintf("%c", buf[i]);
color(BRIGHT_MAGENTA);
} else {
- if (buf[i]=='>') {
+ if (buf[i]=='>'&& buf[i+1] != '>') {
color(DIM_WHITE);
}
- scr_putc(buf[i]);
+ pprintf("%c", buf[i]);
}
}
color(DIM_WHITE);
}
else {
for (i=0; i<choices; ++i) {
- extract(buf, menustring, i);
+ extract_token(buf, menustring, i, '|', sizeof buf);
keyopt(buf);
scr_printf(" ");
}
scr_printf("\rOne of... ");
scr_printf(" \n");
for (i=0; i<choices; ++i) {
- extract(buf, menustring, i);
+ extract_token(buf, menustring, i, '|', sizeof buf);
scr_printf(" ");
keyopt(buf);
scr_printf("\n");
}
for (i=0; i<choices; ++i) {
- extract(buf, menustring, i);
+ extract_token(buf, menustring, i, '|', sizeof buf);
for (c=1; c<strlen(buf); ++c) {
if ( (ch == tolower(buf[c]))
&& (buf[c-1]=='<')
projects / citadel.git / blobdiff