-/* Citadel/UX support routines */
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Client-side support functions.
+ *
+ */
#include "sysdep.h"
#include <stdlib.h>
#include <signal.h>
#include <dirent.h>
#include <errno.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <limits.h>
#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
#ifndef HAVE_GETUTLINE
struct utmp *getutline(struct utmp *ut);
extern char rc_floor_mode;
extern int rc_ansi_color;
-int struncmp(char *lstr, char *rstr, int len)
-{
- int pos = 0;
- char lc,rc;
- while (pos<len) {
- lc=tolower(lstr[pos]);
- rc=tolower(rstr[pos]);
- if ((lc==0)&&(rc==0)) return(0);
- if (lc<rc) return(-1);
- if (lc>rc) return(1);
- pos=pos+1;
- }
- return(0);
- }
-
-
-/*
- * check for the presence of a character within a string (returns count)
- */
-int haschar(char *st, int ch)
-{
- int a,b;
- b=0;
- for (a=0; a<strlen(st); ++a) if (st[a]==ch) ++b;
- return(b);
- }
-
-
void back(int spaces) /* Destructive backspace */
{
-int a;
+ int a;
for (a=1; a<=spaces; ++a) {
putc(8,stdout); putc(32,stdout); putc(8,stdout);
}
void hit_any_key(void) { /* hit any key to continue */
int a,b;
+ color(COLOR_PUSH);
+ color(DIM_RED);
printf("%s\r",serv_info.serv_moreprompt);
+ color(COLOR_POP);
sttybbs(0);
b=inkey();
for (a=0; a<strlen(serv_info.serv_moreprompt); ++a)
sttybbs(1);
if (b==NEXT_KEY) sigcaught = SIGINT;
if (b==STOP_KEY) sigcaught = SIGQUIT;
- }
+}
/*
* change a user's access level
*/
void edituser(void)
{
- char buf[256];
- char who[256];
- char pass[256];
+ char buf[SIZ];
+ char who[SIZ];
+ char pass[SIZ];
int flags;
int timescalled;
int posted;
userpurge = extract_int(&buf[4], 8);
val_user(who, 0); /* Display registration */
- strprompt("Password", pass, 19);
+ if (boolprompt("Change password", 0)) {
+ strprompt("Password", pass, 19);
+ }
axlevel = intprompt("Access level", axlevel, 0, 6);
timescalled = intprompt("Times called", timescalled, 0, INT_MAX);
posted = intprompt("Messages posted", posted, 0, INT_MAX);
int temp;
temp = sval;
- color(3);
- printf("%45s [", prompt);
- color(1);
+ color(DIM_WHITE);
+ printf("%45s ", prompt);
+ color(DIM_MAGENTA);
+ printf("[");
+ color(BRIGHT_MAGENTA);
printf("%3s", ((temp&sbit) ? "Yes":"No"));
- color(3);
+ color(DIM_MAGENTA);
printf("]? ");
- color(2);
+ color(BRIGHT_CYAN);
a=yesno_d(temp&sbit);
- color(7);
+ color(DIM_WHITE);
temp=(temp|sbit);
if (!a) temp=(temp^sbit);
return(temp);
*/
void enter_config(int mode)
{
- int width,height,flags;
+ int width, height, flags, filter;
char buf[128];
sprintf(buf,"GETU");
width = extract_int(&buf[4],0);
height = extract_int(&buf[4],1);
flags = extract_int(&buf[4],2);
+ filter = extract_int(&buf[4],3);
if ((mode==0)||(mode==1)) {
flags = set_attr(flags,
"Enable color support",US_COLOR);
}
+
+ /* filter = intprompt("Moderation filter level", filter, -63, 63); */
+
}
if (mode==2) {
}
}
- sprintf(buf,"SETU %d|%d|%d",width,height,flags);
+ sprintf(buf,"SETU %d|%d|%d|%d",width,height,flags,filter);
serv_puts(buf);
serv_gets(buf);
if (buf[0]!='2') printf("%s\n",&buf[4]);
{
int a,b;
for (a=0; a<strlen(search); ++a)
- { b=struncmp(&search[a],patn,strlen(patn));
+ { b=strncasecmp(&search[a],patn,strlen(patn));
if (b==0) return(b);
}
return(-1);
-/*
- * Check to see if we need to pause at the end of a screen.
- * If we do, we have to disable server keepalives during the pause because
- * we are probably in the middle of a server operation and the NOOP command
- * would confuse everything.
- */
-int checkpagin(int lp, int pagin, int height)
-{
- if (pagin!=1) return(0);
- if (lp>=(height-1)) {
- set_keepalives(KA_NO);
- hit_any_key();
- set_keepalives(KA_YES);
- return(0);
- }
- return(lp);
- }
-
-
void strproc(char *string)
{
int a;
void locate_host(char *hbuf)
{
#ifndef HAVE_UTMP_H
- char buf[256];
+ char buf[SIZ];
FILE *who;
int a,b;
strcpy(hbuf,serv_info.serv_fqdn);
return;
}
- fgets(buf,256,who);
+ fgets(buf,sizeof buf,who);
pclose(who);
b = 0;
else strncpy(hbuf,buf,24);
#else
char *tty = ttyname(0);
+#ifdef HAVE_GETUTXLINE
+ struct utmpx ut, *put;
+#else
struct utmp ut, *put;
+#endif
if (tty == NULL) {
fail:
safestrncpy(ut.ut_line, &tty[5], sizeof ut.ut_line);
+#ifdef HAVE_GETUTXLINE /* Solaris uses this */
+ if ((put = getutxline(&ut)) == NULL)
+#else
if ((put = getutline(&ut)) == NULL)
+#endif
goto fail;
-#ifdef HAVE_UT_TYPE
+#if defined(HAVE_UT_TYPE) || defined(HAVE_GETUTXLINE)
if (put->ut_type == USER_PROCESS) {
#endif
+#if defined(HAVE_UT_HOST) || defined(HAVE_GETUTXLINE)
if (*put->ut_host)
safestrncpy(hbuf, put->ut_host, 24);
else
+#endif
safestrncpy(hbuf, put->ut_line, 24);
-#ifdef HAVE_UT_TYPE
+#if defined(HAVE_UT_TYPE) || defined(HAVE_GETUTXLINE)
}
else goto fail;
#endif
* miscellaneous server commands (testing, etc.)
*/
void misc_server_cmd(char *cmd) {
- char buf[256];
+ char buf[SIZ];
serv_puts(cmd);
serv_gets(buf);
{
DIR *dp;
struct dirent *d;
- char filename[256];
+ char filename[SIZ];
dp = opendir(dirname);
if (dp == NULL) {