/*
- * (c) 2009 by Art Cancro and citadel.org
+ * (c) 2009-2012 by Art Cancro and citadel.org
* This program is released under the terms of the GNU General Public License v3.
*/
-#include <config.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <readline/readline.h>
#include "ctdlsh.h"
-#define CTDLDIR "/root/ctdl/trunk/citadel"
-int discover_ipgm_secret(char *dirname) {
- int fd;
- struct partial_config ccc;
- char configfile[1024];
+int cmd_quit(int sock, char *cmdbuf) {
+ return(cmdret_exit);
+}
+
- sprintf(configfile, "%s/citadel.config", dirname);
- fd = open(configfile, O_RDONLY);
- if (fd < 0) {
- fprintf(stderr, "%s: %s\n", configfile, strerror(errno));
- return(-1);
+/*
+ * Commands understood by ctdlsh
+ */
+typedef struct {
+ char *name;
+ ctdlsh_cmdfunc_t *func;
+ char *doc;
+} COMMAND;
+
+COMMAND commands[] = {
+ { "?", cmd_help, "Display this message" },
+ { "help", cmd_help, "Display this message" },
+ { "quit", cmd_quit, "Quit using ctdlsh" },
+ { "exit", cmd_quit, "Quit using ctdlsh" },
+ { "date", cmd_datetime, "Print the server's date and time" },
+ { "time", cmd_datetime, "Print the server's date and time" },
+ { "passwd", cmd_passwd, "Set or change an account password" },
+ { "shutdown", cmd_shutdown, "Shut down the Citadel server" },
+ { NULL, NULL, NULL }
+};
+
+
+int cmd_help(int sock, char *cmdbuf) {
+ int i;
+
+ for (i=0; commands[i].func != NULL; ++i) {
+ printf("%-10s %s\n", commands[i].name, commands[i].doc);
}
+}
+
+
+/* Auto-completer function */
+char *command_generator(const char *text, int state) {
+ static int list_index;
+ static int len;
+ char *name;
- if (read(fd, &ccc, sizeof(struct partial_config)) != sizeof(struct partial_config)) {
- fprintf(stderr, "%s: %s\n", configfile, strerror(errno));
- return(-1);
+ if (!state) {
+ list_index = 0;
+ len = strlen(text);
}
- if (close(fd) != 0) {
- fprintf(stderr, "%s: %s\n", configfile, strerror(errno));
- return(-1);
+
+ while (name = commands[list_index].name) {
+ ++list_index;
+
+ if (!strncmp(name, text, len)) {
+ return(strdup(name));
+ }
}
- return(ccc.c_ipgm_secret);
+
+ return(NULL);
+}
+
+
+/* Auto-completer function */
+char **ctdlsh_completion(const char *text, int start, int end) {
+ char **matches = (char **) NULL;
+
+ if (start == 0) {
+ matches = rl_completion_matches(text, command_generator);
+ }
+ else {
+ rl_bind_key('\t', rl_abort);
+ }
+
+ return (matches);
}
char buf[1024];
char server_reply[1024];
int i;
+ int ret = (-1);
strcpy(prompt, "> ");
}
}
+ /* Tell libreadline how we will help with auto-completion of commands */
+ rl_attempted_completion_function = ctdlsh_completion;
+
/* Here we go ... main command loop */
- while (cmd = readline(prompt)) {
+ while ((ret != cmdret_exit) && (cmd = readline(prompt))) {
if ((cmd) && (*cmd)) {
add_history(cmd);
- sock_puts(server_socket, cmd);
- sock_getln(server_socket, server_reply, sizeof server_reply);
- printf("%s\n", server_reply);
-
- if ((server_reply[0] == '4') || (server_reply[0] == '8')) {
- // FIXME
- }
-
- if ((server_reply[0] == '1') || (server_reply[0] == '8')) {
- while(sock_getln(server_socket, buf, sizeof buf), strcmp(buf, "000")) {
- printf("%s\n", buf);
+ for (i=0; commands[i].func != NULL; ++i) {
+ if (!strncasecmp(cmd, commands[i].name, strlen(commands[i].name))) {
+ ret = (*commands[i].func) (server_socket, cmd);
}
}
}
}
+
+/*
+ * If you don't know what main() does by now you probably shouldn't be reading this code.
+ */
int main(int argc, char **argv)
{
int server_socket = 0;
char buf[1024];
- int ipgm_secret = (-1);
int c;
char *ctdldir = CTDLDIR;
- printf("\nCitadel administration shell v" PACKAGE_VERSION "\n");
- printf("(c) 2009 citadel.org GPLv3\n");
+ printf("\nCitadel administration shell v" PACKAGE_VERSION " (c) 2009-2012 by citadel.org\n"
+ "This is open source software made available to you under the terms\n"
+ "of the GNU General Public License v3. All other rights reserved.\n"
+ );
opterr = 0;
while ((c = getopt (argc, argv, "h:")) != -1) {
}
}
- ipgm_secret = discover_ipgm_secret(ctdldir);
- if (ipgm_secret < 0) {
- exit(1);
- }
-
- printf("Attaching to server...\r");
- fflush(stdout);
- sprintf(buf, "%s/citadel.socket", ctdldir);
+ printf("Trying %s...\n", ctdldir);
+ sprintf(buf, "%s/citadel-admin.socket", ctdldir);
server_socket = uds_connectsock(buf);
if (server_socket < 0) {
exit(1);
}
- printf(" \r");
-
- sock_getln(server_socket, buf, sizeof buf);
- printf("%s\n", buf);
- sock_printf(server_socket, "IPGM %d\n", ipgm_secret);
sock_getln(server_socket, buf, sizeof buf);
- printf("%s\n", buf);
-
if (buf[0] == '2') {
do_main_loop(server_socket);
}
projects / citadel.git / blobdiff