- Move test for MaxStartDelay as suggested by Peter.

[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 3321fddf0ceb7d167acf07fc4eadababa2f2be5e..5f19b78139e83bdbb161c1b5de5a6d253c377d7a 100644 (file)
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -8,7 +8,7 @@
  */
 
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -36,7 +36,7 @@
 
 /* Exported functions */
 
-int get_cmd(UAContext *ua, char *prompt)
+int get_cmd(UAContext *ua, const char *prompt)
 {
    BSOCK *sock = ua->UA_sock;
    int stat;
@@ -55,8 +55,7 @@ int get_cmd(UAContext *ua, char *prompt)
       if (is_bnet_stop(sock)) {
         return 0;                    /* error or terminate */
       }
-      Dmsg1(000, "sock->msglen=%d\n", sock->msglen);
-      pm_strcpy(&ua->cmd, sock->msg);
+      pm_strcpy(ua->cmd, sock->msg);
       strip_trailing_junk(ua->cmd);
       if (strcmp(ua->cmd, ".messages") == 0) {
         qmessagescmd(ua, ua->cmd);
@@ -70,18 +69,24 @@ int get_cmd(UAContext *ua, char *prompt)
    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", 10) == 0) {
+        return true;
       }
       if (!is_a_number(ua->cmd)) {
          bsendmsg(ua, "Expected a positive integer, got: %s\n", ua->cmd);
@@ -94,24 +99,25 @@ int get_pint(UAContext *ua, char *prompt)
         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) {
@@ -119,15 +125,15 @@ int get_yesno(UAContext *ua, char *prompt)
       }
       if (strncasecmp(ua->cmd, _("yes"), len) == 0) {
         ua->pint32_val = 1;
-        return 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)
 {