Create patch that may fix bug #1298 and bug #1304, which causes

[bacula/bacula] / bacula / src / console / console.c

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 5553958b5b481c12caa2460800db4fbddd1d12b0..a99c028169fdc1f5c1b9a0a0c31d4f60b5da2a10 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -61,6 +61,7 @@
 
 /* Imported functions */
 int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
+extern bool parse_cons_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* Forward referenced functions */
 static void terminate_console(int sig);
@@ -91,6 +92,7 @@ static int numcon;
 static POOLMEM *args;
 static char *argk[MAX_CMD_ARGS];
 static char *argv[MAX_CMD_ARGS];
+static CONFIG *config;
 
 
 /* Command prototypes */
@@ -99,6 +101,7 @@ 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 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);
@@ -174,11 +177,12 @@ static struct cmdstruct commands[] = {
  { N_("exec"),       execcmd,      _("execute an external command")},
  { N_("exit"),       quitcmd,      _("exit = quit")},
  { 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)
 {
@@ -342,18 +346,19 @@ static int tls_pem_callback(char *buf, int size, const void *userdata)
 
 #ifdef HAVE_READLINE
 #define READLINE_LIBRARY 1
-#undef free
 #include "readline.h"
 #include "history.h"
 
-static char eol = ';';
+static char eol = '\0';
 static int eolcmd(FILE *input, BSOCK *UA_sock)
 {
    if ((argc > 1) && (strchr("!$%&'()*+,-/:;<>?[]^`{|}~", argk[1][0]) != NULL)) {
       eol = argk[1][0];
-      return 1;
+   } else if (argc == 1) {
+      eol = '\0';
+   } else {
+      sendit(_("Illegal separator character.\n"));
    }
-   sendit(_("Missing or illegal separator character.\n"));
    return 1;
 }
 
@@ -368,21 +373,35 @@ get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
    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) {
          exit(1);
       }
       strip_trailing_junk(line);
       command = line;
-   } else {
-      *next = eol;
+   } else if (next) {
       command = next + 1;
+   } else {
+     sendit(_("Command logic problem\n"));
+     sock->msglen = 0;
+     sock->msg[0] = 0;
+     return 0;
    }
 
-   next = strchr(command, eol);
-   if (next != NULL) {
-      *next = '\0';
+   /*
+    * 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);
@@ -393,11 +412,11 @@ get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
       do_history++;
    }
 
-   if (next == NULL) {
+   if (!next) {
       if (do_history) {
         add_history(line);
       }
-      free(line);
+      actuallyfree(line);       /* allocated by readline() malloc */
       line = NULL;
    }
    return 1;
@@ -633,7 +652,8 @@ int main(int argc, char *argv[])
       configfile = bstrdup(CONFIG_FILE);
    }
 
-   parse_config(configfile);
+   config = new_config_parser();
+   parse_cons_config(config, configfile, M_ERROR_TERM);
 
    if (init_crypto() != 0) {
       Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
@@ -845,12 +865,17 @@ static void terminate_console(int sig)
       exit(1);
    }
    already_here = true;
+   config->free_resources();
+   free(config);
+   config = NULL;
    cleanup_crypto();
    free_pool_memory(args);
    if (!no_conio) {
       con_term();
    }
    (void)WSACleanup();               /* Cleanup Windows sockets */
+   lmgr_cleanup_main();
+
    if (sig != 0) {
       exit(1);
    }
@@ -1045,8 +1070,7 @@ static int execcmd(FILE *input, BSOCK *UA_sock)
 static int echocmd(FILE *input, BSOCK *UA_sock)
 {
    for (int i=1; i < argc; i++) {
-      senditf("%s", argk[i]);
-      sendit(" ");
+      senditf("%s ", argk[i]);
    }
    sendit("\n");
    return 1;
@@ -1057,6 +1081,16 @@ static int quitcmd(FILE *input, BSOCK *UA_sock)
    return 0;
 }
 
+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;   
+}
+
+
 static int sleepcmd(FILE *input, BSOCK *UA_sock)
 {
    if (argc > 1) {