-/*
- * Command-line utility to transmit a server command.
- *
- * Copyright (c) 1987-2012 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
+// Command-line utility to transmit a server command.
+//
+// Copyright (c) 1987-2022 by the citadel.org team
+//
+// This program is open source software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <limits.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include "citadel.h"
-#include "include/citadel_dirs.h"
-
-
+#include "../server/citadel.h"
+#include "../server/citadel_dirs.h"
+#include <libcitadel.h>
int serv_sock = (-1);
-
-int uds_connectsock(char *sockpath)
-{
+int uds_connectsock(char *sockpath) {
int s;
struct sockaddr_un addr;
}
-/*
- * input binary data from socket
- */
-void serv_read(char *buf, int bytes)
-{
+// input binary data from socket
+void serv_read(char *buf, int bytes) {
int len, rlen;
len = 0;
}
-/*
- * send binary to server
- */
-void serv_write(char *buf, int nbytes)
-{
+// send binary to server
+void serv_write(char *buf, int nbytes) {
int bytes_written = 0;
int retval;
while (bytes_written < nbytes) {
}
-
-/*
- * input string from socket - implemented in terms of serv_read()
- */
-void serv_gets(char *buf)
-{
+// input string from socket - implemented in terms of serv_read()
+void serv_gets(char *buf) {
int i;
- /* Read one character at a time.
- */
+ // Read one character at a time.
for (i = 0;; i++) {
serv_read(&buf[i], 1);
if (buf[i] == '\n' || i == (SIZ-1))
break;
}
- /* If we got a long line, discard characters until the newline.
- */
+ // If we got a long line, discard characters until the newline.
if (i == (SIZ-1)) {
while (buf[i] != '\n') {
serv_read(&buf[i], 1);
}
}
- /* Strip all trailing nonprintables (crlf)
- */
+ // Strip all trailing nonprintables (crlf)
buf[i] = 0;
}
-/*
- * send line to server - implemented in terms of serv_write()
- */
-void serv_puts(char *buf)
-{
+// send line to server - implemented in terms of serv_write()
+void serv_puts(char *buf) {
serv_write(buf, strlen(buf));
serv_write("\n", 1);
}
-
-
-/*
- * Main loop. Do things and have fun.
- */
-int main(int argc, char **argv)
-{
+// Main loop. Do things and have fun.
+int main(int argc, char **argv) {
int a;
int watchdog = 60;
char buf[SIZ];
int xfermode = 0;
- int relh=0;
- int home=0;
- char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
- /* Parse command line */
+ // Parse command line
while ((a = getopt(argc, argv, "h:w:")) != EOF) {
switch (a) {
case 'h':
- relh=optarg[0]!='/';
- if (!relh) {
- strncpy(ctdl_home_directory, optarg, sizeof ctdl_home_directory);
- } else {
- strncpy(relhome, optarg, sizeof relhome);
- }
- home = 1;
+ strncpy(ctdldir, optarg, sizeof ctdldir);
break;
case 'w':
watchdog = atoi(optarg);
+ break;
default:
fprintf(stderr, "sendcommand: usage: sendcommand [-h server_dir] [-w watchdog_timeout]\n");
return(1);
}
}
- calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
-
- fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server at %s\n",
+ fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server with data directory %s\n",
(int) getpid(),
- file_citadel_admin_socket
+ ctdldir
);
fflush(stderr);
+ if (chdir(ctdldir) != 0) {
+ fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+ exit(errno);
+ }
+
alarm(watchdog);
serv_sock = uds_connectsock(file_citadel_admin_socket);
-
serv_gets(buf);
fprintf(stderr, "%s\n", buf);
xfermode = buf[0];
- if ((xfermode == '4') || (xfermode == '8')) { /* send text */
- while (fgets(buf, sizeof buf, stdin)) {
- buf[strlen(buf)-1] = 0;
+ if ((xfermode == '4') || (xfermode == '8')) { // send text
+ while (fgets(buf, sizeof buf, stdin) > 0) {
+ if (buf[strlen(buf)-1] == '\n') {
+ buf[strlen(buf)-1] = 0;
+ }
serv_puts(buf);
- alarm(watchdog); /* reset the watchdog timer */
}
serv_puts("000");
}
- if ((xfermode == '1') || (xfermode == '8')) { /* receive text */
- while (serv_gets(buf), strcmp(buf, "000")) {
+ if ((xfermode == '1') || (xfermode == '8')) { // receive text
+ while(serv_gets(buf), strcmp(buf, "000")) {
printf("%s\n", buf);
- alarm(watchdog); /* reset the watchdog timer */
}
}
- if (xfermode == '6') { /* receive binary */
+ if (xfermode == '6') { // receive binary
size_t len = atoi(&buf[4]);
size_t bytes_remaining = len;
}
close(serv_sock);
- alarm(0); /* cancel the watchdog timer */
+ alarm(0); // cancel the watchdog timer
+
fprintf(stderr, "sendcommand: processing ended.\n");
if (xfermode == '5') {
return(1);
}
return(0);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
projects / citadel.git / blobdiff