/* Exported variables */
-
#ifdef HAVE_CYGWIN
int rl_catch_signals;
#else
extern int rl_catch_signals;
#endif
+#ifdef HAVE_CONIO
+extern int input_line(char *line, int len);
+extern void con_init(FILE *input);
+extern void con_term();
+extern void con_set_zed_keys();
+extern void t_sendl(char *buf, int len);
+extern void t_send(char *buf);
+extern void t_char(char c);
+#else
+#define con_init(x)
+#define con_term()
+#define con_set_zed_keys();
+#endif
+
/* Forward referenced functions */
static void terminate_console(int sig);
int get_cmd(FILE *input, char *prompt, BSOCK *sock, int sec);
static int do_outputcmd(FILE *input, BSOCK *UA_sock);
-static void sendit(char *fmt, ...);
+void senditf(char *fmt, ...);
+void sendit(char *buf);
/* Static variables */
static char *configfile = NULL;
static int sleepcmd(FILE *input, BSOCK *UA_sock);
-#define CONFIG_FILE "./console.conf" /* default configuration file */
+#define CONFIG_FILE "./bconsole.conf" /* default configuration file */
static void usage()
{
fprintf(stderr, _(
"\nVersion: " VERSION " (" BDATE ") %s %s %s\n\n"
-"Usage: console [-s] [-c config_file] [-d debug_level] [config_file]\n"
+"Usage: bconsole [-s] [-c config_file] [-d debug_level] [config_file]\n"
" -c <file> set configuration file to file\n"
" -dnn set debug level to nn\n"
" -s no signals\n"
// printf("Got tin\n");
}
+static int zed_keyscmd(FILE *input, BSOCK *UA_sock)
+{
+ con_set_zed_keys();
+ return 1;
+}
+
+/*
+ * These are the @command
+ */
struct cmdstruct { char *key; int (*func)(FILE *input, BSOCK *UA_sock); char *help; };
static struct cmdstruct commands[] = {
{ N_("input"), inputcmd, _("input from file")},
{ N_("time"), timecmd, _("print current time")},
{ N_("version"), versioncmd, _("print Console's version")},
{ N_("exit"), quitcmd, _("exit = quit")},
+ { N_("zed_keyst"), zed_keyscmd, _("zed_keys = use zed keys instead of bash keys")},
};
#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
if (!found) {
pm_strcat(&UA_sock->msg, _(": is an illegal command\n"));
UA_sock->msglen = strlen(UA_sock->msg);
- fputs(UA_sock->msg, output);
- fflush(output);
+ sendit(UA_sock->msg);
}
return stat;
}
if (fgets(UA_sock->msg, len, input) == NULL) {
stat = -1;
} else {
- sendit("%s", UA_sock->msg); /* echo to terminal */
+ sendit(UA_sock->msg); /* echo to terminal */
strip_trailing_junk(UA_sock->msg);
UA_sock->msglen = strlen(UA_sock->msg);
stat = 1;
at_prompt = FALSE;
}
if (!stop) {
- sendit("%s", UA_sock->msg);
+ sendit(UA_sock->msg);
}
}
if (!stop) {
JCR jcr;
init_stack_dump();
- my_name_is(argc, argv, "console");
+ my_name_is(argc, argv, "bconsole");
textdomain("bacula-console");
init_msg(NULL, NULL);
working_directory = "/tmp";
while ((ch = getopt(argc, argv, "bc:d:r:st?")) != -1) {
switch (ch) {
- case 'c': /* configuration file */
- if (configfile != NULL) {
- free(configfile);
- }
- configfile = bstrdup(optarg);
- break;
+ case 'c': /* configuration file */
+ if (configfile != NULL) {
+ free(configfile);
+ }
+ configfile = bstrdup(optarg);
+ break;
- case 'd':
- debug_level = atoi(optarg);
- if (debug_level <= 0) {
- debug_level = 1;
- }
- break;
+ case 'd':
+ debug_level = atoi(optarg);
+ if (debug_level <= 0) {
+ debug_level = 1;
+ }
+ break;
- case 's': /* turn off signals */
- no_signals = TRUE;
- break;
+ case 's': /* turn off signals */
+ no_signals = TRUE;
+ break;
- case 't':
- test_config = TRUE;
- break;
+ case 't':
+ test_config = TRUE;
+ break;
- case '?':
- default:
- usage();
+ case '?':
+ default:
+ usage();
}
}
memset(&jcr, 0, sizeof(jcr));
+ con_init(stdin);
+
if (ndir > 1) {
UA_sock = init_bsock(NULL, 0, "", "", 0);
try_again:
LockRes();
ndir = 0;
for (dir = NULL; (dir = (DIRRES *)GetNextRes(R_DIRECTOR, (RES *)dir)); ) {
- fprintf(output, _("%d %s at %s:%d\n"), 1+ndir++, dir->hdr.name, dir->address,
+ senditf( _("%d %s at %s:%d\n"), 1+ndir++, dir->hdr.name, dir->address,
dir->DIRport);
}
UnlockRes();
}
item = atoi(UA_sock->msg);
if (item < 0 || item > ndir) {
- sendit(_("You must enter a number between 1 and %d\n"), ndir);
+ senditf(_("You must enter a number between 1 and %d\n"), ndir);
goto try_again;
}
LockRes();
}
- sendit(_("Connecting to Director %s:%d\n"), dir->address,dir->DIRport);
+ senditf(_("Connecting to Director %s:%d\n"), dir->address,dir->DIRport);
UA_sock = bnet_connect(NULL, 5, 15, "Director daemon", dir->address,
NULL, dir->DIRport, 0);
if (UA_sock == NULL) {
Dmsg0(40, "Opened connection with Director daemon\n");
+ sendit(_("Enter a period to cancel a command.\n"));
+
+ char *env = getenv("HOME");
+ if (env) {
+ FILE *fd;
+ pm_strcpy(&UA_sock->msg, env);
+ pm_strcat(&UA_sock->msg, "/.bconsolerc");
+ fd = fopen(UA_sock->msg, "r");
+ if (fd) {
+ read_and_process_input(fd, UA_sock);
+ fclose(fd);
+ }
+ }
+
+
read_and_process_input(stdin, UA_sock);
if (UA_sock) {
}
already_here = TRUE;
free_pool_memory(args);
+ con_term();
if (sig != 0) {
exit(1);
}
if (!line) {
exit(1);
}
- strcpy(sock->msg, line);
- strip_trailing_junk(sock->msg);
- sock->msglen = strlen(sock->msg);
+ strip_trailing_junk(line);
+ sock->msglen = pm_strcpy(&sock->msg, line);
if (sock->msglen) {
add_history(sock->msg);
}
int len;
if (!stop) {
if (output == stdout || tee) {
- fputs(prompt, stdout);
- fflush(stdout);
+ sendit(prompt);
}
}
again:
sleep(1);
goto again;
}
+#ifdef HAVE_CONIO
+ if (isatty(fileno(input))) {
+ input_line(sock->msg, len);
+ break;
+ }
+#endif
if (fgets(sock->msg, len, input) == NULL) {
return -1;
}
static int versioncmd(FILE *input, BSOCK *UA_sock)
{
- sendit("Version: " VERSION " (" BDATE ") %s %s %s\n",
+ senditf("Version: " VERSION " (" BDATE ") %s %s %s\n",
HOST_OS, DISTNAME, DISTVER);
return 1;
}
}
fd = fopen(argk[1], "r");
if (!fd) {
- sendit(_("Cannot open file %s for input. ERR=%s\n"),
+ senditf(_("Cannot open file %s for input. ERR=%s\n"),
argk[1], strerror(errno));
return 1;
}
}
fd = fopen(argk[1], mode);
if (!fd) {
- sendit(_("Cannot open file %s for output. ERR=%s\n"),
+ senditf(_("Cannot open file %s for output. ERR=%s\n"),
argk[1], strerror(errno));
return 1;
}
struct tm tm;
localtime_r(&ttime, &tm);
strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm);
- sendit(sdt);
sendit("\n");
return 1;
}
-static void sendit(char *fmt,...)
+/*
+ * Send a line to the output file and or the terminal
+ */
+void senditf(char *fmt,...)
{
char buf[3000];
va_list arg_ptr;
va_start(arg_ptr, fmt);
bvsnprintf(buf, sizeof(buf), (char *)fmt, arg_ptr);
va_end(arg_ptr);
+ sendit(buf);
+}
+
+void sendit(char *buf)
+{
+#ifdef HAVE_CONIO
+ if (output == stdout || tee) {
+ char *p, *q;
+ /*
+ * Here, we convert every \n into \r\n because the
+ * terminal is in raw mode when we are using
+ * conio.
+ */
+ for (p=q=buf; (p=strchr(q, '\n')); ) {
+ if (p-q > 0) {
+ t_sendl(q, p-q);
+ }
+ t_sendl("\r\n", 2);
+ q = ++p; /* point after \n */
+ }
+ if (*q) {
+ t_send(q);
+ }
+ }
+ if (output != stdout) {
+ fputs(buf, output);
+ }
+#else
fputs(buf, output);
if (tee) {
fputs(buf, stdout);
}
fflush(stdout);
+#endif
}
projects / bacula / bacula / blobdiff