#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 "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);
}
/*
* Connect sendcommand to the Citadel server running on this computer.
*/
-void np_attach_to_server(void)
+void np_attach_to_server(char *host, char *port)
{
+ char buf[SIZ];
char hostbuf[256], portbuf[256];
- char buf[256];
char *args[] =
{"sendcommand", NULL};
+ int r;
fprintf(stderr, "Attaching to server...\n");
- attach_to_server(1, args, hostbuf, portbuf);
- serv_gets(buf);
- fprintf(stderr, "%s\n", &buf[4]);
- sprintf(buf, "IPGM %d", config.c_ipgm_secret);
- serv_puts(buf);
- serv_gets(buf);
+ strcpy(hostbuf, host);
+ strcpy(portbuf, port);
+ ipc = CtdlIPC_new(1, args, hostbuf, portbuf);
+ if (!ipc) {
+ fprintf(stderr, "Can't connect: %s\n", strerror(errno));
+ exit(3);
+ }
+ CtdlIPC_chat_recv(ipc, 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);
}
}
+void sendcommand_die(void) {
+ exit(0);
+}
+
/*
* main
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);
+ int relh=0;
+ int home=0;
+ char relhome[PATH_MAX]="";
+ char ctdldir[PATH_MAX]=CTDLDIR;
+ fd_set read_fd;
+ struct timeval tv;
+ int ret, err;
+
+ strcpy(ctdl_home_directory, DEFAULT_PORT);
strcpy(cmd, "");
/*
*/
for (a = 1; a < argc; ++a) {
if (!strncmp(argv[a], "-h", 2)) {
- strcpy(bbs_home_directory, argv[a]);
- strcpy(bbs_home_directory, &bbs_home_directory[2]);
+ relh=argv[a][2]!='/';
+ if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
+ sizeof ctdl_home_directory);
+ else
+ safestrncpy(relhome, &argv[a][2],
+ sizeof relhome);
home_specified = 1;
+ home=1;
} else {
- if (strlen(cmd) > 0)
+ if (!IsEmptyStr(cmd))
strcat(cmd, " ");
strcat(cmd, argv[a]);
}
}
+ calc_dirs_n_files(relh, home, relhome, ctdldir);
get_config();
signal(SIGINT, cleanup);
signal(SIGHUP, cleanup);
signal(SIGTERM, cleanup);
- fprintf(stderr, "sendcommand: started. pid=%ld\n", (long) getpid());
- fprintf(stderr, "Running from %s\n", bbs_home_directory);
+ fprintf(stderr, "sendcommand: started (pid=%d) "
+ "running in %s\n",
+ (int) getpid(),
+ ctdl_home_directory);
fflush(stderr);
- np_attach_to_server();
+ np_attach_to_server(UDS, ctdl_home_directory);
fflush(stderr);
+ setIPCDeathHook(sendcommand_die);
fprintf(stderr, "%s\n", cmd);
- serv_puts(cmd);
- serv_gets(buf);
+ CtdlIPC_chat_send(ipc, cmd);
+ CtdlIPC_chat_recv(ipc, buf);
fprintf(stderr, "%s\n", buf);
+ tv.tv_sec = 0;
+ tv.tv_usec = 1000;
+
if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (CtdlIPC_chat_recv(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 (!IsEmptyStr(buf))
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
- if (strlen(buf) > 0)
+ if (!IsEmptyStr(buf))
if (buf[strlen(buf) - 1] == '\r')
buf[strlen(buf) - 1] = 0;
if (strcmp(buf, "000"))
- serv_puts(buf);
+ CtdlIPC_chat_send(ipc, buf);
+
+ FD_ZERO(&read_fd);
+ FD_SET(ipc->sock, &read_fd);
+ ret = select(ipc->sock+1, &read_fd, NULL, NULL, &tv);
+ err = errno;
+ if (err!=0)
+ printf("select failed: %d", err);
+
+ if (ret == -1) {
+ if (!(errno == EINTR || errno == EAGAIN))
+ printf("select failed: %d", err);
+ return 1;
+ }
+
+ if (ret != 0) {
+ size_t n;
+ char rbuf[SIZ];
+
+ rbuf[0] = '\0';
+ n = read(ipc->sock, rbuf, SIZ);
+ if (n>0) {
+ rbuf[n]='\0';
+ printf (rbuf);
+ }
+ }
} while (strcmp(buf, "000"));
- serv_puts("000");
+ CtdlIPC_chat_send(ipc, "\n");
+ CtdlIPC_chat_send(ipc, "000");
}
fprintf(stderr, "sendcommand: processing ended.\n");
cleanup(0);
projects / citadel.git / blobdiff