X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fdird%2Fua_restore.c;h=a79eb8b0fc039efbf84e110817aaebbd7b37e749;hb=b8b2ed2a6db4fb8436647d438185a364951375fc;hp=fa13461724bf35f279be4bf7c987031c0f7d0b7d;hpb=1298a004486339fbe9fb1a95134eac28a2d9d822;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index fa13461724..a79eb8b0fc 100644
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -14,7 +14,7 @@
  */
 
 /*
-   Copyright (C) 2002-2003 Kern Sibbald and John Walker
+   Copyright (C) 2002-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
@@ -38,25 +38,18 @@
 
 
 /* Imported functions */
-extern int runcmd(UAContext *ua, char *cmd);
+extern int run_cmd(UAContext *ua, char *cmd);
+extern void print_bsr(UAContext *ua, RBSR *bsr);
 
 /* Imported variables */
-extern char *uar_list_jobs,	*uar_file,	  *uar_sel_files;
-extern char *uar_del_temp,	*uar_del_temp1,   *uar_create_temp;
-extern char *uar_create_temp1,	*uar_last_full,   *uar_full;
-extern char *uar_inc_dec,	*uar_list_temp,   *uar_sel_jobid_temp;
-extern char *uar_sel_all_temp1, *uar_sel_fileset, *uar_mediatype;
+extern char *uar_list_jobs,	 *uar_file,	   *uar_sel_files;
+extern char *uar_del_temp,	 *uar_del_temp1,   *uar_create_temp;
+extern char *uar_create_temp1,	 *uar_last_full,   *uar_full;
+extern char *uar_inc,		 *uar_list_temp,   *uar_sel_jobid_temp;
+extern char *uar_sel_all_temp1,  *uar_sel_fileset, *uar_mediatype;
+extern char *uar_jobid_fileindex, *uar_dif,	   *uar_sel_all_temp;
 
 
-/* Main structure for obtaining JobIds */
-struct JOBIDS {
-   utime_t JobTDate;
-   uint32_t TotalFiles;
-   char ClientName[MAX_NAME_LENGTH];
-   char JobIds[200];		      /* User entered string of JobIds */
-   STORE  *store;
-};
-
 struct NAME_LIST {
    char **name; 		      /* list of names */
    int num_ids; 		      /* ids stored */
@@ -65,199 +58,219 @@ struct NAME_LIST {
    int tot_ids; 		      /* total to process */
 };
 
+
+/* Main structure for obtaining JobIds or Files to be restored */
+struct RESTORE_CTX {
+   utime_t JobTDate;
+   uint32_t TotalFiles;
+   uint32_t JobId;
+   char ClientName[MAX_NAME_LENGTH];
+   char last_jobid[10];
+   POOLMEM *JobIds;		      /* User entered string of JobIds */
+   STORE  *store;
+   JOB *restore_job;
+   POOL *pool;
+   int restore_jobs;
+   uint32_t selected_files;
+   char *where;
+   RBSR *bsr;
+   POOLMEM *fname;		      /* filename only */
+   POOLMEM *path;		      /* path only */
+   POOLMEM *query;
+   int fnl;			      /* filename length */
+   int pnl;			      /* path length */
+   bool found;
+   NAME_LIST name_list;
+};
+
+
 #define MAX_ID_LIST_LEN 1000000
 
 
 /* Forward referenced functions */
 static int last_full_handler(void *ctx, int num_fields, char **row);
 static int jobid_handler(void *ctx, int num_fields, char **row);
-static int next_jobid_from_list(char **p, uint32_t *JobId);
-static int user_select_jobids(UAContext *ua, JOBIDS *ji);
+static int get_next_jobid_from_list(char **p, uint32_t *JobId);
+static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx);
 static int fileset_handler(void *ctx, int num_fields, char **row);
 static void print_name_list(UAContext *ua, NAME_LIST *name_list);
 static int unique_name_list_handler(void *ctx, int num_fields, char **row);
 static void free_name_list(NAME_LIST *name_list);
-static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, JOBIDS *ji);
-static int select_backups_before_date(UAContext *ua, JOBIDS *ji, char *date);
+static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, RESTORE_CTX *rx);
+static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date);
+static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx);
+static void free_rx(RESTORE_CTX *rx);
+static void split_path_and_filename(RESTORE_CTX *rx, char *fname);
+static int jobid_fileindex_handler(void *ctx, int num_fields, char **row);
+static int insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file,
+					char *date);
+static void insert_one_file(UAContext *ua, RESTORE_CTX *rx, char *date);
+static int get_client_name(UAContext *ua, RESTORE_CTX *rx);
+static int get_date(UAContext *ua, char *date, int date_len);
 
 /*
  *   Restore files
  *
  */
-int restorecmd(UAContext *ua, char *cmd)
+int restore_cmd(UAContext *ua, char *cmd)
 {
-   POOLMEM *query;
-   TREE_CTX tree;
-   JobId_t JobId, last_JobId;
-   char *p;
-   RBSR *bsr;
-   char *nofname = "";
-   JOBIDS ji;
-   JOB *job = NULL;
-   JOB *restore_job = NULL;
-   int restore_jobs = 0;
-   NAME_LIST name_list;
-   uint32_t selected_files = 0;
-   char *where = NULL;
+   RESTORE_CTX rx;		      /* restore context */
+   JOB *job;
    int i;
 
+   memset(&rx, 0, sizeof(rx));
+   rx.path = get_pool_memory(PM_FNAME);
+   rx.fname = get_pool_memory(PM_FNAME);
+   rx.JobIds = get_pool_memory(PM_FNAME);
+   rx.query = get_pool_memory(PM_FNAME);
+   rx.bsr = new_bsr();
+
    i = find_arg_with_value(ua, "where");
    if (i >= 0) {
-      where = ua->argv[i];
+      rx.where = ua->argv[i];
    }
 
    if (!open_db(ua)) {
-      return 0;
+      goto bail_out;
    }
 
-   memset(&tree, 0, sizeof(TREE_CTX));
-   memset(&name_list, 0, sizeof(name_list));
-   memset(&ji, 0, sizeof(ji));
-
    /* Ensure there is at least one Restore Job */
    LockRes();
-   while ( (job = (JOB *)GetNextRes(R_JOB, (RES *)job)) ) {
+   foreach_res(job, R_JOB) {
       if (job->JobType == JT_RESTORE) {
-	 if (!restore_job) {
-	    restore_job = job;
+	 if (!rx.restore_job) {
+	    rx.restore_job = job;
 	 }
-	 restore_jobs++;
+	 rx.restore_jobs++;
       }
    }
    UnlockRes();
-   if (!restore_jobs) {
+   if (!rx.restore_jobs) {
       bsendmsg(ua, _(
          "No Restore Job Resource found. You must create at least\n"
          "one before running this command.\n"));
-      return 0;
+      goto bail_out;
    }
 
    /* 
-    * Request user to select JobIds by various different methods
+    * Request user to select JobIds or files by various different methods
     *  last 20 jobs, where File saved, most recent backup, ...
+    *  In the end, a list of files are pumped into
+    *  add_findex()
     */
-   if (!user_select_jobids(ua, &ji)) {
-      return 0;
-   }
-
-   /* 
-    * Build the directory tree containing JobIds user selected
-    */
-   tree.root = new_tree(ji.TotalFiles);
-   tree.root->fname = nofname;
-   tree.ua = ua;
-   query = get_pool_memory(PM_MESSAGE);
-   last_JobId = 0;
-   /*
-    * For display purposes, the same JobId, with different volumes may
-    * appear more than once, however, we only insert it once.
-    */
-   int items = 0;
-   for (p=ji.JobIds; next_jobid_from_list(&p, &JobId) > 0; ) {
-
-      if (JobId == last_JobId) {	     
-	 continue;		      /* eliminate duplicate JobIds */
-      }
-      last_JobId = JobId;
-      bsendmsg(ua, _("Building directory tree for JobId %u ...\n"), JobId);
-      items++;
-      /*
-       * Find files for this JobId and insert them in the tree
-       */
-      Mmsg(&query, uar_sel_files, JobId);
-      if (!db_sql_query(ua->db, query, insert_tree_handler, (void *)&tree)) {
-         bsendmsg(ua, "%s", db_strerror(ua->db));
-      }
-      /*
-       * Find the FileSets for this JobId and add to the name_list
-       */
-      Mmsg(&query, uar_mediatype, JobId);
-      if (!db_sql_query(ua->db, query, unique_name_list_handler, (void *)&name_list)) {
-         bsendmsg(ua, "%s", db_strerror(ua->db));
-      }
-   }
-   bsendmsg(ua, "%d item%s inserted into the tree and marked for extraction.\n", 
-      items, items==1?"":"s");
-   free_pool_memory(query);
-
-   /* Check MediaType and select storage that corresponds */
-   get_storage_from_mediatype(ua, &name_list, &ji);
-   free_name_list(&name_list);
-
-   if (find_arg(ua, _("all")) < 0) {
-      /* Let the user select which files to restore */
-      user_select_files_from_tree(&tree);
-   }
-
-   /*
-    * Walk down through the tree finding all files marked to be 
-    *  extracted making a bootstrap file.
-    */
-   bsr = new_bsr();
-   for (TREE_NODE *node=first_tree_node(tree.root); node; node=next_tree_node(node)) {
-      Dmsg2(400, "FI=%d node=0x%x\n", node->FileIndex, node);
-      if (node->extract) {
-         Dmsg2(400, "type=%d FI=%d\n", node->type, node->FileIndex);
-	 add_findex(bsr, node->JobId, node->FileIndex);
-	 selected_files++;
+   switch (user_select_jobids_or_files(ua, &rx)) {
+   case 0:
+      goto bail_out;
+   case 1:			      /* select by jobid */
+      if (!build_directory_tree(ua, &rx)) {
+         bsendmsg(ua, _("Restore not done.\n"));
+	 goto bail_out;
       }
+      break;
+   case 2:			      /* select by filename, no tree needed */
+      break;
    }
 
-   free_tree(tree.root);	      /* free the directory tree */
-
-   if (bsr->JobId) {
-      if (!complete_bsr(ua, bsr)) {   /* find Vol, SessId, SessTime from JobIds */
+   if (rx.bsr->JobId) {
+      if (!complete_bsr(ua, rx.bsr)) {	 /* find Vol, SessId, SessTime from JobIds */
          bsendmsg(ua, _("Unable to construct a valid BSR. Cannot continue.\n"));
-	 free_bsr(bsr);
-	 return 0;
+	 goto bail_out;
+      }
+      if (!write_bsr_file(ua, rx.bsr)) {
+	 goto bail_out;
       }
-//    print_bsr(ua, bsr);
-      write_bsr_file(ua, bsr);
-      bsendmsg(ua, _("\n%u files selected to restore.\n\n"), selected_files);
+      bsendmsg(ua, _("\n%u file%s selected to be restored.\n\n"), rx.selected_files,
+         rx.selected_files==1?"":"s");
    } else {
-      bsendmsg(ua, _("No files selected to restore.\n"));
+      bsendmsg(ua, _("No files selected to be restored.\n"));
+      goto bail_out;
    }
-   free_bsr(bsr);
 
-   if (restore_jobs == 1) {
-      job = restore_job;
+   if (rx.restore_jobs == 1) {
+      job = rx.restore_job;
    } else {
       job = select_restore_job_resource(ua);
    }
    if (!job) {
-      bsendmsg(ua, _("No Restore Job resource found!\n"));
-      return 0;
+      goto bail_out;
    }
 
-   /* If no client name specified yet, get it now */
-   if (!ji.ClientName[0]) {
-      CLIENT_DBR cr;
-      memset(&cr, 0, sizeof(cr));
-      if (!get_client_dbr(ua, &cr)) {
-	 return 0;
-      }
-      bstrncpy(ji.ClientName, cr.Name, sizeof(ji.ClientName));
+   get_client_name(ua, &rx);
+   if (!rx.ClientName) {
+      bsendmsg(ua, _("No Restore Job resource found!\n"));
+      goto bail_out;
    }
 
    /* Build run command */
-   if (where) {
+   if (rx.where) {
       Mmsg(&ua->cmd, 
           "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\""
-          " where=\"%s\"",
-          job->hdr.name, ji.ClientName, ji.store?ji.store->hdr.name:"",
-	  working_directory, where);
+          " where=\"%s\" files=%d",
+          job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"",
+	  working_directory, rx.where, rx.selected_files);
    } else {
       Mmsg(&ua->cmd, 
           "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\"",
-          job->hdr.name, ji.ClientName, ji.store?ji.store->hdr.name:"",
+          job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"",
 	  working_directory);
    }
-   
+   if (find_arg(ua, _("yes")) > 0) {
+      pm_strcat(&ua->cmd, " yes");    /* pass it on to the run command */
+   }
    Dmsg1(400, "Submitting: %s\n", ua->cmd);
    parse_ua_args(ua);
-   runcmd(ua, ua->cmd);
+   run_cmd(ua, ua->cmd);
 
    bsendmsg(ua, _("Restore command done.\n"));
+   free_rx(&rx);
+   return 1;
+
+bail_out:
+   free_rx(&rx);
+   return 0;
+
+}
+
+static void free_rx(RESTORE_CTX *rx) 
+{
+   free_bsr(rx->bsr);
+   rx->bsr = NULL;
+   if (rx->JobIds) {
+      free_pool_memory(rx->JobIds);
+      rx->JobIds = NULL;
+   }
+   if (rx->fname) {
+      free_pool_memory(rx->fname);
+      rx->fname = NULL;
+   }
+   if (rx->path) {
+      free_pool_memory(rx->path);
+      rx->path = NULL;
+   }
+   if (rx->query) {
+      free_pool_memory(rx->query);
+      rx->query = NULL;
+   }
+   free_name_list(&rx->name_list);
+}
+
+static int get_client_name(UAContext *ua, RESTORE_CTX *rx)
+{
+   /* If no client name specified yet, get it now */
+   if (!rx->ClientName[0]) {
+      CLIENT_DBR cr;
+      /* try command line argument */
+      int i = find_arg_with_value(ua, _("client"));
+      if (i >= 0) {
+	 bstrncpy(rx->ClientName, ua->argv[i], sizeof(rx->ClientName));
+	 return 1;
+      }
+      memset(&cr, 0, sizeof(cr));
+      if (!get_client_dbr(ua, &cr)) {
+	 return 0;
+      }
+      bstrncpy(rx->ClientName, cr.Name, sizeof(rx->ClientName));
+   }
    return 1;
 }
 
@@ -266,22 +279,24 @@ int restorecmd(UAContext *ua, char *cmd)
  *  select a list of JobIds from which he will subsequently
  *  select which files are to be restored.
  */
-static int user_select_jobids(UAContext *ua, JOBIDS *ji)
+static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx)
 {
    char *p;
    char date[MAX_TIME_LENGTH];
+   bool have_date = false;
    JobId_t JobId;
    JOB_DBR jr;
-   POOLMEM *query;
    bool done = false;
-   int i;
+   int i, j;
    char *list[] = { 
       "List last 20 Jobs run",
       "List Jobs where a given File is saved",
-      "Enter list of JobIds to select",
+      "Enter list of comma separated JobIds to select",
       "Enter SQL list command", 
       "Select the most recent backup for a client",
       "Select backup for a client before a specified time",
+      "Enter a list of files to restore",
+      "Enter a list of files to restore before a specified time",
       "Cancel",
       NULL };
 
@@ -289,42 +304,98 @@ static int user_select_jobids(UAContext *ua, JOBIDS *ji)
       "jobid",     /* 0 */
       "current",   /* 1 */
       "before",    /* 2 */
+      "file",      /* 3 */
+      "select",    /* 4 */
+      "pool",      /* 5 */
+      "client",    /* 6 */
+      "storage",   /* 7 */
+      "fileset",   /* 8 */
+      "where",     /* 9 */
+      "all",       /* 10 */
+      "yes",       /* 11 */
       NULL
    };
 
-   switch (find_arg_keyword(ua, kw)) {
-   case 0:			      /* jobid */
-      i = find_arg_with_value(ua, _("jobid"));
-      if (i < 0) {
-	 return 0;
-      }
-      bstrncpy(ji->JobIds, ua->argv[i], sizeof(ji->JobIds));
-      done = true;
-      break;
-   case 1:			      /* current */
-      bstrutime(date, sizeof(date), time(NULL));
-      if (!select_backups_before_date(ua, ji, date)) {
-	 return 0;
-      }
-      done = true;
-      break;
-   case 2:			      /* before */
-      i = find_arg_with_value(ua, _("before"));
-      if (i < 0) {
-	 return 0;
+   *rx->JobIds = 0;
+
+   for (i=1; i<ua->argc; i++) {       /* loop through arguments */
+      bool found_kw = false;
+      for (j=0; kw[j]; j++) {	      /* loop through keywords */
+	 if (strcasecmp(kw[j], ua->argk[i]) == 0) {
+	    found_kw = true;
+	    break;
+	 }
       }
-      if (str_to_utime(ua->argv[i]) == 0) {
-         bsendmsg(ua, _("Improper date format: %s\n"), ua->argv[i]);
+      if (!found_kw) {
+         bsendmsg(ua, _("Unknown keyword: %s\n"), ua->argk[i]);
 	 return 0;
       }
-      bstrncpy(date, ua->argv[i], sizeof(date));
-      if (!select_backups_before_date(ua, ji, date)) {
-	 return 0;
+      /* Found keyword in kw[] list, process it */
+      switch (j) {
+      case 0:				 /* jobid */
+	 if (*rx->JobIds != 0) {
+            pm_strcat(&rx->JobIds, ",");
+	 }
+	 pm_strcat(&rx->JobIds, ua->argv[i]);
+	 done = true;
+	 break;
+      case 1:				 /* current */
+	 bstrutime(date, sizeof(date), time(NULL));
+	 have_date = true;
+	 break;
+      case 2:				 /* before */
+	 if (str_to_utime(ua->argv[i]) == 0) {
+            bsendmsg(ua, _("Improper date format: %s\n"), ua->argv[i]);
+	    return 0;
+	 }
+	 bstrncpy(date, ua->argv[i], sizeof(date));
+	 have_date = true;
+	 break;
+      case 3:				 /* file */
+	 if (!have_date) {
+	    bstrutime(date, sizeof(date), time(NULL));
+	 }
+	 if (!get_client_name(ua, rx)) {
+	    return 0;
+	 }
+	 pm_strcpy(&ua->cmd, ua->argv[i]);
+	 insert_one_file(ua, rx, date);
+	 if (rx->name_list.num_ids) {
+	    /* Check MediaType and select storage that corresponds */
+	    get_storage_from_mediatype(ua, &rx->name_list, rx);
+	    done = true;
+	 }
+	 break;
+      case 4:				 /* select */
+	 if (!have_date) {
+	    bstrutime(date, sizeof(date), time(NULL));
+	 }
+	 if (!select_backups_before_date(ua, rx, date)) {
+	    return 0;
+	 }
+	 done = true;
+	 break;
+      case 5:				 /* pool specified */
+	 rx->pool = (POOL *)GetResWithName(R_POOL, ua->argv[i]);
+	 if (!rx->pool) {
+            bsendmsg(ua, _("Error: Pool resource \"%s\" does not exist.\n"), ua->argv[i]);
+	    return 0;
+	 }
+	 if (!acl_access_ok(ua, Pool_ACL, ua->argv[i])) {
+	    rx->pool = NULL;
+            bsendmsg(ua, _("Error: Pool resource \"%s\" access not allowed.\n"), ua->argv[i]);
+	    return 0;
+	 }
+	 break;
+      /*     
+       * All keywords 6 or greater are ignored or handled by a select prompt
+       */
+      default:
+	 break;
       }
-      done = true;
-      break;
-   default:
-      break;
+   }
+   if (rx->name_list.num_ids) {
+      return 2; 		      /* filename list made */
    }
        
    if (!done) {
@@ -336,6 +407,9 @@ static int user_select_jobids(UAContext *ua, JOBIDS *ji)
 
    /* If choice not already made above, prompt */
    for ( ; !done; ) {
+      char *fname;
+      int len;
+
       start_prompt(ua, _("To select the JobIds, you have the following choices:\n"));
       for (int i=0; list[i]; i++) {
 	 add_prompt(ua, list[i]);
@@ -349,26 +423,22 @@ static int user_select_jobids(UAContext *ua, JOBIDS *ji)
 	 done = false;
 	 break;
       case 1:			      /* list where a file is saved */
-	 char *fname;
-	 int len;
          if (!get_cmd(ua, _("Enter Filename: "))) {
 	    return 0;
 	 }
 	 len = strlen(ua->cmd);
 	 fname = (char *)malloc(len * 2 + 1);
 	 db_escape_string(fname, ua->cmd, len);
-	 query = get_pool_memory(PM_MESSAGE);
-	 Mmsg(&query, uar_file, fname);
+	 Mmsg(&rx->query, uar_file, fname);
 	 free(fname);
-	 db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, HORZ_LIST);
-	 free_pool_memory(query);
+	 db_list_sql_query(ua->jcr, ua->db, rx->query, prtit, ua, 1, HORZ_LIST);
 	 done = false;
 	 break;
       case 2:			      /* enter a list of JobIds */
          if (!get_cmd(ua, _("Enter JobId(s), comma separated, to restore: "))) {
 	    return 0;
 	 }
-	 bstrncpy(ji->JobIds, ua->cmd, sizeof(ji->JobIds));
+	 pm_strcpy(&rx->JobIds, ua->cmd);
 	 break;
       case 3:			      /* Enter an SQL list command */
          if (!get_cmd(ua, _("Enter SQL list command: "))) {
@@ -379,43 +449,85 @@ static int user_select_jobids(UAContext *ua, JOBIDS *ji)
 	 break;
       case 4:			      /* Select the most recent backups */
 	 bstrutime(date, sizeof(date), time(NULL));
-	 if (!select_backups_before_date(ua, ji, date)) {
+	 if (!select_backups_before_date(ua, rx, date)) {
 	    return 0;
 	 }
 	 break;
       case 5:			      /* select backup at specified time */
-         bsendmsg(ua, _("The restored files will the most current backup\n"
-                        "BEFORE the date you specify below.\n\n"));
+	 if (!get_date(ua, date, sizeof(date))) {
+	    return 0;
+	 }
+	 if (!select_backups_before_date(ua, rx, date)) {
+	    return 0;
+	 }
+	 break;
+      case 6:			      /* Enter files */
+	 bstrutime(date, sizeof(date), time(NULL));
+	 if (!get_client_name(ua, rx)) {
+	    return 0;
+	 }
+         bsendmsg(ua, _("Enter file names, or < to enter a filename\n"      
+                        "containg a list of file names, and terminate\n"
+                        "them with a blank line.\n"));
 	 for ( ;; ) {
-            if (!get_cmd(ua, _("Enter date as YYYY-MM-DD HH:MM:SS :"))) {
+            if (!get_cmd(ua, _("Enter filename: "))) {
 	       return 0;
 	    }
-	    if (str_to_utime(ua->cmd) != 0) {
+	    len = strlen(ua->cmd);
+	    if (len == 0) {
 	       break;
 	    }
-            bsendmsg(ua, _("Improper date format.\n"));
-	 }		
-	 bstrncpy(date, ua->cmd, sizeof(date));
-	 if (!select_backups_before_date(ua, ji, date)) {
+	    insert_one_file(ua, rx, date);
+	 }
+	 /* Check MediaType and select storage that corresponds */
+	 if (rx->name_list.num_ids) {
+	    get_storage_from_mediatype(ua, &rx->name_list, rx);
+	 }
+	 return 2;
+       case 7:			      /* enter files backed up before specified time */
+	 if (!get_date(ua, date, sizeof(date))) {
 	    return 0;
 	 }
+	 if (!get_client_name(ua, rx)) {
+	    return 0;
+	 }
+         bsendmsg(ua, _("Enter file names, or < to enter a filename\n"      
+                        "containg a list of file names, and terminate\n"
+                        "them with a blank line.\n"));
+	 for ( ;; ) {
+            if (!get_cmd(ua, _("Enter filename: "))) {
+	       return 0;
+	    }
+	    len = strlen(ua->cmd);
+	    if (len == 0) {
+	       break;
+	    }
+	    insert_one_file(ua, rx, date);
+	 }
+	 /* Check MediaType and select storage that corresponds */
+	 if (rx->name_list.num_ids) {
+	    get_storage_from_mediatype(ua, &rx->name_list, rx);
+	 }
+	 return 2;
 
-      case 6:			      /* Cancel or quit */
+      
+      case 8:			      /* Cancel or quit */
 	 return 0;
       }
    }
 
-   if (*ji->JobIds == 0) {
+   if (*rx->JobIds == 0) {
       bsendmsg(ua, _("No Jobs selected.\n"));
       return 0;
    }
-   bsendmsg(ua, _("You have selected the following JobId: %s\n"), ji->JobIds);
+   bsendmsg(ua, _("You have selected the following JobId%s: %s\n"), 
+      strchr(rx->JobIds,',')?"s":"",rx->JobIds);
 
    memset(&jr, 0, sizeof(JOB_DBR));
 
-   ji->TotalFiles = 0;
-   for (p=ji->JobIds; ; ) {
-      int stat = next_jobid_from_list(&p, &JobId);
+   rx->TotalFiles = 0;
+   for (p=rx->JobIds; ; ) {
+      int stat = get_next_jobid_from_list(&p, &JobId);
       if (stat < 0) {
          bsendmsg(ua, _("Invalid JobId in list.\n"));
 	 return 0;
@@ -423,30 +535,250 @@ static int user_select_jobids(UAContext *ua, JOBIDS *ji)
       if (stat == 0) {
 	 break;
       }
+      if (jr.JobId == JobId) {
+	 continue;		      /* duplicate of last JobId */
+      }
       jr.JobId = JobId;
       if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
-         bsendmsg(ua, _("Unable to get Job record. ERR=%s\n"), db_strerror(ua->db));
+         bsendmsg(ua, _("Unable to get Job record for JobId=%u: ERR=%s\n"), 
+	    JobId, db_strerror(ua->db));
 	 return 0;
       }
-      ji->TotalFiles += jr.JobFiles;
+      if (!acl_access_ok(ua, Job_ACL, jr.Name)) {
+         bsendmsg(ua, _("No authorization. Job \"%s\" not selected.\n"), 
+	    jr.Name);
+	 continue; 
+      }
+      rx->TotalFiles += jr.JobFiles;
    }
    return 1;
 }
 
+/* 
+ * Get date from user
+ */
+static int get_date(UAContext *ua, char *date, int date_len)
+{
+   bsendmsg(ua, _("The restored files will the most current backup\n"
+                  "BEFORE the date you specify below.\n\n"));
+   for ( ;; ) {
+      if (!get_cmd(ua, _("Enter date as YYYY-MM-DD HH:MM:SS :"))) {
+	 return 0;
+      }
+      if (str_to_utime(ua->cmd) != 0) {
+	 break;
+      }
+      bsendmsg(ua, _("Improper date format.\n"));
+   }		  
+   bstrncpy(date, ua->cmd, date_len);
+   return 1;
+}
+
+/*
+ * Insert a single file, or read a list of files from a file 
+ */
+static void insert_one_file(UAContext *ua, RESTORE_CTX *rx, char *date)
+{
+   FILE *ffd;
+   char file[5000];
+   char *p = ua->cmd;
+   int line = 0;
+  
+   switch (*p) {
+   case '<':
+      p++;
+      if ((ffd = fopen(p, "r")) == NULL) {
+         bsendmsg(ua, _("Cannot open file %s: ERR=%s\n"),
+	    p, strerror(errno));
+	 break;
+      }
+      while (fgets(file, sizeof(file), ffd)) {
+	 line++;
+	 if (!insert_file_into_findex_list(ua, rx, file, date)) {
+            bsendmsg(ua, _("Error occurred on line %d of %s\n"), line, p);
+	 }
+      }
+      fclose(ffd);
+      break;
+   default:
+      insert_file_into_findex_list(ua, rx, ua->cmd, date);
+      break;
+   }
+}
+
+/*
+ * For a given file (path+filename), split into path and file, then
+ *   lookup the most recent backup in the catalog to get the JobId
+ *   and FileIndex, then insert them into the findex list.
+ */
+static int insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file, 
+					char *date)
+{
+   strip_trailing_junk(file);
+   split_path_and_filename(rx, file);
+   Mmsg(&rx->query, uar_jobid_fileindex, date, rx->path, rx->fname, rx->ClientName);
+   rx->found = false;
+   /* Find and insert jobid and File Index */
+   if (!db_sql_query(ua->db, rx->query, jobid_fileindex_handler, (void *)rx)) {
+      bsendmsg(ua, _("Query failed: %s. ERR=%s\n"), 
+	 rx->query, db_strerror(ua->db));
+   }
+   if (!rx->found) {
+      bsendmsg(ua, _("No database record found for: %s\n"), file);
+      return 0;
+   }
+   rx->selected_files++;
+   /*
+    * Find the MediaTypes for this JobId and add to the name_list
+    */
+   Mmsg(&rx->query, uar_mediatype, rx->JobId);
+   if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) {
+      bsendmsg(ua, "%s", db_strerror(ua->db));
+      return 0;
+   }
+   return 1;
+}
+
+static void split_path_and_filename(RESTORE_CTX *rx, char *name)
+{
+   char *p, *f;
+
+   /* Find path without the filename.  
+    * I.e. everything after the last / is a "filename".
+    * OK, maybe it is a directory name, but we treat it like
+    * a filename. If we don't find a / then the whole name
+    * must be a path name (e.g. c:).
+    */
+   for (p=f=name; *p; p++) {
+      if (*p == '/') {
+	 f = p; 		      /* set pos of last slash */
+      }
+   }
+   if (*f == '/') {                   /* did we find a slash? */
+      f++;			      /* yes, point to filename */
+   } else {			      /* no, whole thing must be path name */
+      f = p;
+   }
+
+   /* If filename doesn't exist (i.e. root directory), we
+    * simply create a blank name consisting of a single 
+    * space. This makes handling zero length filenames
+    * easier.
+    */
+   rx->fnl = p - f;
+   if (rx->fnl > 0) {
+      rx->fname = check_pool_memory_size(rx->fname, rx->fnl+1);
+      memcpy(rx->fname, f, rx->fnl);	/* copy filename */
+      rx->fname[rx->fnl] = 0;
+   } else {
+      rx->fname[0] = ' ';            /* blank filename */
+      rx->fname[1] = 0;
+      rx->fnl = 1;
+   }
+
+   rx->pnl = f - name;	  
+   if (rx->pnl > 0) {
+      rx->path = check_pool_memory_size(rx->path, rx->pnl+1);
+      memcpy(rx->path, name, rx->pnl);
+      rx->path[rx->pnl] = 0;
+   } else {
+      rx->path[0] = ' ';
+      rx->path[1] = 0;
+      rx->pnl = 1;
+   }
+
+   Dmsg2(100, "sllit path=%s file=%s\n", rx->path, rx->fname);
+}
+
+static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx)
+{
+   TREE_CTX tree;
+   JobId_t JobId, last_JobId;
+   char *p;
+   char *nofname = "";
+   bool OK = true;
+
+   memset(&tree, 0, sizeof(TREE_CTX));
+   /* 
+    * Build the directory tree containing JobIds user selected
+    */
+   tree.root = new_tree(rx->TotalFiles);
+   tree.root->fname = nofname;
+   tree.ua = ua;
+   last_JobId = 0;
+   /*
+    * For display purposes, the same JobId, with different volumes may
+    * appear more than once, however, we only insert it once.
+    */
+   int items = 0;
+   for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
+
+      if (JobId == last_JobId) {	     
+	 continue;		      /* eliminate duplicate JobIds */
+      }
+      last_JobId = JobId;
+      bsendmsg(ua, _("Building directory tree for JobId %u ...\n"), JobId);
+      items++;
+      /*
+       * Find files for this JobId and insert them in the tree
+       */
+      Mmsg(&rx->query, uar_sel_files, JobId);
+      if (!db_sql_query(ua->db, rx->query, insert_tree_handler, (void *)&tree)) {
+         bsendmsg(ua, "%s", db_strerror(ua->db));
+      }
+      /*
+       * Find the MediaTypes for this JobId and add to the name_list
+       */
+      Mmsg(&rx->query, uar_mediatype, JobId);
+      if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) {
+         bsendmsg(ua, "%s", db_strerror(ua->db));
+      }
+   }
+   bsendmsg(ua, "%d Job%s inserted into the tree and marked for extraction.\n", 
+      items, items==1?"":"s");
+
+   /* Check MediaType and select storage that corresponds */
+   get_storage_from_mediatype(ua, &rx->name_list, rx);
+
+   if (find_arg(ua, _("all")) < 0) {
+      /* Let the user interact in selecting which files to restore */
+      OK = user_select_files_from_tree(&tree);
+   }
+
+   /*
+    * Walk down through the tree finding all files marked to be 
+    *  extracted making a bootstrap file.
+    */
+   if (OK) {
+      for (TREE_NODE *node=first_tree_node(tree.root); node; node=next_tree_node(node)) {
+         Dmsg2(400, "FI=%d node=0x%x\n", node->FileIndex, node);
+	 if (node->extract || node->extract_dir) {
+            Dmsg2(400, "type=%d FI=%d\n", node->type, node->FileIndex);
+	    add_findex(rx->bsr, node->JobId, node->FileIndex);
+	    rx->selected_files++;
+	 }
+      }
+   }
+
+   free_tree(tree.root);	      /* free the directory tree */
+   return OK;
+}
+
+
 /*
  * This routine is used to get the current backup or a backup
  *   before the specified date.
  */
-static int select_backups_before_date(UAContext *ua, JOBIDS *ji, char *date)
+static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date)
 {
    int stat = 0;
-   POOLMEM *query;
    FILESET_DBR fsr;
    CLIENT_DBR cr;
    char fileset_name[MAX_NAME_LENGTH];
    char ed1[50];
+   char pool_select[MAX_NAME_LENGTH];
+   int i;
 
-   query = get_pool_memory(PM_MESSAGE);
 
    /* Create temp tables */
    db_sql_query(ua->db, uar_del_temp, NULL, NULL);
@@ -464,31 +796,57 @@ static int select_backups_before_date(UAContext *ua, JOBIDS *ji, char *date)
    if (!get_client_dbr(ua, &cr)) {
       goto bail_out;
    }
-   bstrncpy(ji->ClientName, cr.Name, sizeof(ji->ClientName));
+   bstrncpy(rx->ClientName, cr.Name, sizeof(rx->ClientName));
 
    /*
-    * Select FileSet 
+    * Get FileSet 
     */
-   Mmsg(&query, uar_sel_fileset, cr.ClientId, cr.ClientId);
-   start_prompt(ua, _("The defined FileSet resources are:\n"));
-   if (!db_sql_query(ua->db, query, fileset_handler, (void *)ua)) {
-      bsendmsg(ua, "%s\n", db_strerror(ua->db));
+   memset(&fsr, 0, sizeof(fsr));
+   i = find_arg_with_value(ua, "FileSet"); 
+   if (i >= 0) {
+      bstrncpy(fsr.FileSet, ua->argv[i], sizeof(fsr.FileSet));
+      if (!db_get_fileset_record(ua->jcr, ua->db, &fsr)) {
+         bsendmsg(ua, _("Error getting FileSet \"%s\": ERR=%s\n"), fsr.FileSet, 
+	    db_strerror(ua->db));
+	 i = -1;
+      }
    }
-   if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"), 
+   if (i < 0) { 		      /* fileset not found */
+      Mmsg(&rx->query, uar_sel_fileset, cr.ClientId, cr.ClientId);
+      start_prompt(ua, _("The defined FileSet resources are:\n"));
+      if (!db_sql_query(ua->db, rx->query, fileset_handler, (void *)ua)) {
+         bsendmsg(ua, "%s\n", db_strerror(ua->db));
+      }
+      if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"), 
 		 fileset_name, sizeof(fileset_name)) < 0) {
-      goto bail_out;
-   }
-   fsr.FileSetId = atoi(fileset_name);	/* Id is first part of name */
-   if (!db_get_fileset_record(ua->jcr, ua->db, &fsr)) {
-      bsendmsg(ua, _("Error getting FileSet record: %s\n"), db_strerror(ua->db));
-      bsendmsg(ua, _("This probably means you modified the FileSet.\n"
+	 goto bail_out;
+      }
+
+      bstrncpy(fsr.FileSet, fileset_name, sizeof(fsr.FileSet));
+      if (!db_get_fileset_record(ua->jcr, ua->db, &fsr)) {
+         bsendmsg(ua, _("Error getting FileSet record: %s\n"), db_strerror(ua->db));
+         bsendmsg(ua, _("This probably means you modified the FileSet.\n"
                      "Continuing anyway.\n"));
+      }
    }
 
+   /* If Pool specified, add PoolId specification */
+   pool_select[0] = 0;
+   if (rx->pool) {
+      POOL_DBR pr;
+      memset(&pr, 0, sizeof(pr));
+      bstrncpy(pr.Name, rx->pool->hdr.name, sizeof(pr.Name));
+      if (db_get_pool_record(ua->jcr, ua->db, &pr)) {
+         bsnprintf(pool_select, sizeof(pool_select), "AND Media.PoolId=%u ", pr.PoolId);
+      } else {
+         bsendmsg(ua, _("Pool \"%s\" not found, using any pool.\n"), pr.Name);
+      }
+   }
 
    /* Find JobId of last Full backup for this client, fileset */
-   Mmsg(&query, uar_last_full, cr.ClientId, cr.ClientId, date, fsr.FileSetId);
-   if (!db_sql_query(ua->db, query, NULL, NULL)) {
+   Mmsg(&rx->query, uar_last_full, cr.ClientId, cr.ClientId, date, fsr.FileSet,
+	 pool_select);
+   if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
       bsendmsg(ua, "%s\n", db_strerror(ua->db));
       goto bail_out;
    }
@@ -498,32 +856,49 @@ static int select_backups_before_date(UAContext *ua, JOBIDS *ji, char *date)
       bsendmsg(ua, "%s\n", db_strerror(ua->db));
       goto bail_out;
    }
-   /* Note, this is needed as I don't seem to get the callback
+   /* Note, this is needed because I don't seem to get the callback
     * from the call just above.
     */
-   ji->JobTDate = 0;
-   if (!db_sql_query(ua->db, uar_sel_all_temp1, last_full_handler, (void *)ji)) {
+   rx->JobTDate = 0;
+   if (!db_sql_query(ua->db, uar_sel_all_temp1, last_full_handler, (void *)rx)) {
+      bsendmsg(ua, "%s\n", db_strerror(ua->db));
+   }
+   if (rx->JobTDate == 0) {
+      bsendmsg(ua, _("No Full backup before %s found.\n"), date);
+      goto bail_out;
+   }
+
+   /* Now find most recent Differental Job after Full save, if any */
+   Mmsg(&rx->query, uar_dif, edit_uint64(rx->JobTDate, ed1), date,
+	cr.ClientId, fsr.FileSet, pool_select);
+   if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
+      bsendmsg(ua, "%s\n", db_strerror(ua->db));
+   }
+   /* Now update JobTDate to lock onto Differental, if any */
+   rx->JobTDate = 0;
+   if (!db_sql_query(ua->db, uar_sel_all_temp, last_full_handler, (void *)rx)) {
       bsendmsg(ua, "%s\n", db_strerror(ua->db));
    }
-   if (ji->JobTDate == 0) {
+   if (rx->JobTDate == 0) {
       bsendmsg(ua, _("No Full backup before %s found.\n"), date);
       goto bail_out;
    }
 
-   /* Now find all Incremental/Decremental Jobs after Full save */
-   Mmsg(&query, uar_inc_dec, edit_uint64(ji->JobTDate, ed1), date,
-	cr.ClientId, fsr.FileSetId);
-   if (!db_sql_query(ua->db, query, NULL, NULL)) {
+   /* Now find all Incremental Jobs after Full/dif save */
+   Mmsg(&rx->query, uar_inc, edit_uint64(rx->JobTDate, ed1), date,
+	cr.ClientId, fsr.FileSet, pool_select);
+   if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
       bsendmsg(ua, "%s\n", db_strerror(ua->db));
    }
 
    /* Get the JobIds from that list */
-   ji->JobIds[0] = 0;
-   if (!db_sql_query(ua->db, uar_sel_jobid_temp, jobid_handler, (void *)ji)) {
+   rx->JobIds[0] = 0;
+   rx->last_jobid[0] = 0;
+   if (!db_sql_query(ua->db, uar_sel_jobid_temp, jobid_handler, (void *)rx)) {
       bsendmsg(ua, "%s\n", db_strerror(ua->db));
    }
 
-   if (ji->JobIds[0] != 0) {
+   if (rx->JobIds[0] != 0) {
       /* Display a list of Jobs selected for this restore */
       db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1, HORZ_LIST);
    } else {
@@ -533,14 +908,14 @@ static int select_backups_before_date(UAContext *ua, JOBIDS *ji, char *date)
    stat = 1;
  
 bail_out:
-   free_pool_memory(query);
    db_sql_query(ua->db, uar_del_temp, NULL, NULL);
    db_sql_query(ua->db, uar_del_temp1, NULL, NULL);
    return stat;
 }
 
+
 /* Return next JobId from comma separated list */
-static int next_jobid_from_list(char **p, uint32_t *JobId)
+static int get_next_jobid_from_list(char **p, uint32_t *JobId)
 {
    char jobid[30];
    char *q = *p;
@@ -562,20 +937,33 @@ static int next_jobid_from_list(char **p, uint32_t *JobId)
    return 1;
 }
 
+/*
+ * Callback handler to get JobId and FileIndex for files
+ */
+static int jobid_fileindex_handler(void *ctx, int num_fields, char **row)
+{
+   RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
+   rx->JobId = atoi(row[0]);
+   add_findex(rx->bsr, rx->JobId, atoi(row[1]));
+   rx->found = true;
+   return 0;
+}
+
 /*
  * Callback handler make list of JobIds
  */
 static int jobid_handler(void *ctx, int num_fields, char **row)
 {
-   JOBIDS *ji = (JOBIDS *)ctx;
+   RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
 
-   /* Concatenate a JobId if it does not exceed array size */
-   if (strlen(ji->JobIds)+strlen(row[0])+2 < sizeof(ji->JobIds)) {
-      if (ji->JobIds[0] != 0) {
-         strcat(ji->JobIds, ",");
-      }
-      strcat(ji->JobIds, row[0]);
+   if (strcmp(rx->last_jobid, row[0]) == 0) {		
+      return 0; 		      /* duplicate id */
+   }
+   bstrncpy(rx->last_jobid, row[0], sizeof(rx->last_jobid));
+   if (rx->JobIds[0] != 0) {
+      pm_strcat(&rx->JobIds, ",");
    }
+   pm_strcat(&rx->JobIds, row[0]);
    return 0;
 }
 
@@ -585,22 +973,21 @@ static int jobid_handler(void *ctx, int num_fields, char **row)
  */
 static int last_full_handler(void *ctx, int num_fields, char **row)
 {
-   JOBIDS *ji = (JOBIDS *)ctx;
-
-   ji->JobTDate = strtoll(row[1], NULL, 10);
+   RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
 
+   rx->JobTDate = str_to_int64(row[1]); 
    return 0;
 }
 
 /*
- * Callback handler build fileset prompt list
+ * Callback handler build FileSet name prompt list
  */
 static int fileset_handler(void *ctx, int num_fields, char **row)
 {
-   char prompt[MAX_NAME_LENGTH+200];
-
-   snprintf(prompt, sizeof(prompt), "%s  %s  %s", row[0], row[1], row[2]);
-   add_prompt((UAContext *)ctx, prompt);
+   /* row[0] = FileSet (name) */
+   if (row[0]) {
+      add_prompt((UAContext *)ctx, row[0]);
+   }
    return 0;
 }
 
@@ -658,43 +1045,51 @@ static void free_name_list(NAME_LIST *name_list)
    }
    if (name_list->name) {
       free(name_list->name);
+      name_list->name = NULL;
    }
    name_list->max_ids = 0;
    name_list->num_ids = 0;
 }
 
-static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, JOBIDS *ji)
+static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, RESTORE_CTX *rx)
 {
-   char name[MAX_NAME_LENGTH];
-   STORE *store = NULL;
+   STORE *store;
 
    if (name_list->num_ids > 1) {
       bsendmsg(ua, _("Warning, the JobIds that you selected refer to more than one MediaType.\n"
          "Restore is not possible. The MediaTypes used are:\n"));
       print_name_list(ua, name_list);
-      ji->store = select_storage_resource(ua);
+      rx->store = select_storage_resource(ua);
       return;
    }
 
    if (name_list->num_ids == 0) {
       bsendmsg(ua, _("No MediaType found for your JobIds.\n"));
-      ji->store = select_storage_resource(ua);
+      rx->store = select_storage_resource(ua);
       return;
    }
-
-   start_prompt(ua, _("The defined Storage resources are:\n"));
+   if (rx->store) {
+      return;
+   }
+   /*
+    * We have a single MediaType, look it up in our Storage resource 
+    */
    LockRes();
-   while ((store = (STORE *)GetNextRes(R_STORAGE, (RES *)store))) {
-      if (strcmp(store->media_type, name_list->name[0]) == 0) {
-	 add_prompt(ua, store->hdr.name);
+   foreach_res(store, R_STORAGE) {
+      if (strcmp(name_list->name[0], store->media_type) == 0) {
+	 rx->store = store;
+	 UnlockRes();
+	 return;
       }
    }
    UnlockRes();
-   do_prompt(ua, _("Storage"),  _("Select Storage resource"), name, sizeof(name));
-   ji->store = (STORE *)GetResWithName(R_STORAGE, name);
-   if (!ji->store) {
+
+   /* Try asking user */
+   rx->store = get_storage_resource(ua, false /* don't use default */);
+
+   if (!rx->store) {
       bsendmsg(ua, _("\nWarning. Unable to find Storage resource for\n"
-         "MediaType %s, needed by the Jobs you selected.\n"
+         "MediaType \"%s\", needed by the Jobs you selected.\n"
          "You will be allowed to select a Storage device later.\n"),
 	 name_list->name[0]); 
    }