Add new files

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

diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index 957d6cc9d53097f8be6a49458d49c546c538dcf3..8275e19834ae8c5b487314d560a84eab65d4a9b7 100644 (file)
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -288,10 +288,10 @@ int runcmd(UAContext *ua, char *cmd)
    jcr->fileset = fileset;
    jcr->pool = pool;
    if (where) {
-      if (jcr->RestoreWhere) {
-        free(jcr->RestoreWhere);
+      if (jcr->where) {
+        free(jcr->where);
       }
-      jcr->RestoreWhere = bstrdup(where);
+      jcr->where = bstrdup(where);
    }
 
    if (when) {
@@ -402,7 +402,26 @@ When:     %s\n"),
         }
         jcr->JobLevel = L_FULL;      /* default level */
          Dmsg1(20, "JobId to restore=%d\n", jcr->RestoreJobId);
-         bsendmsg(ua, _("Run Restore job\n\
+        if (jcr->RestoreJobId == 0) {
+            bsendmsg(ua, _("Run Restore job\n\
+JobName:    %s\n\
+Bootstrap:  %s\n\
+Where:      %s\n\
+Replace:    %s\n\
+FileSet:    %s\n\
+Client:     %s\n\
+Storage:    %s\n\
+When:       %s\n"),
+                job->hdr.name,
+                NPRT(jcr->RestoreBootstrap),
+                jcr->where?jcr->where:NPRT(job->RestoreWhere),
+                replace,
+                jcr->fileset->hdr.name,
+                jcr->client->hdr.name,
+                jcr->store->hdr.name, 
+                bstrutime(dt, sizeof(dt), jcr->sched_time));
+        } else {
+            bsendmsg(ua, _("Run Restore job\n\
 JobName:    %s\n\
 Bootstrap:  %s\n\
 Where:      %s\n\
@@ -414,13 +433,14 @@ JobId:      %s\n\
 When:       %s\n"),
                 job->hdr.name,
                 NPRT(jcr->RestoreBootstrap),
-                jcr->RestoreWhere?jcr->RestoreWhere:NPRT(job->RestoreWhere),
+                jcr->where?jcr->where:NPRT(job->RestoreWhere),
                 replace,
                 jcr->fileset->hdr.name,
                 jcr->client->hdr.name,
                 jcr->store->hdr.name, 
                  jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1), 
                 bstrutime(dt, sizeof(dt), jcr->sched_time));
+        }
         break;
       default:
          bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
@@ -458,7 +478,7 @@ When:       %s\n"),
          add_prompt(ua, _("Replace"));       /* 8 */
          add_prompt(ua, _("JobId"));         /* 9 */
       }
-      switch (do_prompt(ua, _("Select parameter to modify"), NULL, 0)) {
+      switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
       case 0:
         /* Level */
         if (jcr->JobType == JT_BACKUP) {
@@ -468,7 +488,7 @@ When:       %s\n"),
             add_prompt(ua, _("Incremental"));
             add_prompt(ua, _("Differential"));
             add_prompt(ua, _("Since"));
-            switch (do_prompt(ua, _("Select level"), NULL, 0)) {
+            switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
            case 0:
               jcr->JobLevel = L_BASE;
               break;
@@ -492,9 +512,9 @@ When:       %s\n"),
             start_prompt(ua, _("Levels:\n"));
             add_prompt(ua, _("Initialize Catalog"));
             add_prompt(ua, _("Verify Catalog"));
-            add_prompt(ua, _("Verify Volume"));
-            add_prompt(ua, _("Verify Volume Data"));
-            switch (do_prompt(ua, _("Select level"), NULL, 0)) {
+            add_prompt(ua, _("Verify Volume to Catalog"));
+            add_prompt(ua, _("Verify Volume Data (not yet implemented)"));
+            switch (do_prompt(ua, "",  _("Select level"), NULL, 0)) {
            case 0:
               jcr->JobLevel = L_VERIFY_INIT;
               break;
@@ -600,14 +620,14 @@ When:       %s\n"),
          if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
            break;
         }
-        if (jcr->RestoreWhere) {
-           free(jcr->RestoreWhere);
-           jcr->RestoreWhere = NULL;
+        if (jcr->where) {
+           free(jcr->where);
+           jcr->where = NULL;
         }
          if (ua->cmd[0] == '/' && ua->cmd[1] == 0) {
            ua->cmd[0] = 0;
         }
-        jcr->RestoreWhere = bstrdup(ua->cmd);
+        jcr->where = bstrdup(ua->cmd);
         goto try_again;
       case 8:
         /* Replace */
@@ -615,7 +635,7 @@ When:       %s\n"),
         for (i=0; ReplaceOptions[i].name; i++) {
            add_prompt(ua, ReplaceOptions[i].name);
         }
-         opt = do_prompt(ua, _("Select replace option"), NULL, 0);
+         opt = do_prompt(ua, "", _("Select replace option"), NULL, 0);
         if (opt >=  0) {
            jcr->replace = ReplaceOptions[opt].token;
         }