+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2018 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+*/
/*
*
* Bacula Console interface to the Director
*
* Kern Sibbald, September MM
*
- * Version $Id$
- */
-/*
- Copyright (C) 2000-2006 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- 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
- the file LICENSE for additional details.
-
*/
#include "bacula.h"
#include "console_conf.h"
#include "jcr.h"
-#ifdef HAVE_CONIO
+
+#if defined(HAVE_CONIO)
#include "conio.h"
-#else
+//#define CONIO_FIX 1
+#else /* defined(HAVE_READLINE) || "DUMB" */
#define con_init(x)
#define con_term()
#define con_set_zed_keys();
-#define trapctlc()
-#define clrbrk()
-#define usrbrk() 0
#endif
-#ifdef HAVE_WIN32
-#include <windows.h>
-#include "../lib/winapi.h"
+void trapctlc();
+void clrbrk();
+int usrbrk();
+static int brkflg = 0; /* set on user break */
+
+#if defined(HAVE_WIN32)
#define isatty(fd) (fd==0)
#endif
/* Exported variables */
-#ifdef HAVE_CYGWIN
-int rl_catch_signals;
-#else
-extern int rl_catch_signals;
-#endif
+//extern int rl_catch_signals;
/* Imported functions */
-int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
+int authenticate_director(BSOCK *dir, DIRRES *director, CONRES *cons);
/* Forward referenced functions */
static void terminate_console(int sig);
/* Static variables */
static char *configfile = NULL;
static BSOCK *UA_sock = NULL;
-static DIRRES *dir;
+static DIRRES *dir = NULL;
+static CONRES *cons = NULL;
static FILE *output = stdout;
-static bool tee = false; /* output to output and stdout */
+static bool teeout = false; /* output to output and stdout */
+static bool teein = false; /* input to output and stdout */
static bool stop = false;
+static bool no_conio = false;
+static int timeout = 0;
static int argc;
static int numdir;
static POOLMEM *args;
static char *argk[MAX_CMD_ARGS];
static char *argv[MAX_CMD_ARGS];
+static CONFIG *config;
/* Command prototypes */
static int inputcmd(FILE *input, BSOCK *UA_sock);
static int outputcmd(FILE *input, BSOCK *UA_sock);
static int teecmd(FILE *input, BSOCK *UA_sock);
+static int teeallcmd(FILE *input, BSOCK *UA_sock);
static int quitcmd(FILE *input, BSOCK *UA_sock);
+static int helpcmd(FILE *input, BSOCK *UA_sock);
+static int echocmd(FILE *input, BSOCK *UA_sock);
static int timecmd(FILE *input, BSOCK *UA_sock);
static int sleepcmd(FILE *input, BSOCK *UA_sock);
+static int execcmd(FILE *input, BSOCK *UA_sock);
+static int putfilecmd(FILE *input, BSOCK *UA_sock);
+
+#ifdef HAVE_READLINE
+static int eolcmd(FILE *input, BSOCK *UA_sock);
+
+# ifndef HAVE_REGEX_H
+# include "lib/bregex.h"
+# else
+# include <regex.h>
+# endif
+
+#endif
-#define CONFIG_FILE "./bconsole.conf" /* default configuration file */
+#define CONFIG_FILE "bconsole.conf" /* default configuration file */
static void usage()
{
fprintf(stderr, _(
-"Copyright (C) 2000-2005 Kern Sibbald\n"
-"\nVersion: " VERSION " (" BDATE ") %s %s %s\n\n"
+PROG_COPYRIGHT
+"\n%sVersion: " VERSION " (" BDATE ") %s %s %s\n\n"
"Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
+" -D <dir> select a Director\n"
+" -l list Directors defined\n"
+" -L list Consoles defined\n"
+" -C <cons> select a console\n"
" -c <file> set configuration file to file\n"
-" -dnn set debug level to nn\n"
+" -d <nn> set debug level to <nn>\n"
+" -dt print timestamp in debug output\n"
+" -n no conio\n"
" -s no signals\n"
+" -u <nn> set command execution timeout to <nn> seconds\n"
" -t test - read configuration and exit\n"
" -? print this message.\n"
-"\n"), HOST_OS, DISTNAME, DISTVER);
+"\n"), 2000, BDEMO, HOST_OS, DISTNAME, DISTVER);
}
{ N_("output"), outputcmd, _("output to file")},
{ N_("quit"), quitcmd, _("quit")},
{ N_("tee"), teecmd, _("output to file and terminal")},
+ { N_("tall"), teeallcmd, _("output everything to file and terminal (tee all)")},
{ N_("sleep"), sleepcmd, _("sleep specified time")},
{ N_("time"), timecmd, _("print current time")},
{ N_("version"), versioncmd, _("print Console's version")},
+ { N_("echo"), echocmd, _("echo command string")},
+ { N_("exec"), execcmd, _("execute an external command")},
{ N_("exit"), quitcmd, _("exit = quit")},
- { N_("zed_keyst"), zed_keyscmd, _("zed_keys = use zed keys instead of bash keys")},
+ { N_("putfile"), putfilecmd, _("send a file to the director")},
+ { N_("zed_keys"), zed_keyscmd, _("zed_keys = use zed keys instead of bash keys")},
+ { N_("help"), helpcmd, _("help listing")},
+#ifdef HAVE_READLINE
+ { N_("separator"), eolcmd, _("set command separator")},
+#endif
};
-#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
+#define comsize ((int)(sizeof(commands)/sizeof(struct cmdstruct)))
static int do_a_command(FILE *input, BSOCK *UA_sock)
{
}
}
if (!found) {
- pm_strcat(&UA_sock->msg, _(": is an illegal command\n"));
+ pm_strcat(&UA_sock->msg, _(": is an invalid command\n"));
UA_sock->msglen = strlen(UA_sock->msg);
sendit(UA_sock->msg);
}
return stat;
}
+/* When getting .api command, we can ignore some signals, so we set
+ * api_mode=true
+ */
+static bool api_mode=false;
+
+static bool ignore_signal(int stat, BSOCK *s)
+{
+ /* Not in API mode */
+ if (!api_mode) {
+ return false;
+ }
+
+ /* not a signal */
+ if (stat != -1) {
+ return false;
+ }
+
+ /* List signal that should not stop the read loop */
+ Dmsg1(100, "Got signal %s\n", bnet_sig_to_ascii(s->msglen));
+ switch(s->msglen) {
+ case BNET_CMD_BEGIN:
+ case BNET_CMD_FAILED: /* might want to print **ERROR** */
+ case BNET_CMD_OK: /* might want to print **OK** */
+ case BNET_MSGS_PENDING:
+ return true;
+ default:
+ break;
+ }
+
+ /* The signal should break the read loop */
+ return false;
+}
static void read_and_process_input(FILE *input, BSOCK *UA_sock)
{
bool at_prompt = false;
int tty_input = isatty(fileno(input));
int stat;
+ btimer_t *tid=NULL;
for ( ;; ) {
if (at_prompt) { /* don't prompt multiple times */
}
if (tty_input) {
stat = get_cmd(input, prompt, UA_sock, 30);
- if (usrbrk() == 1) {
+ if (usrbrk() >= 1) {
clrbrk();
}
if (usrbrk()) {
}
} else {
/* Reading input from a file */
- int len = sizeof_pool_memory(UA_sock->msg) - 1;
if (usrbrk()) {
break;
}
- if (fgets(UA_sock->msg, len, input) == NULL) {
+ if (bfgets(UA_sock->msg, input) == NULL) {
stat = -1;
} else {
sendit(UA_sock->msg); /* echo to terminal */
break; /* error or interrupt */
} else if (stat == 0) { /* timeout */
if (strcmp(prompt, "*") == 0) {
- bnet_fsend(UA_sock, ".messages");
+ tid = start_bsock_timer(UA_sock, timeout);
+ UA_sock->fsend(".messages");
+ stop_bsock_timer(tid);
} else {
continue;
}
} else {
- at_prompt = FALSE;
+ at_prompt = false;
/* @ => internal command for us */
if (UA_sock->msg[0] == '@') {
parse_args(UA_sock->msg, &args, &argc, argk, argv, MAX_CMD_ARGS);
}
continue;
}
- if (!bnet_send(UA_sock)) { /* send command */
+ tid = start_bsock_timer(UA_sock, timeout);
+ if (!UA_sock->send()) { /* send command */
+ stop_bsock_timer(tid);
break; /* error */
}
+ stop_bsock_timer(tid);
+ }
+ if (strncasecmp(UA_sock->msg, ".api", 4) == 0) {
+ api_mode = true;
}
- if (strcmp(UA_sock->msg, ".quit") == 0 || strcmp(UA_sock->msg, ".exit") == 0) {
+ if (strcasecmp(UA_sock->msg, ".quit") == 0 || strcasecmp(UA_sock->msg, ".exit") == 0) {
break;
}
- while ((stat = bnet_recv(UA_sock)) >= 0) {
+ tid = start_bsock_timer(UA_sock, timeout);
+ while (1) {
+ stat = UA_sock->recv();
+ if (ignore_signal(stat, UA_sock)) {
+ continue;
+ }
+
+ if (stat < 0) {
+ break;
+ }
+
if (at_prompt) {
if (!stop) {
sendit("\n");
sendit(UA_sock->msg);
}
}
+ stop_bsock_timer(tid);
if (usrbrk() > 1) {
break;
} else {
if (!stop) {
fflush(stdout);
}
- if (is_bnet_stop(UA_sock)) {
+ if (UA_sock->is_stop()) {
break; /* error or term */
} else if (stat == BNET_SIGNAL) {
- if (UA_sock->msglen == BNET_PROMPT) {
+ if (UA_sock->msglen == BNET_SUB_PROMPT) {
at_prompt = true;
}
- Dmsg1(100, "Got poll %s\n", bnet_sig_to_ascii(UA_sock));
+ Dmsg1(100, "Got poll %s\n", bnet_sig_to_ascii(UA_sock->msglen));
}
}
}
/*
* Call-back for reading a passphrase for an encrypted PEM file
- * This function uses getpass(),
+ * This function uses getpass(),
* which uses a static buffer and is NOT thread-safe.
*/
static int tls_pem_callback(char *buf, int size, const void *userdata)
{
#ifdef HAVE_TLS
-# ifdef HAVE_MINGW
const char *prompt = (const char *)userdata;
- sendit(prompt)
+# if defined(HAVE_WIN32)
+ sendit(prompt);
if (win32_cgets(buf, size) == NULL) {
buf[0] = 0;
return 0;
return strlen(buf);
}
# else
- const char *prompt = (const char *)userdata;
char *passwd;
passwd = getpass(prompt);
#endif
}
+#ifdef HAVE_READLINE
+#define READLINE_LIBRARY 1
+#include "readline.h"
+#include "history.h"
+
+/* Get the first keyword of the line */
+static char *
+get_first_keyword()
+{
+ char *ret=NULL;
+ int len;
+ char *first_space = strchr(rl_line_buffer, ' ');
+ if (first_space) {
+ len = first_space - rl_line_buffer;
+ ret = (char *) malloc((len + 1) * sizeof(char));
+ memcpy(ret, rl_line_buffer, len);
+ ret[len]=0;
+ }
+ return ret;
+}
+
+/*
+ * Return the command before the current point.
+ * Set nb to the number of command to skip
+ */
+static char *
+get_previous_keyword(int current_point, int nb)
+{
+ int i, end=-1, start, inquotes=0;
+ char *s=NULL;
+
+ while (nb-- >= 0) {
+ /* first we look for a space before the current word */
+ for (i = current_point; i >= 0; i--) {
+ if (rl_line_buffer[i] == ' ' || rl_line_buffer[i] == '=') {
+ break;
+ }
+ }
+
+ /* find the end of the command */
+ for (; i >= 0; i--) {
+ if (rl_line_buffer[i] != ' ') {
+ end = i;
+ break;
+ }
+ }
+
+ /* no end of string */
+ if (end == -1) {
+ return NULL;
+ }
+
+ /* look for the start of the command */
+ for (start = end; start > 0; start--) {
+ if (rl_line_buffer[start] == '"') {
+ inquotes = !inquotes;
+ }
+ if ((rl_line_buffer[start - 1] == ' ') && inquotes == 0) {
+ break;
+ }
+ current_point = start;
+ }
+ }
+
+ s = (char *)malloc(end - start + 2);
+ memcpy(s, rl_line_buffer + start, end - start + 1);
+ s[end - start + 1] = 0;
+
+ // printf("=======> %i:%i <%s>\n", start, end, s);
+
+ return s;
+}
+
+/* Simple structure that will contain the completion list */
+struct ItemList {
+ alist list;
+};
+
+static ItemList *items = NULL;
+void init_items()
+{
+ if (!items) {
+ items = (ItemList*) malloc(sizeof(ItemList));
+ memset(items, 0, sizeof(ItemList));
+
+ } else {
+ items->list.destroy();
+ }
+
+ items->list.init();
+}
+
+/* Match a regexp and add the result to the items list
+ * This function is recursive
+ */
+static void match_kw(regex_t *preg, const char *what, int len, POOLMEM **buf)
+{
+ int rc, size;
+ int nmatch=20;
+ regmatch_t pmatch[nmatch];
+
+ if (len <= 0) {
+ return;
+ }
+ rc = regexec(preg, what, nmatch, pmatch, 0);
+ if (rc == 0) {
+#if 0
+ Pmsg1(0, "\n\n%s\n0123456789012345678901234567890123456789\n 10 20 30\n", what);
+ Pmsg2(0, "%i-%i\n", pmatch[0].rm_so, pmatch[0].rm_eo);
+ Pmsg2(0, "%i-%i\n", pmatch[1].rm_so, pmatch[1].rm_eo);
+ Pmsg2(0, "%i-%i\n", pmatch[2].rm_so, pmatch[2].rm_eo);
+ Pmsg2(0, "%i-%i\n", pmatch[3].rm_so, pmatch[3].rm_eo);
+#endif
+ size = pmatch[1].rm_eo - pmatch[1].rm_so;
+ *buf = check_pool_memory_size(*buf, size + 1);
+ memcpy(*buf, what+pmatch[1].rm_so, size);
+ (*buf)[size] = 0;
+
+ items->list.append(bstrdup(*buf));
+ /* We search for the next keyword in the line */
+ match_kw(preg, what + pmatch[1].rm_eo, len - pmatch[1].rm_eo, buf);
+ }
+}
+
+/* fill the items list with the output of the help command */
+void get_arguments(const char *what)
+{
+ regex_t preg;
+ POOLMEM *buf;
+ int rc;
+ init_items();
+
+ rc = regcomp(&preg, "(([a-z]+=)|([a-z]+)( |$))", REG_EXTENDED);
+ if (rc != 0) {
+ return;
+ }
+
+ buf = get_pool_memory(PM_MESSAGE);
+ UA_sock->fsend(".help item=%s", what);
+ while (UA_sock->recv() > 0) {
+ strip_trailing_junk(UA_sock->msg);
+ match_kw(&preg, UA_sock->msg, UA_sock->msglen, &buf);
+ }
+ free_pool_memory(buf);
+ regfree(&preg);
+}
+
+/* retreive a simple list (.pool, .client) and store it into items */
+void get_items(const char *what)
+{
+ init_items();
+
+ UA_sock->fsend("%s", what);
+ while (UA_sock->recv() > 0) {
+ strip_trailing_junk(UA_sock->msg);
+ items->list.append(bstrdup(UA_sock->msg));
+ }
+}
+
+typedef enum
+{
+ ITEM_ARG, /* item with simple list like .jobs */
+ ITEM_HELP /* use help item=xxx and detect all arguments */
+} cpl_item_t;
+
+/* Generator function for command completion. STATE lets us know whether
+ * to start from scratch; without any state (i.e. STATE == 0), then we
+ * start at the top of the list.
+ */
+static char *item_generator(const char *text, int state,
+ const char *item, cpl_item_t type)
+{
+ static int list_index, len;
+ char *name;
+
+ /* If this is a new word to complete, initialize now. This includes
+ * saving the length of TEXT for efficiency, and initializing the index
+ * variable to 0.
+ */
+ if (!state)
+ {
+ list_index = 0;
+ len = strlen(text);
+ switch(type) {
+ case ITEM_ARG:
+ get_items(item);
+ break;
+ case ITEM_HELP:
+ get_arguments(item);
+ break;
+ }
+ }
+
+ /* Return the next name which partially matches from the command list. */
+ while (items && list_index < items->list.size())
+ {
+ name = (char *)items->list[list_index];
+ list_index++;
+
+ if (strncmp(name, text, len) == 0) {
+ char *ret = (char *) actuallymalloc(strlen(name)+1);
+ strcpy(ret, name);
+ return ret;
+ }
+ }
+
+ /* If no names matched, then return NULL. */
+ return ((char *)NULL);
+}
+
+/* gobal variables for the type and the item to search
+ * the readline API doesn' permit to pass user data.
+ */
+static const char *cpl_item;
+static cpl_item_t cpl_type;
+
+static char *cpl_generator(const char *text, int state)
+{
+ return item_generator(text, state, cpl_item, cpl_type);
+}
+
+/* this function is used to not use the default filename completion */
+static char *dummy_completion_function(const char *text, int state)
+{
+ return NULL;
+}
+
+struct cpl_keywords_t {
+ const char *key;
+ const char *cmd;
+};
+
+static struct cpl_keywords_t cpl_keywords[] = {
+ {"pool=", ".pool" },
+ {"fileset=", ".fileset" },
+ {"client=", ".client" },
+ {"job=", ".jobs" },
+ {"restore_job=",".jobs type=R" },
+ {"level=", ".level" },
+ {"storage=", ".storage" },
+ {"schedule=", ".schedule" },
+ {"volume=", ".media" },
+ {"oldvolume=", ".media" },
+ {"volstatus=", ".volstatus" },
+ {"ls", ".ls" },
+ {"cd", ".lsdir" },
+ {"mark", ".ls" },
+ {"m", ".ls" },
+ {"unmark", ".lsmark" },
+ {"catalog=", ".catalogs" },
+ {"actiononpurge=", ".actiononpurge" },
+ {"tags=", ".tags" },
+ {"recylepool=", ".pool" },
+ {"allfrompool=",".pool" }
+};
+#define key_size ((int)(sizeof(cpl_keywords)/sizeof(struct cpl_keywords_t)))
+
+/* Attempt to complete on the contents of TEXT. START and END bound the
+ * region of rl_line_buffer that contains the word to complete. TEXT is
+ * the word to complete. We can use the entire contents of rl_line_buffer
+ * in case we want to do some simple parsing. Return the array of matches,
+ * or NULL if there aren't any.
+ */
+static char **readline_completion(const char *text, int start, int end)
+{
+ bool found=false;
+ char **matches;
+ char *s, *cmd;
+ matches = (char **)NULL;
+
+ /* If this word is at the start of the line, then it is a command
+ * to complete. Otherwise it is the name of a file in the current
+ * directory.
+ */
+ s = get_previous_keyword(start, 0);
+ cmd = get_first_keyword();
+ if (s) {
+ for (int i=0; i < key_size; i++) {
+ if (!strcasecmp(s, cpl_keywords[i].key)) {
+ cpl_item = cpl_keywords[i].cmd;
+ cpl_type = ITEM_ARG;
+ matches = rl_completion_matches(text, cpl_generator);
+ found=true;
+ break;
+ }
+ }
+
+ if (!found) { /* we try to get help with the first command */
+ cpl_item = cmd;
+ cpl_type = ITEM_HELP;
+ /* we don't want to append " " at the end */
+ rl_completion_suppress_append=true;
+ matches = rl_completion_matches(text, cpl_generator);
+ }
+ free(s);
+ } else { /* nothing on the line, display all commands */
+ cpl_item = ".help all";
+ cpl_type = ITEM_ARG;
+ matches = rl_completion_matches(text, cpl_generator);
+ }
+ if (cmd) {
+ free(cmd);
+ }
+ return (matches);
+}
+
+static char eol = '\0';
+static int eolcmd(FILE *input, BSOCK *UA_sock)
+{
+ if ((argc > 1) && (strchr("!$%&'()*+,-/:;<>?[]^`{|}~", argk[1][0]) != NULL)) {
+ eol = argk[1][0];
+ } else if (argc == 1) {
+ eol = '\0';
+ } else {
+ sendit(_("Illegal separator character.\n"));
+ }
+ return 1;
+}
+
+/*
+ * Return 1 if OK
+ * 0 if no input
+ * -1 error (must stop)
+ */
+int
+get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
+{
+ static char *line = NULL;
+ static char *next = NULL;
+ static int do_history = 0;
+ char *command;
+
+ if (line == NULL) {
+ do_history = 0;
+ rl_catch_signals = 0; /* do it ourselves */
+ /* Here, readline does ***real*** malloc
+ * so, be we have to use the real free
+ */
+ line = readline((char *)prompt); /* cast needed for old readlines */
+ if (!line) {
+ return -1; /* error return and exit */
+ }
+ strip_trailing_junk(line);
+ command = line;
+ } else if (next) {
+ command = next + 1;
+ } else {
+ sendit(_("Command logic problem\n"));
+ sock->msglen = 0;
+ sock->msg[0] = 0;
+ return 0; /* No input */
+ }
+
+ /*
+ * Split "line" into multiple commands separated by the eol character.
+ * Each part is pointed to by "next" until finally it becomes null.
+ */
+ if (eol == '\0') {
+ next = NULL;
+ } else {
+ next = strchr(command, eol);
+ if (next) {
+ *next = '\0';
+ }
+ }
+ if (command != line && isatty(fileno(input))) {
+ senditf("%s%s\n", prompt, command);
+
+ } else {
+ /* Send the intput to the output file if needed */
+ if (teein && output != stdout) {
+ fputs(prompt, output);
+ fputs(command, output);
+ fputs("\n", output);
+ }
+ }
+
+ sock->msglen = pm_strcpy(&sock->msg, command);
+ if (sock->msglen) {
+ do_history++;
+ }
+
+ if (!next) {
+ if (do_history) {
+ add_history(line);
+ }
+ actuallyfree(line); /* allocated by readline() malloc */
+ line = NULL;
+ }
+ return 1; /* OK */
+}
+
+#else /* no readline, do it ourselves */
+
+#ifdef HAVE_CONIO
+static bool bisatty(int fd)
+{
+ if (no_conio) {
+ return false;
+ }
+ return isatty(fd);
+}
+#endif
+
+/*
+ * Returns: 1 if data available
+ * 0 if timeout
+ * -1 if error
+ */
+static int
+wait_for_data(int fd, int sec)
+{
+#if defined(HAVE_WIN32)
+ return 1;
+#else
+ for ( ;; ) {
+ switch(fd_wait_data(fd, WAIT_READ, sec, 0)) {
+ case 0: /* timeout */
+ return 0;
+ case -1:
+ if (errno == EINTR || errno == EAGAIN) {
+ continue;
+ }
+ return -1; /* error return */
+ default:
+ return 1;
+ }
+ }
+#endif
+}
+
+/*
+ * Get next input command from terminal.
+ *
+ * Returns: 1 if got input
+ * 0 if timeout
+ * -1 if EOF or error
+ */
+int
+get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
+{
+ int len;
+ if (!stop) {
+ if (output == stdout || teeout) {
+ sendit(prompt);
+ }
+ }
+again:
+ switch (wait_for_data(fileno(input), sec)) {
+ case 0:
+ return 0; /* timeout */
+ case -1:
+ return -1; /* error */
+ default:
+ len = sizeof_pool_memory(sock->msg) - 1;
+ if (stop) {
+ sleep(1);
+ goto again;
+ }
+#ifdef HAVE_CONIO
+ if (bisatty(fileno(input))) {
+ input_line(sock->msg, len);
+ break;
+ }
+#endif
+#ifdef HAVE_WIN32 /* use special console for input on win32 */
+ if (input == stdin) {
+ if (win32_cgets(sock->msg, len) == NULL) {
+ return -1;
+ }
+ }
+ else
+#endif
+ if (bfgets(sock->msg, input) == NULL) {
+ return -1;
+
+ }
+ break;
+ }
+ if (usrbrk()) {
+ clrbrk();
+ }
+ strip_trailing_junk(sock->msg);
+ sock->msglen = strlen(sock->msg);
+
+ /* Send input to log file if needed */
+ if (teein && output != stdout) {
+ fputs(sock->msg, output);
+ fputs("\n", output);
+ }
+
+ return 1;
+}
+
+#endif /* ! HAVE_READLINE */
+
+/* Routine to return true if user types break */
+int usrbrk()
+{
+ return brkflg;
+}
+
+/* Clear break flag */
+void clrbrk()
+{
+ brkflg = 0;
+}
+
+/* Interrupt caught here */
+static void sigintcatcher(int sig)
+{
+ brkflg++;
+ if (brkflg > 3) {
+ terminate_console(sig);
+ }
+ signal(SIGINT, sigintcatcher);
+}
+
+/* Trap Ctl-C */
+void trapctlc()
+{
+ signal(SIGINT, sigintcatcher);
+}
+
+static int console_update_history(const char *histfile)
+{
+ int ret=0;
+
+#ifdef HAVE_READLINE
+/*
+ * first, try to truncate the history file, and if it
+ * fails, the file is probably not present, and we
+ * can use write_history to create it
+ */
+
+ if (history_truncate_file(histfile, 100) == 0) {
+ ret = append_history(history_length, histfile);
+ } else {
+ ret = write_history(histfile);
+ }
+#endif
+
+ return ret;
+}
+
+static int console_init_history(const char *histfile)
+{
+ int ret=0;
+
+#ifdef HAVE_READLINE
+ using_history();
+ ret = read_history(histfile);
+ /* Tell the completer that we want a complete . */
+ rl_completion_entry_function = dummy_completion_function;
+ rl_attempted_completion_function = readline_completion;
+ rl_filename_completion_desired = 0;
+ stifle_history(100);
+#endif
+
+ return ret;
+}
+
+static bool select_director(const char *director, const char *console,
+ DIRRES **ret_dir, CONRES **ret_cons)
+{
+ int numcon=0, numdir=0;
+ int i=0, item=0;
+ BSOCK *UA_sock;
+ DIRRES *dir = NULL;
+ CONRES *cons = NULL;
+
+ *ret_cons = NULL;
+ *ret_dir = NULL;
+
+ LockRes();
+ numdir = 0;
+ foreach_res(dir, R_DIRECTOR) {
+ numdir++;
+ }
+ numcon = 0;
+ foreach_res(cons, R_CONSOLE) {
+ numcon++;
+ }
+ UnlockRes();
+
+ if (numdir == 1) { /* No choose */
+ dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
+ }
+
+ if (director) { /* Command line choice overwrite the no choose option */
+ LockRes();
+ foreach_res(dir, R_DIRECTOR) {
+ if (bstrcasecmp(dir->hdr.name, director)) {
+ break;
+ }
+ }
+ UnlockRes();
+ if (!dir) { /* Can't find Director used as argument */
+ senditf(_("Can't find %s in Director list\n"), director);
+ return 0;
+ }
+ }
+
+ if (dir == NULL) { /* prompt for director */
+ UA_sock = new_bsock();
+try_again:
+ sendit(_("Available Directors:\n"));
+ LockRes();
+ numdir = 0;
+ foreach_res(dir, R_DIRECTOR) {
+ senditf( _("%2d: %s at %s:%d\n"), 1+numdir++, dir->hdr.name,
+ dir->address, dir->DIRport);
+ }
+ UnlockRes();
+ if (get_cmd(stdin, _("Select Director by entering a number: "),
+ UA_sock, 600) < 0)
+ {
+ (void)WSACleanup(); /* Cleanup Windows sockets */
+ return 0;
+ }
+ if (!is_a_number(UA_sock->msg)) {
+ senditf(_("%s is not a number. You must enter a number between "
+ "1 and %d\n"),
+ UA_sock->msg, numdir);
+ goto try_again;
+ }
+ item = atoi(UA_sock->msg);
+ if (item < 0 || item > numdir) {
+ senditf(_("You must enter a number between 1 and %d\n"), numdir);
+ goto try_again;
+ }
+ free_bsock(UA_sock);
+ LockRes();
+ for (i=0; i<item; i++) {
+ dir = (DIRRES *)GetNextRes(R_DIRECTOR, (RES *)dir);
+ }
+ UnlockRes();
+ }
+ LockRes();
+ /* Look for a console linked to this director */
+ for (i=0; i<numcon; i++) {
+ cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)cons);
+ if (console) {
+ if (strcmp(cons->hdr.name, console) == 0) {
+ break;
+ }
+ } else if (cons->director && strcasecmp(cons->director, dir->hdr.name) == 0) {
+ break;
+ }
+ if (i == (numcon - 1)) {
+ cons = NULL;
+ }
+ }
+
+ if (cons == NULL && console != NULL) {
+ UnlockRes();
+ senditf(_("Can't find %s in Console list\n"), console);
+ return 0;
+ }
+
+ /* Look for the first non-linked console */
+ if (cons == NULL) {
+ for (i=0; i<numcon; i++) {
+ cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)cons);
+ if (cons->director == NULL) {
+ break;
+ }
+ if (i == (numcon - 1)) {
+ cons = NULL;
+ }
+ }
+ }
+
+ /* If no console, take first one */
+ if (!cons) {
+ cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL);
+ }
+ UnlockRes();
+
+ *ret_dir = dir;
+ *ret_cons = cons;
+
+ return 1;
+}
/*********************************************************************
*
*/
int main(int argc, char *argv[])
{
- int ch, i, item;
+ int ch;
+ char *director = NULL;
+ char *console = NULL;
+ bool list_directors=false, list_consoles=false;
bool no_signals = false;
bool test_config = false;
JCR jcr;
+ utime_t heart_beat;
setlocale(LC_ALL, "");
bindtextdomain("bacula", LOCALEDIR);
textdomain("bacula");
init_stack_dump();
+ lmgr_init_thread();
my_name_is(argc, argv, "bconsole");
init_msg(NULL, NULL);
working_directory = "/tmp";
args = get_pool_memory(PM_FNAME);
- con_init(stdin);
- while ((ch = getopt(argc, argv, "bc:d:r:st?")) != -1) {
+ while ((ch = getopt(argc, argv, "D:lc:d:nstu:?C:L")) != -1) {
switch (ch) {
+ case 'D': /* Director */
+ if (director) {
+ free(director);
+ }
+ director = bstrdup(optarg);
+ break;
+
+ case 'C': /* Console */
+ if (console) {
+ free(console);
+ }
+ console = bstrdup(optarg);
+ break;
+
+ case 'L': /* Console */
+ list_consoles = true;
+ test_config = true;
+ break;
+
+ case 'l':
+ list_directors = true;
+ test_config = true;
+ break;
+
case 'c': /* configuration file */
if (configfile != NULL) {
free(configfile);
break;
case 'd':
- debug_level = atoi(optarg);
- if (debug_level <= 0) {
- debug_level = 1;
+ if (*optarg == 't') {
+ dbg_timestamp = true;
+ } else {
+ debug_level = atoi(optarg);
+ if (debug_level <= 0) {
+ debug_level = 1;
+ }
}
break;
+ case 'n': /* no conio */
+ no_conio = true;
+ break;
+
case 's': /* turn off signals */
no_signals = true;
break;
test_config = true;
break;
+ case 'u':
+ timeout = atoi(optarg);
+ break;
+
case '?':
default:
usage();
- con_term();
exit(1);
}
}
init_signals(terminate_console);
}
+
#if !defined(HAVE_WIN32)
/* Override Bacula default signals */
-// signal(SIGCHLD, SIG_IGN);
signal(SIGQUIT, SIG_IGN);
signal(SIGTSTP, got_sigstop);
signal(SIGCONT, got_sigcontinue);
signal(SIGTTIN, got_sigtin);
signal(SIGTTOU, got_sigtout);
trapctlc();
-#else
- InitWinAPIWrapper();
#endif
-
+
+ OSDependentInit();
if (argc) {
usage();
- con_term();
exit(1);
}
configfile = bstrdup(CONFIG_FILE);
}
- parse_config(configfile);
+ config = New(CONFIG());
+ parse_cons_config(config, configfile, M_ERROR_TERM);
if (init_crypto() != 0) {
Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
Emsg1(M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
}
- if (test_config) {
- terminate_console(0);
- exit(0);
+ if (!no_conio) {
+ con_init(stdin);
}
- memset(&jcr, 0, sizeof(jcr));
-
- (void)WSA_Init(); /* Initialize Windows sockets */
-
- if (numdir > 1) {
- struct sockaddr client_addr;
- memset(&client_addr, 0, sizeof(client_addr));
- UA_sock = init_bsock(NULL, 0, "", "", 0, &client_addr);
-try_again:
- sendit(_("Available Directors:\n"));
+ if (list_directors) {
LockRes();
- numdir = 0;
foreach_res(dir, R_DIRECTOR) {
- senditf( _("%d %s at %s:%d\n"), 1+numdir++, dir->hdr.name, dir->address,
- dir->DIRport);
+ senditf("%s\n", dir->hdr.name);
}
UnlockRes();
- if (get_cmd(stdin, _("Select Director: "), UA_sock, 600) < 0) {
- (void)WSACleanup(); /* Cleanup Windows sockets */
- return 1;
- }
- item = atoi(UA_sock->msg);
- if (item < 0 || item > numdir) {
- senditf(_("You must enter a number between 1 and %d\n"), numdir);
- goto try_again;
- }
+ }
+
+ if (list_consoles) {
LockRes();
- dir = NULL;
- for (i=0; i<item; i++) {
- dir = (DIRRES *)GetNextRes(R_DIRECTOR, (RES *)dir);
+ foreach_res(cons, R_CONSOLE) {
+ senditf("%s\n", cons->hdr.name);
}
UnlockRes();
- term_bsock(UA_sock);
- } else {
- LockRes();
- dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
- UnlockRes();
}
- LockRes();
- CONRES *cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL);
- UnlockRes();
+ if (test_config) {
+ terminate_console(0);
+ exit(0);
+ }
+
+ memset(&jcr, 0, sizeof(jcr));
+
+ (void)WSA_Init(); /* Initialize Windows sockets */
+
+ start_watchdog(); /* Start socket watchdog */
+
+ if (!select_director(director, console, &dir, &cons)) {
+ terminate_console(0);
+ return 1;
+ }
senditf(_("Connecting to Director %s:%d\n"), dir->address,dir->DIRport);
/* Initialize TLS context:
* Args: CA certfile, CA certdir, Certfile, Keyfile,
- * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
+ * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer
+ */
cons->tls_ctx = new_tls_context(cons->tls_ca_certfile,
cons->tls_ca_certdir, cons->tls_certfile,
cons->tls_keyfile, tls_pem_callback, &buf, NULL, true);
terminate_console(0);
return 1;
}
-
}
/* Initialize Director TLS context */
}
}
- UA_sock = bnet_connect(NULL, 5, 15, "Director daemon", dir->address,
- NULL, dir->DIRport, 0);
- if (UA_sock == NULL) {
+ if (dir->heartbeat_interval) {
+ heart_beat = dir->heartbeat_interval;
+ } else if (cons) {
+ heart_beat = cons->heartbeat_interval;
+ } else {
+ heart_beat = 0;
+ }
+ if (!UA_sock) {
+ UA_sock = new_bsock();
+ }
+ if (!UA_sock->connect(NULL, 5, 15, heart_beat, "Director daemon", dir->address,
+ NULL, dir->DIRport, 0)) {
+ UA_sock->destroy();
+ UA_sock = NULL;
terminate_console(0);
return 1;
}
jcr.dir_bsock = UA_sock;
/* If cons==NULL, default console will be used */
- if (!authenticate_director(&jcr, dir, cons)) {
+ if (!authenticate_director(UA_sock, dir, cons)) {
terminate_console(0);
return 1;
}
sendit(_("Enter a period to cancel a command.\n"));
+ /* Read/Update history file if HOME exists */
+ POOL_MEM history_file;
+
/* Run commands in ~/.bconsolerc if any */
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");
+ fd = fopen(UA_sock->msg, "rb");
if (fd) {
read_and_process_input(fd, UA_sock);
fclose(fd);
}
+
+ pm_strcpy(history_file, env);
+ pm_strcat(history_file, "/.bconsole_history");
+ console_init_history(history_file.c_str());
}
read_and_process_input(stdin, UA_sock);
if (UA_sock) {
- bnet_sig(UA_sock, BNET_TERMINATE); /* send EOF */
- bnet_close(UA_sock);
+ UA_sock->signal(BNET_TERMINATE); /* send EOF */
+ UA_sock->close();
+ }
+
+ if (env) {
+ console_update_history(history_file.c_str());
}
terminate_console(0);
return 0;
}
-
/* Cleanup and then exit */
static void terminate_console(int sig)
{
exit(1);
}
already_here = true;
+ stop_watchdog();
+ delete(config);
+ config = NULL;
cleanup_crypto();
+ free(res_head);
+ res_head = NULL;
free_pool_memory(args);
- con_term();
+#if defined(HAVE_CONIO)
+ if (!no_conio) {
+ con_term();
+ }
+#elif defined(HAVE_READLINE)
+ rl_cleanup_after_signal();
+#else /* !HAVE_CONIO && !HAVE_READLINE */
+#endif
(void)WSACleanup(); /* Cleanup Windows sockets */
+ lmgr_cleanup_main();
+
if (sig != 0) {
exit(1);
}
{
bool OK = true;
DIRRES *director;
+ bool tls_needed;
LockRes();
continue;
}
}
+ tls_needed = director->tls_enable || director->tls_authenticate;
- if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && director->tls_enable) {
+ if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && tls_needed) {
Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
" or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
" At least one CA certificate store is required.\n"),
OK = false;
}
}
-
+
if (numdir == 0) {
Emsg1(M_FATAL, 0, _("No Director resource defined in %s\n"
"Without that I don't how to speak to the Director :-(\n"), configfile);
continue;
}
}
-
- if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && cons->tls_enable) {
+ tls_needed = cons->tls_enable || cons->tls_authenticate;
+ if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && tls_needed) {
Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
" or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s.\n"),
cons->hdr.name, configfile);
return OK;
}
-
-#ifdef HAVE_READLINE
-#define READLINE_LIBRARY 1
-#undef free
-#include "readline.h"
-#include "history.h"
-
-
-int
-get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
-{
- char *line;
-
- rl_catch_signals = 0; /* do it ourselves */
- line = readline((char *)prompt); /* cast needed for old readlines */
-
- if (!line) {
- exit(1);
- }
- strip_trailing_junk(line);
- sock->msglen = pm_strcpy(&sock->msg, line);
- if (sock->msglen) {
- add_history(sock->msg);
- }
- free(line);
- return 1;
-}
-
-#else /* no readline, do it ourselves */
-
-/*
- * Returns: 1 if data available
- * 0 if timeout
- * -1 if error
- */
-static int
-wait_for_data(int fd, int sec)
-{
- fd_set fdset;
- struct timeval tv;
-#ifdef HAVE_WIN32
- return 1; /* select doesn't seem to work on Win32 */
-#endif
-
- tv.tv_sec = sec;
- tv.tv_usec = 0;
- for ( ;; ) {
- FD_ZERO(&fdset);
- FD_SET((unsigned)fd, &fdset);
- switch(select(fd + 1, &fdset, NULL, NULL, &tv)) {
- case 0: /* timeout */
- return 0;
- case -1:
- if (errno == EINTR || errno == EAGAIN) {
- continue;
- }
- return -1; /* error return */
- default:
- return 1;
- }
- }
-}
-
-/*
- * Get next input command from terminal.
- *
- * Returns: 1 if got input
- * 0 if timeout
- * -1 if EOF or error
- */
-int
-get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
-{
- int len;
- if (!stop) {
- if (output == stdout || tee) {
- sendit(prompt);
- }
- }
-again:
- switch (wait_for_data(fileno(input), sec)) {
- case 0:
- return 0; /* timeout */
- case -1:
- return -1; /* error */
- default:
- len = sizeof_pool_memory(sock->msg) - 1;
- if (stop) {
- sleep(1);
- goto again;
- }
-#ifdef HAVE_CONIO
- if (isatty(fileno(input))) {
- input_line(sock->msg, len);
- break;
- }
-#endif
-#ifdef HAVE_WIN32 /* use special console for input on win32 */
- if (input == stdin) {
- if (win32_cgets(sock->msg, len) == NULL) {
- return -1;
- }
- }
- else
-#endif
- if (fgets(sock->msg, len, input) == NULL) {
- return -1;
-
- }
- break;
- }
- if (usrbrk()) {
- clrbrk();
- }
- strip_trailing_junk(sock->msg);
- sock->msglen = strlen(sock->msg);
- return 1;
-}
-
-#endif
-
+/* @version */
static int versioncmd(FILE *input, BSOCK *UA_sock)
{
senditf("Version: " VERSION " (" BDATE ") %s %s %s\n",
return 1;
}
+/* @input <input-filename> */
static int inputcmd(FILE *input, BSOCK *UA_sock)
{
FILE *fd;
sendit(_("First argument to input command must be a filename.\n"));
return 1;
}
- fd = fopen(argk[1], "r");
+ fd = fopen(argk[1], "rb");
if (!fd) {
+ berrno be;
senditf(_("Cannot open file %s for input. ERR=%s\n"),
- argk[1], strerror(errno));
+ argk[1], be.bstrerror());
return 1;
}
read_and_process_input(fd, UA_sock);
return 1;
}
-/* Send output to both termina and specified file */
+/* @tall <output-filename> */
+/* Send input/output to both terminal and specified file */
+static int teeallcmd(FILE *input, BSOCK *UA_sock)
+{
+ teeout = true;
+ teein = true;
+ return do_outputcmd(input, UA_sock);
+}
+
+/* @tee <output-filename> */
+/* Send output to both terminal and specified file */
static int teecmd(FILE *input, BSOCK *UA_sock)
{
- tee = true;
+ teeout = true;
+ teein = false;
return do_outputcmd(input, UA_sock);
}
+/* @output <output-filename> */
/* Send output to specified "file" */
static int outputcmd(FILE *input, BSOCK *UA_sock)
{
- tee = false;
+ teeout = false;
+ teein = false;
return do_outputcmd(input, UA_sock);
}
static int do_outputcmd(FILE *input, BSOCK *UA_sock)
{
FILE *fd;
- const char *mode = "a+";
+ const char *mode = "a+b";
if (argc > 3) {
sendit(_("Too many arguments on output/tee command.\n"));
if (output != stdout) {
fclose(output);
output = stdout;
- tee = false;
+ teeout = false;
+ teein = false;
}
return 1;
}
}
fd = fopen(argk[1], mode);
if (!fd) {
+ berrno be;
senditf(_("Cannot open file %s for output. ERR=%s\n"),
- argk[1], strerror(errno));
+ argk[1], be.bstrerror(errno));
return 1;
}
output = fd;
return 1;
}
+/*
+ * @exec "some-command" [wait-seconds]
+*/
+static int execcmd(FILE *input, BSOCK *UA_sock)
+{
+ BPIPE *bpipe;
+ char line[5000];
+ int stat;
+ int wait = 0;
+ char *cmd;
+
+ if (argc > 3) {
+ sendit(_("Too many arguments. Enclose command in double quotes.\n"));
+ return 1;
+ }
+
+ /* old syntax */
+ if (argc == 3) {
+ wait = atoi(argk[2]);
+ }
+ cmd = argk[1];
+
+ /* handle cmd=XXXX and wait=XXXX */
+ for (int i=1; i<argc; i++) {
+ if (strcmp(argk[i], "cmd") == 0) {
+ cmd = argv[i];
+ }
+ if (strcmp(argk[i], "wait") == 0) {
+ wait = atoi(argv[i]);
+ }
+ }
+
+ bpipe = open_bpipe(cmd, wait, "r");
+ if (!bpipe) {
+ berrno be;
+ senditf(_("Cannot popen(\"%s\", \"r\"): ERR=%s\n"),
+ argk[1], be.bstrerror(errno));
+ return 1;
+ }
+
+ while (fgets(line, sizeof(line), bpipe->rfd)) {
+ senditf("%s", line);
+ }
+ stat = close_bpipe(bpipe);
+ if (stat != 0) {
+ berrno be;
+ be.set_errno(stat);
+ senditf(_("@exec error: ERR=%s\n"), be.bstrerror());
+ }
+ return 1;
+}
+
+/* @echo xxx yyy */
+static int echocmd(FILE *input, BSOCK *UA_sock)
+{
+ for (int i=1; i < argc; i++) {
+ senditf("%s ", argk[i]);
+ }
+ sendit("\n");
+ return 1;
+}
+
+/* @quit */
static int quitcmd(FILE *input, BSOCK *UA_sock)
{
return 0;
}
+/* @help */
+static int helpcmd(FILE *input, BSOCK *UA_sock)
+{
+ int i;
+ for (i=0; i<comsize; i++) {
+ senditf(" %-10s %s\n", commands[i].key, commands[i].help);
+ }
+ return 1;
+}
+
+
+/* @sleep secs */
static int sleepcmd(FILE *input, BSOCK *UA_sock)
{
if (argc > 1) {
return 1;
}
+/* @putfile key /path/to/file
+ *
+ * The Key parameter is needed to use the file on the director side.
+ */
+static int putfilecmd(FILE *input, BSOCK *UA_sock)
+{
+ int i = 0;
+ const char *key = "putfile";
+ const char *fname;
+ FILE *fp;
+
+ if (argc != 3) {
+ sendit("Usage: @putfile key file\n");
+ return 1;
+ }
+
+ key = argk[1];
+ fname = argk[2];
+
+ if (!key || !fname) {
+ senditf("Syntax error in @putfile command\n");
+ return 1;
+ }
+
+ fp = fopen(fname, "r");
+ if (!fp) {
+ berrno be;
+ senditf("Unable to open %s. ERR=%s\n", fname, be.bstrerror(errno));
+ return 1;
+ }
+
+ UA_sock->fsend(".putfile key=\"%s\"", key);
+
+ /* Just read the file and send it to the director */
+ while (!feof(fp)) {
+ i = fread(UA_sock->msg, 1, sizeof_pool_memory(UA_sock->msg) - 1, fp);
+ if (i > 0) {
+ UA_sock->msg[i] = 0;
+ UA_sock->msglen = i;
+ UA_sock->send();
+ }
+ }
+
+ UA_sock->signal(BNET_EOD);
+ fclose(fp);
+
+ /* Get the file name associated */
+ while (UA_sock->recv() > 0) {
+ senditf("%s", UA_sock->msg);
+ }
+ return 1;
+}
+/* @time */
static int timecmd(FILE *input, BSOCK *UA_sock)
{
char sdt[50];
time_t ttime = time(NULL);
struct tm tm;
- localtime_r(&ttime, &tm);
+ (void)localtime_r(&ttime, &tm);
strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm);
sendit("\n");
return 1;
*/
void senditf(const char *fmt,...)
{
- char buf[3000];
- va_list arg_ptr;
+ 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);
+ va_start(arg_ptr, fmt);
+ bvsnprintf(buf, sizeof(buf), (char *)fmt, arg_ptr);
+ va_end(arg_ptr);
+ sendit(buf);
}
void sendit(const char *buf)
{
-#ifdef xHAVE_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);
- }
+#ifdef CONIO_FIX
+ char obuf[3000];
+ if (output == stdout || teeout) {
+ const 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')); ) {
+ int len = p - q;
+ if (len > 0) {
+ memcpy(obuf, q, len);
+ }
+ memcpy(obuf+len, "\r\n", 3);
+ q = ++p; /* point after \n */
+ fputs(obuf, output);
+ }
+ if (*q) {
+ fputs(q, output);
+ }
+ fflush(output);
+ }
+ if (output != stdout) {
+ fputs(buf, output);
+ }
#else
- fputs(buf, output);
- fflush(output);
- if (tee) {
- fputs(buf, stdout);
- }
- if (output != stdout || tee) {
- fflush(stdout);
- }
+ fputs(buf, output);
+ fflush(output);
+ if (teeout) {
+ fputs(buf, stdout);
+ fflush(stdout);
+ }
#endif
}
projects / bacula / bacula / blobdiff