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 d72f18962a201652531c7a3f04718c1679a1e370..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) {
@@ -414,7 +414,7 @@ Storage:    %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,
@@ -429,10 +429,11 @@ Replace:    %s\n\
 FileSet:    %s\n\
 Client:     %s\n\
 Storage:    %s\n\
+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,
@@ -511,8 +512,8 @@ 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"));
+            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;
@@ -619,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 */