+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation plus additions
+ that are listed in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula Director -- User Agent Database File tree for Restore
*
* Version $Id$
*/
-/*
- Copyright (C) 2002-2005 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
-
- */
#include "bacula.h"
#include "dird.h"
static int helpcmd(UAContext *ua, TREE_CTX *tree);
static int cdcmd(UAContext *ua, TREE_CTX *tree);
static int pwdcmd(UAContext *ua, TREE_CTX *tree);
+static int dot_pwdcmd(UAContext *ua, TREE_CTX *tree);
static int unmarkcmd(UAContext *ua, TREE_CTX *tree);
static int unmarkdircmd(UAContext *ua, TREE_CTX *tree);
static int quitcmd(UAContext *ua, TREE_CTX *tree);
struct cmdstruct { const char *key; int (*func)(UAContext *ua, TREE_CTX *tree); const char *help; };
static struct cmdstruct commands[] = {
- { N_("cd"), cdcmd, _("change current directory")},
- { N_("count"), countcmd, _("count marked files in and below the cd")},
- { N_("dir"), dircmd, _("long list current directory, wildcards allowed")},
- { N_(".dir"), dot_dircmd, _("long list current directory, wildcards allowed")},
- { N_("done"), donecmd, _("leave file selection mode")},
- { N_("estimate"), estimatecmd, _("estimate restore size")},
- { N_("exit"), donecmd, _("same as done command")},
- { N_("find"), findcmd, _("find files, wildcards allowed")},
- { N_("help"), helpcmd, _("print help")},
- { N_("ls"), lscmd, _("list current directory, wildcards allowed")},
- { N_("lsmark"), lsmarkcmd, _("list the marked files in and below the cd")},
- { N_("mark"), markcmd, _("mark dir/file to be restored recursively, wildcards allowed")},
- { N_("markdir"), markdircmd, _("mark directory name to be restored (no files)")},
- { N_("pwd"), pwdcmd, _("print current working directory")},
- { N_("unmark"), unmarkcmd, _("unmark dir/file to be restored recursively in dir")},
- { N_("unmarkdir"), unmarkdircmd, _("unmark directory name only no recursion")},
- { N_("quit"), quitcmd, _("quit and do not do restore")},
- { N_("?"), helpcmd, _("print help")},
+ { NT_("cd"), cdcmd, _("change current directory")},
+ { NT_("count"), countcmd, _("count marked files in and below the cd")},
+ { NT_("dir"), dircmd, _("long list current directory, wildcards allowed")},
+ { NT_(".dir"), dot_dircmd, _("long list current directory, wildcards allowed")},
+ { NT_("done"), donecmd, _("leave file selection mode")},
+ { NT_("estimate"), estimatecmd, _("estimate restore size")},
+ { NT_("exit"), donecmd, _("same as done command")},
+ { NT_("find"), findcmd, _("find files, wildcards allowed")},
+ { NT_("help"), helpcmd, _("print help")},
+ { NT_("ls"), lscmd, _("list current directory, wildcards allowed")},
+ { NT_("lsmark"), lsmarkcmd, _("list the marked files in and below the cd")},
+ { NT_("mark"), markcmd, _("mark dir/file to be restored recursively, wildcards allowed")},
+ { NT_("markdir"), markdircmd, _("mark directory name to be restored (no files)")},
+ { NT_("pwd"), pwdcmd, _("print current working directory")},
+ { NT_(".pwd"), dot_pwdcmd, _("print current working directory")},
+ { NT_("unmark"), unmarkcmd, _("unmark dir/file to be restored recursively in dir")},
+ { NT_("unmarkdir"), unmarkdircmd, _("unmark directory name only no recursion")},
+ { NT_("quit"), quitcmd, _("quit and do not do restore")},
+ { NT_("?"), helpcmd, _("print help")},
};
-#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
-
+#define comsize ((int)(sizeof(commands)/sizeof(struct cmdstruct)))
/*
* Enter a prompt mode where the user can select/deselect
/* Get a new context so we don't destroy restore command args */
UAContext *ua = new_ua_context(tree->ua->jcr);
ua->UA_sock = tree->ua->UA_sock; /* patch in UA socket */
+ ua->api = tree->ua->api; /* keep API flag too */
+ BSOCK *user = ua->UA_sock;
- bsendmsg(tree->ua, _(
+ ua->send_msg(_(
"\nYou are now entering file selection mode where you add (mark) and\n"
"remove (unmark) files to be restored. No files are initially added, unless\n"
"you used the \"all\" keyword on the command line.\n"
*/
tree->node = (TREE_NODE *)tree->root;
tree_getpath(tree->node, cwd, sizeof(cwd));
- bsendmsg(tree->ua, _("cwd is: %s\n"), cwd);
+ ua->send_msg(_("cwd is: %s\n"), cwd);
for ( ;; ) {
int found, len, i;
if (!get_cmd(ua, "$ ")) {
break;
}
- parse_ua_args(ua);
+ if (ua->api) user->signal(BNET_CMD_BEGIN);
+ parse_args_only(ua->cmd, &ua->args, &ua->argc, ua->argk, ua->argv, MAX_CMD_ARGS);
if (ua->argc == 0) {
- break;
+ ua->warning_msg(_("Invalid command. Enter \"done\" to exit.\n"));
+ if (ua->api) user->signal(BNET_CMD_FAILED);
+ continue;
}
len = strlen(ua->argk[0]);
found = 0;
stat = false;
- for (i=0; i<(int)comsize; i++) /* search for command */
+ for (i=0; i<comsize; i++) /* search for command */
if (strncasecmp(ua->argk[0], _(commands[i].key), len) == 0) {
stat = (*commands[i].func)(ua, tree); /* go execute command */
found = 1;
break;
}
if (!found) {
- bsendmsg(tree->ua, _("Illegal command. Enter \"done\" to exit.\n"));
+ ua->warning_msg(_("Invalid command. Enter \"done\" to exit.\n"));
+ if (ua->api) user->signal(BNET_CMD_FAILED);
continue;
}
+ if (ua->api) user->signal(BNET_CMD_OK);
if (!stat) {
break;
}
// Dmsg4(000, "Path=%s%s FI=%s JobId=%s\n", row[0], row[1],
// row[2], row[3]);
- if (*row[1] == 0) { /* no filename => directory */
- if (*row[0] != '/') { /* Must be Win32 directory */
+ if (*row[1] == 0) { /* no filename => directory */
+ if (!IsPathSeparator(*row[0])) { /* Must be Win32 directory */
type = TN_DIR_NLS;
} else {
type = TN_DIR;
if (node->inserted) {
tree->FileCount++;
if (tree->DeltaCount > 0 && (tree->FileCount-tree->LastCount) > tree->DeltaCount) {
- bsendmsg(tree->ua, "+");
+ tree->ua->send_msg("+");
tree->LastCount = tree->FileCount;
}
}
return count;
}
+static void strip_trailing_slash(char *arg)
+{
+ int len = strlen(arg);
+ if (len == 0) {
+ return;
+ }
+ len--;
+ if (arg[len] == '/') { /* strip any trailing slash */
+ arg[len] = 0;
+ }
+}
+
/*
* Recursively mark the current directory to be restored as
* well as all directories and files below it.
char ec1[50];
if (ua->argc < 2 || !tree_node_has_child(tree->node)) {
- bsendmsg(ua, _("No files marked.\n"));
+ ua->send_msg(_("No files marked.\n"));
return 1;
}
for (int i=1; i < ua->argc; i++) {
+ strip_trailing_slash(ua->argk[i]);
foreach_child(node, tree->node) {
if (fnmatch(ua->argk[i], node->fname, 0) == 0) {
count += set_extract(ua, node, tree, true);
}
}
if (count == 0) {
- bsendmsg(ua, _("No files marked.\n"));
+ ua->send_msg(_("No files marked.\n"));
} else if (count == 1) {
- bsendmsg(ua, _("1 file marked.\n"));
+ ua->send_msg(_("1 file marked.\n"));
} else {
- bsendmsg(ua, _("%s files marked.\n"),
+ ua->send_msg(_("%s files marked.\n"),
edit_uint64_with_commas(count, ec1));
}
return 1;
char ec1[50];
if (ua->argc < 2 || !tree_node_has_child(tree->node)) {
- bsendmsg(ua, _("No files marked.\n"));
+ ua->send_msg(_("No files marked.\n"));
return 1;
}
for (int i=1; i < ua->argc; i++) {
+ strip_trailing_slash(ua->argk[i]);
foreach_child(node, tree->node) {
if (fnmatch(ua->argk[i], node->fname, 0) == 0) {
if (node->type == TN_DIR || node->type == TN_DIR_NLS) {
}
}
if (count == 0) {
- bsendmsg(ua, _("No directories marked.\n"));
+ ua->send_msg(_("No directories marked.\n"));
} else if (count == 1) {
- bsendmsg(ua, _("1 directory marked.\n"));
+ ua->send_msg(_("1 directory marked.\n"));
} else {
- bsendmsg(ua, _("%s directories marked.\n"),
+ ua->send_msg(_("%s directories marked.\n"),
edit_uint64_with_commas(count, ec1));
}
return 1;
}
}
}
- bsendmsg(ua, _("%s total files/dirs. %s marked to be restored.\n"),
+ ua->send_msg(_("%s total files/dirs. %s marked to be restored.\n"),
edit_uint64_with_commas(total, ec1),
edit_uint64_with_commas(num_extract, ec2));
return 1;
char cwd[2000];
if (ua->argc == 1) {
- bsendmsg(ua, _("No file specification given.\n"));
- return 0;
+ ua->send_msg(_("No file specification given.\n"));
+ return 1; /* make it non-fatal */
}
for (int i=1; i < ua->argc; i++) {
} else {
tag = "";
}
- bsendmsg(ua, "%s%s\n", tag, cwd);
+ ua->send_msg("%s%s\n", tag, cwd);
}
}
}
} else {
tag = "";
}
- bsendmsg(ua, "%s%s%s\n", tag, node->fname, tree_node_has_child(node)?"/":"");
+ ua->send_msg("%s%s%s\n", tag, node->fname, tree_node_has_child(node)?"/":"");
}
}
return 1;
} else {
tag = "";
}
- bsendmsg(ua, "%s%s%s\n", tag, node->fname, tree_node_has_child(node)?"/":"");
+ ua->send_msg("%s%s%s\n", tag, node->fname, tree_node_has_child(node)?"/":"");
if (tree_node_has_child(node)) {
rlsmark(ua, node);
}
char ec1[30];
char en1[30], en2[30];
int n;
+ time_t time;
p = encode_mode(statp->st_mode, buf);
if (dot_cmd) {
p += n;
n = sprintf(p, "%s,", edit_uint64(statp->st_size, ec1));
p += n;
- p = encode_time(statp->st_ctime, p);
+ p = encode_time(statp->st_mtime, p);
*p++ = ',';
*p++ = *tag;
*p++ = ',';
p += n;
n = sprintf(p, "%10.10s ", edit_uint64(statp->st_size, ec1));
p += n;
- p = encode_time(statp->st_ctime, p);
+ if (statp->st_ctime > statp->st_mtime) {
+ time = statp->st_ctime;
+ } else {
+ time = statp->st_mtime;
+ }
+ /* Display most recent time */
+ p = encode_time(time, p);
*p++ = ' ';
*p++ = *tag;
}
char cwd[1100], *pcwd;
if (!tree_node_has_child(tree->node)) {
- bsendmsg(ua, _("Node %s has no children.\n"), tree->node->fname);
+ ua->send_msg(_("Node %s has no children.\n"), tree->node->fname);
return 1;
}
memset(&statp, 0, sizeof(statp));
}
ls_output(buf, cwd, tag, &statp, dot_cmd);
- bsendmsg(ua, "%s\n", buf);
+ ua->send_msg("%s\n", buf);
}
}
return 1;
}
}
}
- bsendmsg(ua, _("%d total files; %d marked to be restored; %s bytes.\n"),
+ ua->send_msg(_("%d total files; %d marked to be restored; %s bytes.\n"),
total, num_extract, edit_uint64_with_commas(total_bytes, ec1));
return 1;
}
{
unsigned int i;
- bsendmsg(ua, _(" Command Description\n ======= ===========\n"));
+ ua->send_msg(_(" Command Description\n ======= ===========\n"));
for (i=0; i<comsize; i++) {
/* List only non-dot commands */
if (commands[i].key[0] != '.') {
- bsendmsg(ua, " %-10s %s\n", _(commands[i].key), _(commands[i].help));
+ ua->send_msg(" %-10s %s\n", _(commands[i].key), _(commands[i].help));
}
}
- bsendmsg(ua, "\n");
+ ua->send_msg("\n");
return 1;
}
TREE_NODE *node;
char cwd[2000];
+
if (ua->argc != 2) {
+ ua->error_msg(_("Too few or too many arguments. Try using double quotes.\n"));
return 1;
}
- strip_leading_space(ua->argk[1]);
node = tree_cwd(ua->argk[1], tree->root, tree->node);
if (!node) {
/* Try once more if Win32 drive -- make absolute */
node = tree_cwd(cwd, tree->root, tree->node);
}
if (!node) {
- bsendmsg(ua, _("Invalid path given.\n"));
+ ua->warning_msg(_("Invalid path given.\n"));
} else {
tree->node = node;
}
} else {
tree->node = node;
}
- tree_getpath(tree->node, cwd, sizeof(cwd));
- bsendmsg(ua, _("cwd is: %s\n"), cwd);
- return 1;
+ return pwdcmd(ua, tree);
}
static int pwdcmd(UAContext *ua, TREE_CTX *tree)
{
char cwd[2000];
tree_getpath(tree->node, cwd, sizeof(cwd));
- bsendmsg(ua, _("cwd is: %s\n"), cwd);
+ if (ua->api) {
+ ua->send_msg("%s", cwd);
+ } else {
+ ua->send_msg(_("cwd is: %s\n"), cwd);
+ }
return 1;
}
+static int dot_pwdcmd(UAContext *ua, TREE_CTX *tree)
+{
+ char cwd[2000];
+ tree_getpath(tree->node, cwd, sizeof(cwd));
+ ua->send_msg("%s", cwd);
+ return 1;
+}
static int unmarkcmd(UAContext *ua, TREE_CTX *tree)
{
int count = 0;
if (ua->argc < 2 || !tree_node_has_child(tree->node)) {
- bsendmsg(ua, _("No files unmarked.\n"));
+ ua->send_msg(_("No files unmarked.\n"));
return 1;
}
for (int i=1; i < ua->argc; i++) {
+ strip_trailing_slash(ua->argk[i]);
foreach_child(node, tree->node) {
if (fnmatch(ua->argk[i], node->fname, 0) == 0) {
count += set_extract(ua, node, tree, false);
}
}
if (count == 0) {
- bsendmsg(ua, _("No files unmarked.\n"));
+ ua->send_msg(_("No files unmarked.\n"));
} else if (count == 1) {
- bsendmsg(ua, _("1 file unmarked.\n"));
+ ua->send_msg(_("1 file unmarked.\n"));
} else {
- bsendmsg(ua, _("%d files unmarked.\n"), count);
+ char ed1[50];
+ ua->send_msg(_("%s files unmarked.\n"), edit_uint64_with_commas(count, ed1));
}
return 1;
}
int count = 0;
if (ua->argc < 2 || !tree_node_has_child(tree->node)) {
- bsendmsg(ua, _("No directories unmarked.\n"));
+ ua->send_msg(_("No directories unmarked.\n"));
return 1;
}
for (int i=1; i < ua->argc; i++) {
+ strip_trailing_slash(ua->argk[i]);
foreach_child(node, tree->node) {
if (fnmatch(ua->argk[i], node->fname, 0) == 0) {
if (node->type == TN_DIR || node->type == TN_DIR_NLS) {
}
if (count == 0) {
- bsendmsg(ua, _("No directories unmarked.\n"));
+ ua->send_msg(_("No directories unmarked.\n"));
} else if (count == 1) {
- bsendmsg(ua, _("1 directory unmarked.\n"));
+ ua->send_msg(_("1 directory unmarked.\n"));
} else {
- bsendmsg(ua, _("%d directories unmarked.\n"), count);
+ ua->send_msg(_("%d directories unmarked.\n"), count);
}
return 1;
}
projects / bacula / bacula / blobdiff