Fix console prompt problem + misc

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@696 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 8e8e0b8732e0ab5b3d3fea346b9b7ce90e6c17aa..7a9c9d2b13b7352780e01ea6fbfb5aa0e7ef309e 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,19 @@
-2003-08-02 Version 1.32 06Sep03 Beta
+
+2003-08-02 Version 1.32 10Sep03 Beta
+- Finally fixed the .messages that was sent during prompts
+  in the console with no readline.
+- Implement new Include/Exclude semantics.
+- Fix a good number of segfaults reported by Chris Allen in
+  the variable expansion code. 
+- Print warning message if a job is blocked by user unmount.
+- Fix additional variable expansion problem reported by Chris Allen.
+- Fix pathconf() error status bug that caused a segfault on
+  a FreeBSD system -- reported by Gernot Hueber.
+- Make sure the console sends ".messages" only when at the
+  command line prompt.
+- Apply a patch from Nic Bellamy that corrects a file descriptor
+  leak in the Storage deamon when a job is canceled. (Thanks)
+- Implement < and | in File daemon.
 - Implement ClientRunBeforeJob and ClientRunAfterJob.
 - Corrected BSRatEOF to be BSFatEOF in btape --
   reported by Lars Koller.

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 76a9a971a25fa50e6acb1bbfb72023bc74eb38b5..c647bd9f987b5f599aadb7e79642ef8dcebe5898 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,7 +1,7 @@
 
           Release Notes for Bacula 1.32
 
-  Bacula code: Total files = 259 Total lines = 77,120 (*.h *.c *.in)
+  Bacula code: Total files = 259 Total lines = 77,284 (*.h *.c *.in)
 
 Major Changes this Release:
 - Fixed gnome-console to compile with RH9 (Gnome 2.0)
@@ -12,6 +12,8 @@ Major Changes this Release:
   during restore.
 - Added SDConnectTimeout to FD.    
 - Added ClientRunBeforeJob and ClientRunAfterJob.
+- Implemented Include | and < in File daemon.
+- Implemented a new Include/Exclude syntax.
 
 
 Other Changes this Release:
@@ -30,6 +32,9 @@ Other Changes this Release:
   heartbeat thread.
 - Eliminate gnome2-console directory. Everything is in gnome-console
 - Enhanced "packet too big" message to indicate who sent it.
+- Corrected console prompt problem in non-readline versions.
+- Correct a number of variable expansion problems.
+- Added a number of new regression tests.
 
 
 Items to note:  !!!!!

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 5f8707e45c362dfa6a4da09005ad240884b4bc62..6caba3bd614ed07ae9242ee8d3bbdbed8f77504d 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -13,9 +13,6 @@ Documentation to do: (any release a little bit at a time)
   hours of operation.
 - Lookup HP cleaning recommendations.
 - Lookup HP tape replacement recommendations (see trouble shooting autochanger)
-- Document FInclude ...
-- Document all the status codes JobLevel, JobType, JobStatus.
-- Document SDConnectTimeout (in FD).
           
 Testing to do: (painful)
 - that ALL console command line options work and are always implemented
@@ -23,12 +20,12 @@ Testing to do: (painful)
 - Test if rewind at end of tape waits for tape to rewind.
 - Test cancel at EOM.       
 - Test not zeroing Autochanger slot when it is wrong.
-- Test recycling and purging (code changed in db_find_next_volume and
-  in recycle.c).
 - Figure out how to use ssh or stunnel to protect Bacula communications.
 
 For 1.32:
-- Add restore by filename test.
+- Document restore by files.
+- Document new Include/Exclude ...
+- Document all the status codes JobLevel, JobType, JobStatus.
 - Add test of exclusion, test multiple Include {} statements.
 - Enhance "update slots" to include a "scan" feature
   scan 1; scan 1-5; scan 1,2,4 ...  to update the catalog 
@@ -37,9 +34,9 @@ For 1.32:
 - Don't print "Warning: Wrong Volume mounted ..." if mounting second
   volume.
 - Implement List Volume Job=xxx  or List scheduled volumes or Status Director 
-- Add heartbeat from FD to SD if hb interval expires.
 
 For 1.33
+- Add heartbeat from FD to SD if hb interval expires.
 - Suppress read error on blank tape when doing a label.
 - Can we dynamically change FileSets.
 - If pool specified to label command and Label Format is specified,
@@ -897,3 +894,7 @@ Done: (see kernsdone for more)
 - Check to see if "blocked" is set during restore.
 - Figure out what is interrupting sql command in console.
 - Make new job print warning User Unmounted Tape.
+- Test recycling and purging (code changed in db_find_next_volume and
+  in recycle.c).
+- Document SDConnectTimeout (in FD).
+- Add restore by filename test.

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index deba1f9c25cb5ec44fd5c2d76797147030e4427c..f33bc816170a0d39996c963c3ef7b1327d3dcb3b 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -191,8 +191,10 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock)
       if (stat < 0) {
         break;                       /* error */
       } else if (stat == 0) {        /* timeout */
-        if (at_prompt) {
+         if (strcmp(prompt, "*") == 0) {
             bnet_fsend(UA_sock, ".messages");
+        } else {
+           continue;
         }
       } else {
         at_prompt = FALSE;

diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c
index 4b270c82ee7ab99729d4c078b9f87872eb49ed99..1e5d3bbd4c268ad96a84754497e07dd60d3d609f 100644 (file)
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -90,7 +90,7 @@ int read_dev_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
         strerror_dev(dev));
       return jcr->label_status = VOL_NO_MEDIA;
    }
-   strcpy(dev->VolHdr.Id, "**error**");
+   bstrncpy(dev->VolHdr.Id, "**error**", sizeof(dev->VolHdr.Id));
 
    /* Read the Volume label block */
    record = new_record();