#include <fcntl.h>
#include <stdio.h>
#include <ctype.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 <signal.h>
#include <errno.h>
#include <limits.h>
#include "citadel.h"
#include "tools.h"
-#include "ipc.h"
+#include "citadel_ipc.h"
+#include "server.h"
+#include "serv_extensions.h"
#include "config.h"
#define LOCKFILE "/tmp/LCK.sendcommand"
-struct config config;
-extern int home_specified;
-
+static CtdlIPC *ipc = NULL;
/*
* make sure only one copy of sendcommand runs at a time, using lock files
alarm(30);
signal(SIGALRM, nq_cleanup);
if (nested++ < 1)
- serv_puts("QUIT");
+ CtdlIPCQuit(ipc);
nq_cleanup(e);
}
*/
void np_attach_to_server(void)
{
- char hostbuf[256], portbuf[256];
- char buf[256];
+ char hostbuf[SIZ], portbuf[SIZ];
+ char buf[SIZ];
char *args[] =
{"sendcommand", NULL};
+ int r;
fprintf(stderr, "Attaching to server...\n");
- attach_to_server(1, args, hostbuf, portbuf);
- serv_gets(buf);
+ ipc = CtdlIPC_new(1, args, hostbuf, portbuf);
+ CtdlIPC_getline(ipc, buf);
fprintf(stderr, "%s\n", &buf[4]);
- sprintf(buf, "IPGM %d", config.c_ipgm_secret);
- serv_puts(buf);
- serv_gets(buf);
- fprintf(stderr, "%s\n", &buf[4]);
- if (buf[0] != '2') {
+ snprintf(buf, sizeof buf, "IPGM %d", config.c_ipgm_secret);
+ r = CtdlIPCInternalProgram(ipc, config.c_ipgm_secret, buf);
+ fprintf(stderr, "%s\n", buf);
+ if (r / 100 != 2) {
cleanup(2);
}
}
int main(int argc, char **argv)
{
int a;
- char cmd[256];
- char buf[256];
+ char cmd[SIZ];
+ char buf[SIZ];
strcpy(bbs_home_directory, BBSDIR);
signal(SIGHUP, cleanup);
signal(SIGTERM, cleanup);
- fprintf(stderr, "sendcommand: started. pid=%ld\n", (long) getpid());
+ fprintf(stderr, "sendcommand: started (pid=%d) "
+ "running in %s\n",
+ (int) getpid(),
+ bbs_home_directory);
fflush(stderr);
np_attach_to_server();
fflush(stderr);
fprintf(stderr, "%s\n", cmd);
- serv_puts(cmd);
- serv_gets(buf);
+ CtdlIPC_putline(ipc, cmd);
+ CtdlIPC_getline(ipc, buf);
fprintf(stderr, "%s\n", buf);
if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
printf("%s\n", buf);
}
} else if (buf[0] == '4') {
do {
- if (fgets(buf, 255, stdin) == NULL)
+ if (fgets(buf, sizeof buf, stdin) == NULL)
strcpy(buf, "000");
if (strlen(buf) > 0)
if (buf[strlen(buf) - 1] == '\n')
if (buf[strlen(buf) - 1] == '\r')
buf[strlen(buf) - 1] = 0;
if (strcmp(buf, "000"))
- serv_puts(buf);
+ CtdlIPC_putline(ipc, buf);
} while (strcmp(buf, "000"));
- serv_puts("000");
+ CtdlIPC_putline(ipc, "000");
}
fprintf(stderr, "sendcommand: processing ended.\n");
cleanup(0);