X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_input.c;h=d264d10272051881ff187334b691500965a9ebed;hb=c5f4a68937116a768e6d85bc576a5fd41a56e93a;hp=a51dbce63603aaaa2e72d829480ae65b96948c46;hpb=7cefbfdacb1d394f034d4bee6e7a96af1f06df95;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_input.c b/bacula/src/dird/ua_input.c
index a51dbce636..d264d10272 100644
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -1,38 +1,37 @@
-/*
- *
- *   Bacula Director -- User Agent Input and scanning code
- *
- *     Kern Sibbald, October MMI
- *
- *   Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 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.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    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.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    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.
 */
+/*
+ *
+ *   Bacula Director -- User Agent Input and scanning code
+ *
+ *     Kern Sibbald, October MMI
+ *
+ */
 
 #include "bacula.h"
 #include "dird.h"
@@ -43,19 +42,28 @@
 
 /* Exported functions */
 
-int get_cmd(UAContext *ua, const char *prompt)
+/* 
+ * If subprompt is set, we send a BNET_SUB_PROMPT signal otherwise
+ *   send a BNET_TEXT_INPUT signal.
+ */
+int get_cmd(UAContext *ua, const char *prompt, bool subprompt)
 {
    BSOCK *sock = ua->UA_sock;
    int stat;
 
    ua->cmd[0] = 0;
-   if (!sock) {                       /* No UA */
+   if (!sock || ua->batch) {          /* No UA or batch mode */
       return 0;
    }
-   bnet_fsend(sock, "%s", prompt);
-   bnet_sig(sock, BNET_PROMPT);       /* request more input */
+   if (!subprompt && ua->api) {
+      sock->signal(BNET_TEXT_INPUT);
+   }
+   sock->fsend("%s", prompt);
+   if (!ua->api || subprompt) {
+      sock->signal(BNET_SUB_PROMPT);
+   }
    for ( ;; ) {
-      stat = bnet_recv(sock);
+      stat = sock->recv();
       if (stat == BNET_SIGNAL) {
          continue;                    /* ignore signals */
       }
@@ -96,13 +104,13 @@ bool get_pint(UAContext *ua, const char *prompt)
          return true;
       }
       if (!is_a_number(ua->cmd)) {
-         bsendmsg(ua, _("Expected a positive integer, got: %s\n"), ua->cmd);
+         ua->warning_msg(_("Expected a positive integer, got: %s\n"), ua->cmd);
          continue;
       }
       errno = 0;
       dval = strtod(ua->cmd, NULL);
       if (errno != 0 || dval < 0) {
-         bsendmsg(ua, _("Expected a positive integer, got: %s\n"), ua->cmd);
+         ua->warning_msg(_("Expected a positive integer, got: %s\n"), ua->cmd);
          continue;
       }
       ua->pint32_val = (uint32_t)dval;
@@ -147,6 +155,7 @@ bool get_yesno(UAContext *ua, const char *prompt)
    int ret;
    ua->pint32_val = 0;
    for (;;) {
+      if (ua->api) ua->UA_sock->signal(BNET_YESNO);
       if (!get_cmd(ua, prompt)) {
          return false;
       }
@@ -158,7 +167,7 @@ bool get_yesno(UAContext *ua, const char *prompt)
          ua->pint32_val = ret;
          return true;
       }
-      bsendmsg(ua, _("Invalid response. You must answer yes or no.\n"));
+      ua->warning_msg(_("Invalid response. You must answer yes or no.\n"));
    }
 }
 
@@ -181,7 +190,7 @@ int get_enabled(UAContext *ua, const char *val)
       Enabled = atoi(val);
    }
    if (Enabled < 0 || Enabled > 2) {
-      bsendmsg(ua, _("Invalid Enabled value, it must be yes, no, archived, 0, 1, or 2\n"));
+      ua->error_msg(_("Invalid Enabled value, it must be yes, no, archived, 0, 1, or 2\n"));
       return -1;     
    }
    return Enabled;
@@ -191,3 +200,39 @@ void parse_ua_args(UAContext *ua)
 {
    parse_args(ua->cmd, &ua->args, &ua->argc, ua->argk, ua->argv, MAX_CMD_ARGS);
 }
+
+/*
+ * Check if the comment has legal characters
+ * If ua is non-NULL send the message
+ */
+bool is_comment_legal(UAContext *ua, const char *name)
+{
+   int len;
+   const char *p;
+   const char *forbid = "'<>&\\\"";
+
+   /* Restrict the characters permitted in the comment */
+   for (p=name; *p; p++) {
+      if (!strchr(forbid, (int)(*p))) {
+         continue;
+      }
+      if (ua) {
+         ua->error_msg(_("Illegal character \"%c\" in a comment.\n"), *p);
+      }
+      return 0;
+   }
+   len = strlen(name);
+   if (len >= MAX_NAME_LENGTH) {
+      if (ua) {
+         ua->error_msg(_("Comment too long.\n"));
+      }
+      return 0;
+   }
+   if (len == 0) {
+      if (ua) {
+         ua->error_msg(_("Comment must be at least one character long.\n"));
+      }
+      return 0;
+   }
+   return 1;
+}