#include <errno.h>
#include <stdarg.h>
#include "citadel.h"
+#include "citadel_ipc.h"
#include "citadel_decls.h"
#include "routines2.h"
#include "routines.h"
#include "commands.h"
#include "tools.h"
-#include "citadel_ipc.h"
#include "messages.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
extern int screenwidth;
+/*
int eopen(char *name, int mode)
{
int ret;
}
return (ret);
}
+*/
int room_prompt(int qrflags)
return (a);
}
-void entregis(void)
+void entregis(CtdlIPC *ipc)
{ /* register with name and address */
char buf[SIZ];
strcpy(tmpemail, "");
strcpy(tmpcountry, "");
- r = CtdlIPCGetUserRegistration(NULL, ®, buf);
+ r = CtdlIPCGetUserRegistration(ipc, NULL, ®, buf);
if (r / 100 == 1) {
int a = 0;
ok = 1;
strcpy(holdemail, tmpemail);
strprompt("Email address", tmpemail, 31);
- r = CtdlIPCDirectoryLookup(tmpemail, buf);
+ r = CtdlIPCDirectoryLookup(ipc, tmpemail, buf);
if (r / 100 == 2) {
extract_token(diruser, buf, 0, '@');
extract_token(dirnode, buf, 1, '@');
sprintf(reg, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
tmpname, tmpaddr, tmpcity, tmpstate,
tmpzip, tmpphone, tmpemail, tmpcountry);
- r = CtdlIPCSetRegistration(reg, buf);
+ r = CtdlIPCSetRegistration(ipc, reg, buf);
if (r / 100 != 4)
scr_printf("%s\n", buf);
free(reg);
scr_printf("\n");
}
-void updatels(void)
+void updatels(CtdlIPC *ipc)
{ /* make all messages old in current room */
char buf[SIZ];
int r; /* IPC response code */
/* err_printf("maxmsgnum == highest_msg_read == 0\n"); */
return;
}
- r = CtdlIPCSetLastRead((maxmsgnum > highest_msg_read) ?
+ r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
maxmsgnum : highest_msg_read, buf);
} else {
- r = CtdlIPCSetLastRead(0, buf);
+ r = CtdlIPCSetLastRead(ipc, 0, buf);
}
if (r / 100 != 2)
scr_printf("%s\n", buf);
/*
* only make messages old in this room that have been read
*/
-void updatelsa(void)
+void updatelsa(CtdlIPC *ipc)
{
char buf[SIZ];
int r; /* IPC response code */
- r = CtdlIPCSetLastRead(highest_msg_read, buf);
+ r = CtdlIPCSetLastRead(ipc, highest_msg_read, buf);
if (r / 100 != 2)
scr_printf("%s\n", &buf[4]);
}
/*
* This routine completes a client upload
*/
-void do_upload(int fd)
+void do_upload(CtdlIPC *ipc, int fd)
{
char buf[SIZ];
char tbuf[4096];
bytes_to_send = read(fd, tbuf, 4096);
if (bytes_to_send > 0) {
snprintf(buf, sizeof buf, "WRIT %d", bytes_to_send);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '7') {
bytes_expected = atoi(&buf[4]);
- serv_write(tbuf, bytes_expected);
+ serv_write(ipc, tbuf, bytes_expected);
} else {
scr_printf("%s\n", &buf[4]);
}
/* close the upload file, locally and at the server */
close(fd);
- serv_puts("UCLS 1");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "UCLS 1");
+ CtdlIPC_getline(ipc, buf);
scr_printf("%s\n", &buf[4]);
}
/*
* client-based uploads (for users with their own clientware)
*/
-void cli_upload(void)
+void cli_upload(CtdlIPC *ipc)
{
char flnm[SIZ];
char desc[151];
snprintf(&buf[tmp], sizeof buf - tmp, "%d", a);
}
snprintf(tbuf, sizeof tbuf, "UOPN %s|%s", buf, desc);
- serv_puts(tbuf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, tbuf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] != '2')
scr_printf("%s\n", &buf[4]);
++a;
} while (buf[0] != '2');
/* at this point we have an open upload file at the server */
- do_upload(fd);
+ do_upload(ipc, fd);
}
/*
* Function used for various image upload commands
*/
-void cli_image_upload(char *keyname)
+void cli_image_upload(CtdlIPC *ipc, char *keyname)
{
char flnm[SIZ];
char buf[SIZ];
int fd;
snprintf(buf, sizeof buf, "UIMG 0|%s", keyname);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] != '2') {
scr_printf("%s\n", &buf[4]);
return;
return;
}
snprintf(buf, sizeof buf, "UIMG 1|%s", keyname);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] != '2') {
scr_printf("%s\n", &buf[4]);
return;
}
- do_upload(fd);
+ do_upload(ipc, fd);
}
/*
* protocol-based uploads (Xmodem, Ymodem, Zmodem)
*/
-void upload(int c)
+void upload(CtdlIPC *ipc, int c)
{ /* c = upload mode */
char flnm[SIZ];
char desc[151];
".%d", a);
}
++a;
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
} while ((buf[0] != '2') && (a < 100));
if (buf[0] == '2')
do {
a = read(fd, tbuf, 4096);
if (a > 0) {
snprintf(buf, sizeof buf, "WRIT %d", a);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '7')
- serv_write(tbuf, a);
+ serv_write(ipc, tbuf, a);
}
} while (a > 0);
close(fd);
- serv_puts("UCLS 1");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "UCLS 1");
+ CtdlIPC_getline(ipc, buf);
scr_printf("%s\n", &buf[4]);
}
}
/*
* validate a user
*/
-void val_user(char *user, int do_validate)
+void val_user(CtdlIPC *ipc, char *user, int do_validate)
{
int a;
char cmd[SIZ];
int r; /* IPC response code */
snprintf(cmd, sizeof cmd, "GREG %s", user);
- serv_puts(cmd);
- serv_gets(cmd);
+ CtdlIPC_putline(ipc, cmd);
+ CtdlIPC_getline(ipc, cmd);
if (cmd[0] == '1') {
a = 0;
do {
- serv_gets(buf);
+ CtdlIPC_getline(ipc, buf);
++a;
if (a == 1)
scr_printf("User #%s - %s ", buf, &cmd[4]);
if (do_validate) {
/* now set the access level */
ax = intprompt("Access level", ax, 0, 6);
- r = CtdlIPCValidateUser(user, ax, cmd);
+ r = CtdlIPCValidateUser(ipc, user, ax, cmd);
if (r / 100 != 2)
scr_printf("%s\n", cmd);
}
}
-void validate(void)
+void validate(CtdlIPC *ipc)
{ /* validate new users */
char cmd[SIZ];
char buf[SIZ];
int r; /* IPC response code */
do {
- r = CtdlIPCNextUnvalidatedUser(cmd);
+ r = CtdlIPCNextUnvalidatedUser(ipc, cmd);
if (r / 100 != 3)
finished = 1;
if (r / 100 == 2)
scr_printf("%s\n", cmd);
if (r / 100 == 3) {
extract(buf, cmd, 0);
- val_user(buf, 1);
+ val_user(ipc, buf, 1);
}
} while (finished == 0);
}
/*
* <.A>ide <F>ile <D>elete command
*/
-void deletefile(void)
+void deletefile(CtdlIPC *ipc)
{
char filename[32];
char buf[SIZ];
newprompt("Filename: ", filename, 31);
if (strlen(filename) == 0)
return;
- CtdlIPCDeleteFile(filename, buf);
+ CtdlIPCDeleteFile(ipc, filename, buf);
err_printf("%s\n", buf);
}
/*
* <.A>ide <F>ile <S>end command
*/
-void netsendfile(void)
+void netsendfile(CtdlIPC *ipc)
{
char filename[32], destsys[20], buf[SIZ];
if (strlen(filename) == 0)
return;
newprompt("System to send to: ", destsys, 19);
- CtdlIPCNetSendFile(filename, destsys, buf);
+ CtdlIPCNetSendFile(ipc, filename, destsys, buf);
err_printf("%s\n", buf);
return;
}
/*
* <.A>ide <F>ile <M>ove command
*/
-void movefile(void)
+void movefile(CtdlIPC *ipc)
{
char filename[64];
char newroom[ROOMNAMELEN];
if (strlen(filename) == 0)
return;
newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
- CtdlIPCMoveFile(filename, newroom, buf);
+ CtdlIPCMoveFile(ipc, filename, newroom, buf);
err_printf("%s\n", buf);
}
/*
* list of users who have filled out a bio
*/
-void list_bio(void)
+void list_bio(CtdlIPC *ipc)
{
char buf[SIZ];
int pos = 1;
- serv_puts("LBIO");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "LBIO");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] != '1') {
pprintf("%s\n", &buf[4]);
return;
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
if ((pos + strlen(buf) + 5) > screenwidth) {
pprintf("\n");
pos = 1;
/*
* read bio
*/
-void read_bio(void)
+void read_bio(CtdlIPC *ipc)
{
char who[SIZ];
char buf[SIZ];
newprompt("Read bio for who ('?' for list) : ", who, 25);
pprintf("\n");
if (!strcmp(who, "?"))
- list_bio();
+ list_bio(ipc);
} while (!strcmp(who, "?"));
snprintf(buf, sizeof buf, "RBIO %s", who);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] != '1') {
pprintf("%s\n", &buf[4]);
return;
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
pprintf("%s\n", buf);
}
}
/*
* General system configuration command
*/
-void do_system_configuration(void)
+void do_system_configuration(CtdlIPC *ipc)
{
char buf[SIZ];
char sc[31][SIZ];
memset(&sc[0][0], 0, sizeof(sc));
/* Fetch the current config */
- serv_puts("CONF get");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "CONF get");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '1') {
a = 0;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
if (a < 31) {
strcpy(&sc[a][0], buf);
}
/* Fetch the expire policy (this will silently fail on old servers,
* resulting in "default" policy)
*/
- serv_puts("GPEX site");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "GPEX site");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '2') {
expire_mode = extract_int(&buf[4], 0);
expire_value = extract_int(&buf[4], 1);
/* Save it */
scr_printf("Save this configuration? ");
if (yesno()) {
- serv_puts("CONF set");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "CONF set");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '4') {
for (a = 0; a < 31; ++a)
- serv_puts(&sc[a][0]);
- serv_puts("000");
+ CtdlIPC_putline(ipc, &sc[a][0]);
+ CtdlIPC_putline(ipc, "000");
}
snprintf(buf, sizeof buf, "SPEX site|%d|%d",
expire_mode, expire_value);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
}
}
/*
* support function for do_internet_configuration()
*/
-void get_inet_rec_type(char *buf) {
+void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
int sel;
keyopt(" <1> localhost (Alias for this computer)\n");
/*
* Internet mail configuration
*/
-void do_internet_configuration(void) {
+void do_internet_configuration(CtdlIPC *ipc)
+{
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
snprintf(buf, sizeof buf, "CONF getsys|%s", INTERNETCFG);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
+ if (buf[0] == '1') while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
newprompt("Enter host name: ",
buf, 50);
strcat(buf, "|");
- get_inet_rec_type(&buf[strlen(buf)]);
+ get_inet_rec_type(ipc, &buf[strlen(buf)]);
recs[num_recs-1] = strdup(buf);
break;
case 'd':
case 's':
snprintf(buf, sizeof buf, "CONF putsys|%s",
INTERNETCFG);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '4') {
for (i=0; i<num_recs; ++i) {
- serv_puts(recs[i]);
+ CtdlIPC_putline(ipc, recs[i]);
}
- serv_puts("000");
+ CtdlIPC_putline(ipc, "000");
}
else {
scr_printf("%s\n", &buf[4]);
/*
* Edit network configuration for room sharing, mailing lists, etc.
*/
-void network_config_management(char *entrytype, char *comment) {
+void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
+{
char filename[PATH_MAX];
char changefile[PATH_MAX];
int e_ex_code;
fprintf(tempfp, "# Specify one per line.\n"
"\n\n");
- serv_puts("GNET");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "GNET");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '1') {
- while(serv_gets(buf), strcmp(buf, "000")) {
+ while(CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
extract(instr, buf, 0);
if (!strcasecmp(instr, entrytype)) {
extract(addr, buf, 1);
if (e_ex_code == 0) { /* Save changes */
changefp = fopen(changefile, "w");
- serv_puts("GNET");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "GNET");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '1') {
- while(serv_gets(buf), strcmp(buf, "000")) {
+ while(CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
extract(instr, buf, 0);
if (strcasecmp(instr, entrytype)) {
fprintf(changefp, "%s\n", buf);
fclose(changefp);
/* now write it to the server... */
- serv_puts("SNET");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "SNET");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '4') {
changefp = fopen(changefile, "r");
if (changefp != NULL) {
while (fgets(buf, sizeof buf,
changefp) != NULL) {
buf[strlen(buf) - 1] = 0;
- serv_puts(buf);
+ CtdlIPC_putline(ipc, buf);
}
fclose(changefp);
}
- serv_puts("000");
+ CtdlIPC_putline(ipc, "000");
}
}
/*
* IGnet node configuration
*/
-void do_ignet_configuration(void) {
+void do_ignet_configuration(CtdlIPC *ipc) {
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
snprintf(buf, sizeof buf, "CONF getsys|%s", IGNETCFG);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
+ if (buf[0] == '1') while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
break;
case 's':
snprintf(buf, sizeof buf, "CONF putsys|%s", IGNETCFG);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '4') {
for (i=0; i<num_recs; ++i) {
- serv_puts(recs[i]);
+ CtdlIPC_putline(ipc, recs[i]);
}
- serv_puts("000");
+ CtdlIPC_putline(ipc, "000");
}
else {
scr_printf("%s\n", &buf[4]);
/*
* Filter list configuration
*/
-void do_filterlist_configuration(void) {
+void do_filterlist_configuration(CtdlIPC *ipc)
+{
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
snprintf(buf, sizeof buf, "CONF getsys|%s", FILTERLIST);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
+ if (buf[0] == '1') while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
break;
case 's':
snprintf(buf, sizeof buf, "CONF putsys|%s", FILTERLIST);
- serv_puts(buf);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
if (buf[0] == '4') {
for (i=0; i<num_recs; ++i) {
- serv_puts(recs[i]);
+ CtdlIPC_putline(ipc, recs[i]);
}
- serv_puts("000");
+ CtdlIPC_putline(ipc, "000");
}
else {
scr_printf("%s\n", &buf[4]);
projects / citadel.git / blobdiff