Correct pool source setting

[bacula/bacula] / bacula / src / dird / ua_input.c

diff --git a/bacula/src/dird/ua_input.c b/bacula/src/dird/ua_input.c
index 646d34919590d9246c0816f451539d67301b4d52..f1101d2cd09c95a095d665e17e16f86d0c81c555 100644 (file)
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -6,24 +6,18 @@
  *
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2001-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   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 GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -36,13 +30,13 @@
 
 /* Exported functions */
 
-int get_cmd(UAContext *ua, char *prompt)
+int get_cmd(UAContext *ua, const char *prompt)
 {
    BSOCK *sock = ua->UA_sock;
    int stat;
 
    ua->cmd[0] = 0;
-   if (!sock) {                      /* No UA */
+   if (!sock) {                       /* No UA */
       return 0;
    }
    bnet_fsend(sock, "%s", prompt);
@@ -50,86 +44,92 @@ int get_cmd(UAContext *ua, char *prompt)
    for ( ;; ) {
       stat = bnet_recv(sock);
       if (stat == BNET_SIGNAL) {
-        continue;                    /* ignore signals */
+         continue;                    /* ignore signals */
       }
       if (is_bnet_stop(sock)) {
-        return 0;                    /* error or terminate */
+         return 0;                    /* error or terminate */
       }
-      ua->cmd = check_pool_memory_size(ua->cmd, sock->msglen+1);
-      bstrncpy(ua->cmd, sock->msg, sock->msglen+1);
+      pm_strcpy(ua->cmd, sock->msg);
       strip_trailing_junk(ua->cmd);
       if (strcmp(ua->cmd, ".messages") == 0) {
-        qmessagescmd(ua, ua->cmd);
+         qmessagescmd(ua, ua->cmd);
       }
       /* Lone dot => break */
       if (ua->cmd[0] == '.' && ua->cmd[1] == 0) {
-        return 0;
+         return 0;
       }
       break;
    }
    return 1;
 }
 
-/* 
+/*
  * Get a positive integer
- *  Returns:  0 if failure
- *           1 if success => value in ua->pint32_val
+ *  Returns:  false if failure
+ *            true  if success => value in ua->pint32_val
  */
-int get_pint(UAContext *ua, char *prompt)
+bool get_pint(UAContext *ua, const char *prompt)
 {
    double dval;
    ua->pint32_val = 0;
+   ua->int64_val = 0;
    for (;;) {
+      ua->cmd[0] = 0;
       if (!get_cmd(ua, prompt)) {
-        return 0;
+         return false;
+      }
+      /* Kludge for slots blank line => 0 */
+      if (ua->cmd[0] == 0 && strncmp(prompt, _("Enter slot"), strlen(_("Enter slot"))) == 0) {
+         return true;
       }
       if (!is_a_number(ua->cmd)) {
-         bsendmsg(ua, "Expected a positive integer, got: %s\n", ua->cmd);
-        continue;
+         bsendmsg(ua, _("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);
-        continue;
+         bsendmsg(ua, _("Expected a positive integer, got: %s\n"), ua->cmd);
+         continue;
       }
       ua->pint32_val = (uint32_t)dval;
-      return 1;
+      ua->int64_val = (int64_t)dval;
+      return true;
    }
 }
 
-/* 
+/*
  * Gets a yes or no response
- *  Returns:  0 if failure
- *           1 if success => ua->pint32_val == 1 for yes
- *                           ua->pint32_val == 0 for no
+ *  Returns:  false if failure
+ *            true  if success => ua->pint32_val == 1 for yes
+ *                                ua->pint32_val == 0 for no
  */
-int get_yesno(UAContext *ua, char *prompt)
+bool get_yesno(UAContext *ua, const char *prompt)
 {
    int len;
 
    ua->pint32_val = 0;
    for (;;) {
       if (!get_cmd(ua, prompt)) {
-        return 0;
+         return false;
       }
       len = strlen(ua->cmd);
       if (len < 1 || len > 3) {
-        continue;
+         continue;
       }
       if (strncasecmp(ua->cmd, _("yes"), len) == 0) {
-        ua->pint32_val = 1;
-        return 1;
+         ua->pint32_val = 1;
+         return true;
       }
       if (strncasecmp(ua->cmd, _("no"), len) == 0) {
-        return 1;
+         return true;
       }
       bsendmsg(ua, _("Invalid response. You must answer yes or no.\n"));
    }
 }
-  
+
 
 void parse_ua_args(UAContext *ua)
 {
-   return parse_command_args(ua->cmd, ua->args, &ua->argc, ua->argk, ua->argv);
+   parse_args(ua->cmd, &ua->args, &ua->argc, ua->argk, ua->argv, MAX_CMD_ARGS);
 }