- 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 658d5e8425d9ee3991560b235a62b6c222517073..5f19b78139e83bdbb161c1b5de5a6d253c377d7a 100644 (file)
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -71,46 +71,53 @@ int get_cmd(UAContext *ua, const char *prompt)
 
 /*
  * 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, const 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);
+         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);
+         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, const 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) {
@@ -118,10 +125,10 @@ int get_yesno(UAContext *ua, const 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"));
    }