Change dev->open() to return bool

[bacula/bacula] / bacula / src / console / console.c

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index ab3b750fd7c246cfef166c28eca5d5c14e450b6a..999515fddf0bb09745b761d0181dfaee1aa8519c 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 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.
@@ -610,6 +610,7 @@ static struct cpl_keywords_t cpl_keywords[] = {
    {"mark",       ".ls"            },
    {"m",          ".ls"            },
    {"unmark",     ".lsmark"        },
+   {"catalog=",   ".catalogs"      },
    {"actiononpurge=", ".actiononpurge" }
 };
 #define key_size ((int)(sizeof(cpl_keywords)/sizeof(struct cpl_keywords_t)))
@@ -1341,6 +1342,7 @@ static int check_resources()
    return OK;
 }
 
+/* @version */
 static int versioncmd(FILE *input, BSOCK *UA_sock)
 {
    senditf("Version: " VERSION " (" BDATE ") %s %s %s\n",
@@ -1348,6 +1350,7 @@ static int versioncmd(FILE *input, BSOCK *UA_sock)
    return 1;
 }
 
+/* @input <input-filename> */
 static int inputcmd(FILE *input, BSOCK *UA_sock)
 {
    FILE *fd;
@@ -1372,13 +1375,15 @@ static int inputcmd(FILE *input, BSOCK *UA_sock)
    return 1;
 }
 
-/* Send output to both termina and specified file */
+/* @tee <output-filename> */
+/* Send output to both terminal and specified file */
 static int teecmd(FILE *input, BSOCK *UA_sock)
 {
    teeout = true;
    return do_outputcmd(input, UA_sock);
 }
 
+/* @output <output-filename> */
 /* Send output to specified "file" */
 static int outputcmd(FILE *input, BSOCK *UA_sock)
 {
@@ -1419,7 +1424,7 @@ static int do_outputcmd(FILE *input, BSOCK *UA_sock)
 }
 
 /*
- * exec "some-command" [wait-seconds]
+ * @exec "some-command" [wait-seconds]
 */
 static int execcmd(FILE *input, BSOCK *UA_sock)
 {
@@ -1456,6 +1461,7 @@ static int execcmd(FILE *input, BSOCK *UA_sock)
 }
 
 
+/* @echo xxx yyy */
 static int echocmd(FILE *input, BSOCK *UA_sock)
 {
    for (int i=1; i < argc; i++) {
@@ -1465,11 +1471,13 @@ static int echocmd(FILE *input, BSOCK *UA_sock)
    return 1;
 }
 
+/* @quit */
 static int quitcmd(FILE *input, BSOCK *UA_sock)
 {
    return 0;
 }
 
+/* @help */
 static int helpcmd(FILE *input, BSOCK *UA_sock)
 {
    int i;
@@ -1480,6 +1488,7 @@ static int helpcmd(FILE *input, BSOCK *UA_sock)
 }
 
 
+/* @sleep secs */
 static int sleepcmd(FILE *input, BSOCK *UA_sock)
 {
    if (argc > 1) {
@@ -1488,7 +1497,7 @@ static int sleepcmd(FILE *input, BSOCK *UA_sock)
    return 1;
 }
 
-
+/* @time */
 static int timecmd(FILE *input, BSOCK *UA_sock)
 {
    char sdt[50];