Misc see kes-1.34

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index de3fb4ea952115085e4c026a47e7302cca479736..35f56116b0a40aac28855842192b080a758f4aee 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                  Kern's ToDo List
-                  31 March 2004
+                  28 May 2004
 
 Documentation to do: (any release a little bit at a time)
 - Document query file format.
@@ -22,6 +22,7 @@ Documentation to do: (any release a little bit at a time)
     changing tape settings while a job is running.)
 - Lookup HP cleaning recommendations.
 - Lookup HP tape replacement recommendations (see trouble shooting autochanger)
+- Add more obvious documentation of @ for conf files.
           
 Testing to do: (painful)
 - Test drive polling!
@@ -43,6 +44,15 @@ For 1.33 Testing/Documentation:
 
 
 For version 1.35:
+- On Win95
+   The error I when I installed 1.34.2 clients:
+    The BACULA-FD file is  
+    linked to missing export KERNEL32.DLL:GetFileAttributesExA.
+- When restore started from console, report jobid.
+- Feedback while the tree is being built.    
+- Possibly implement "Ensure Full Backup = yes" looks for a failed full backup
+  and upgrades the current backup if one exists.
+- Check that barcode reading and update slots scan works.
 - Try not to re-backup a file if a new hard link is added.
 - Backup hard links only, but not the data.
 - Add "All Local = yes" option to save to include all local partitions.

diff --git a/bacula/src/Makefile.in b/bacula/src/Makefile.in
index b04ca9c4475f53241dec9dcd7acbc9ed05dad5f5..c96264a82256287d6735d650eea0ed67810d2916 100644 (file)
--- a/bacula/src/Makefile.in
+++ b/bacula/src/Makefile.in
@@ -41,7 +41,7 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 clean:
        @$(RMF) core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) AUTHORS ChangeLog Makefile.am NEWS README acconfig.h autogen.sh 
-       @$(RMF) configure.in stamp.h
+       @$(RMF) configure.in stamp.h stamp-h.in
        @$(RMF) -r po
        (cd gnome-console; $(MAKE) clean)
        (cd gnome2-console; $(MAKE) clean)

diff --git a/bacula/src/console2.glade b/bacula/src/console2.glade
index 5011ed46effc3e619133bc6a5e1fe1701ef6a8cb..fad86221903d473c25c80d917ab76b258540b2f4 100644 (file)
--- a/bacula/src/console2.glade
+++ b/bacula/src/console2.glade
@@ -1012,6 +1012,7 @@
 
                  <child>
                    <widget class="GtkHBox" id="hbox28">
+                     <property name="border_width">1</property>
                      <property name="visible">True</property>
                      <property name="homogeneous">False</property>
                      <property name="spacing">0</property>
@@ -1024,7 +1025,7 @@
 
                          <child>
                            <widget class="GtkLabel" id="label63">
-                             <property name="width_request">66</property>
+                             <property name="width_request">68</property>
                              <property name="height_request">16</property>
                              <property name="visible">True</property>
                              <property name="label" translatable="yes">Job:</property>
@@ -1226,13 +1227,14 @@
 
              <child>
                <widget class="GtkHBox" id="hbox30">
+                 <property name="border_width">1</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label66">
-                     <property name="width_request">65</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Client:</property>
@@ -1342,13 +1344,16 @@
 
              <child>
                <widget class="GtkHBox" id="hbox31">
+                 <property name="border_width">1</property>
+                 <property name="width_request">503</property>
+                 <property name="height_request">26</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label68">
-                     <property name="width_request">66</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">FileSet: </property>
@@ -1423,36 +1428,87 @@
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkLabel" id="label156">
+                     <property name="width_request">13</property>
+                     <property name="height_request">16</property>
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes"></property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkButton" id="view_fileset_button">
-                     <property name="width_request">93</property>
-                     <property name="height_request">26</property>
+                   <widget class="GtkLabel" id="label155">
+                     <property name="width_request">52</property>
+                     <property name="height_request">16</property>
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Priority:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkSpinButton" id="spinbutton1">
+                     <property name="width_request">81</property>
+                     <property name="height_request">24</property>
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">  View FileSet  </property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <signal name="clicked" handler="on_view_fileset_clicked"/>
+                     <property name="climb_rate">1</property>
+                     <property name="digits">0</property>
+                     <property name="numeric">False</property>
+                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                     <property name="snap_to_ticks">False</property>
+                     <property name="wrap">False</property>
+                     <property name="adjustment">10 0 100 1 10 10</property>
                    </widget>
                    <packing>
-                     <property name="padding">10</property>
+                     <property name="padding">4</property>
                      <property name="expand">False</property>
-                     <property name="fill">True</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkLabel" id="label69">
+                   <widget class="GtkLabel" id="label157">
+                     <property name="width_request">100</property>
+                     <property name="height_request">16</property>
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">  </property>
+                     <property name="label" translatable="yes"></property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_CENTER</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                      <property name="wrap">False</property>
                      <property name="selectable">False</property>
                      <property name="xalign">0.5</property>
@@ -1461,7 +1517,7 @@
                      <property name="ypad">0</property>
                    </widget>
                    <packing>
-                     <property name="padding">65</property>
+                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
                    </packing>
@@ -1476,13 +1532,14 @@
 
              <child>
                <widget class="GtkHBox" id="hbox32">
+                 <property name="border_width">1</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label70">
-                     <property name="width_request">66</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Level:</property>
@@ -1614,13 +1671,14 @@
 
              <child>
                <widget class="GtkHBox" id="hbox33">
+                 <property name="border_width">1</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label72">
-                     <property name="width_request">66</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Pool:</property>
@@ -1752,13 +1810,14 @@
 
              <child>
                <widget class="GtkHBox" id="hbox39">
+                 <property name="border_width">1</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label96">
-                     <property name="width_request">66</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Storage:</property>
@@ -1890,13 +1949,14 @@
 
              <child>
                <widget class="GtkHBox" id="hbox40">
+                 <property name="border_width">1</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label98">
-                     <property name="width_request">66</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Messages:</property>
@@ -2006,13 +2066,14 @@
 
              <child>
                <widget class="GtkHBox" id="hbox34">
+                 <property name="border_width">1</property>
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkLabel" id="label77">
-                     <property name="width_request">66</property>
+                     <property name="width_request">68</property>
                      <property name="height_request">16</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Where: </property>
@@ -2089,13 +2150,14 @@
 
          <child>
            <widget class="GtkHBox" id="hbox41">
+             <property name="border_width">1</property>
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
 
              <child>
                <widget class="GtkLabel" id="label100">
-                 <property name="width_request">66</property>
+                 <property name="width_request">68</property>
                  <property name="height_request">16</property>
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">When:</property>
@@ -2163,8 +2225,87 @@
            </packing>
          </child>
 
+         <child>
+           <widget class="GtkHBox" id="hbox60">
+             <property name="border_width">1</property>
+             <property name="visible">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">0</property>
+
+             <child>
+               <widget class="GtkLabel" id="label153">
+                 <property name="width_request">68</property>
+                 <property name="height_request">16</property>
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Bootstrap:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_CENTER</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="entry28">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char" translatable="yes">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkLabel" id="label154">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">   </property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_CENTER</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+               </widget>
+               <packing>
+                 <property name="padding">36</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">True</property>
+             <property name="fill">True</property>
+           </packing>
+         </child>
+
          <child>
            <widget class="GtkLabel" id="label84">
+             <property name="width_request">12</property>
+             <property name="height_request">19</property>
              <property name="visible">True</property>
              <property name="label" translatable="yes">   </property>
              <property name="use_underline">False</property>
@@ -2202,8 +2343,8 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
-  <property name="default_width">640</property>
-  <property name="default_height">400</property>
+  <property name="default_width">700</property>
+  <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <signal name="delete_event" handler="on_restore_files_delete_event" last_modification_time="Tue, 16 Mar 2004 11:41:52 GMT"/>
@@ -2510,16 +2651,48 @@
       </child>
 
       <child>
-       <widget class="GtkScrolledWindow" id="scrolled">
+       <widget class="GtkHPaned" id="hpaned1">
          <property name="visible">True</property>
          <property name="can_focus">True</property>
-         <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-         <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-         <property name="shadow_type">GTK_SHADOW_NONE</property>
-         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
          <child>
-           <placeholder/>
+           <widget class="GtkScrolledWindow" id="tree">
+             <property name="width_request">164</property>
+             <property name="height_request">78</property>
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="shadow_type">GTK_SHADOW_NONE</property>
+             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+             <child>
+               <placeholder/>
+             </child>
+           </widget>
+           <packing>
+             <property name="shrink">True</property>
+             <property name="resize">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkScrolledWindow" id="scrolled">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="shadow_type">GTK_SHADOW_NONE</property>
+             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+             <child>
+               <placeholder/>
+             </child>
+           </widget>
+           <packing>
+             <property name="shrink">True</property>
+             <property name="resize">True</property>
+           </packing>
          </child>
        </widget>
        <packing>
@@ -2531,20 +2704,22 @@
 
       <child>
        <widget class="GtkHBox" id="hbox44">
+         <property name="width_request">301</property>
+         <property name="height_request">30</property>
          <property name="visible">True</property>
-         <property name="homogeneous">True</property>
+         <property name="homogeneous">False</property>
          <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkLabel" id="label115">
+           <widget class="GtkLabel" id="FilesSelected">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">             </property>
+             <property name="label" translatable="yes">Files Selected: </property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">False</property>
-             <property name="xalign">0.94</property>
+             <property name="xalign">0.02</property>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
@@ -2558,6 +2733,8 @@
 
          <child>
            <widget class="GtkButton" id="restore_select_ok">
+             <property name="width_request">72</property>
+             <property name="height_request">30</property>
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label">gtk-ok</property>
@@ -2573,7 +2750,9 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label116">
+           <widget class="GtkLabel" id="label152">
+             <property name="width_request">34</property>
+             <property name="height_request">16</property>
              <property name="visible">True</property>
              <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
@@ -2610,9 +2789,9 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label117">
+           <widget class="GtkLabel" id="label1001">
              <property name="visible">True</property>
-             <property name="label" translatable="yes"></property>
+             <property name="label" translatable="yes"> </property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2624,14 +2803,14 @@
              <property name="ypad">0</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
+             <property name="padding">8</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">7</property>
+         <property name="padding">5</property>
          <property name="expand">False</property>
          <property name="fill">True</property>
        </packing>
@@ -4033,4 +4212,146 @@
   </child>
 </widget>
 
+<widget class="GtkDialog" id="progress dialog">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Progress</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox11">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+       <widget class="GtkHButtonBox" id="dialog-action_area10">
+         <property name="visible">True</property>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+         <child>
+           <widget class="GtkButton" id="closebutton1">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-close</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="response_id">-7</property>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">True</property>
+         <property name="pack_type">GTK_PACK_END</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkVBox" id="vbox19">
+         <property name="visible">True</property>
+         <property name="homogeneous">False</property>
+         <property name="spacing">0</property>
+
+         <child>
+           <widget class="GtkLabel" id="label1002">
+             <property name="width_request">0</property>
+             <property name="height_request">43</property>
+             <property name="visible">True</property>
+             <property name="label" translatable="yes"></property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label1003">
+             <property name="width_request">0</property>
+             <property name="height_request">36</property>
+             <property name="visible">True</property>
+             <property name="label" translatable="yes"></property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkProgressBar" id="progressbar1">
+             <property name="width_request">150</property>
+             <property name="height_request">33</property>
+             <property name="visible">True</property>
+             <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+             <property name="fraction">0</property>
+             <property name="pulse_step">0.1</property>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">True</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label1004">
+             <property name="width_request">0</property>
+             <property name="height_request">52</property>
+             <property name="visible">True</property>
+             <property name="label" translatable="yes"></property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
+       </packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index 49289929a2f229fe7daec27fa5ffc0efc755d843..28fd36ae852a4964e9af85a1a2c654275c5b86fc 100644 (file)
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -40,6 +40,7 @@ static char inc[]         = "include\n";
 static char exc[]         = "exclude\n";
 static char fileset[]     = "fileset\n"; /* set full fileset */
 static char jobcmd[]      = "JobId=%d Job=%s SDid=%u SDtime=%u Authorization=%s\n";
+/* Note, mtime_only is not used here -- implemented as file option */
 static char levelcmd[]    = "level = %s%s mtime_only=%d\n";
 static char runbefore[]   = "RunBeforeJob %s\n";
 static char runafter[]    = "RunAfterJob %s\n";

diff --git a/bacula/src/dird/run_conf.c b/bacula/src/dird/run_conf.c
index 15509951e53d8de812284efb541c6fed687a9fd1..216e5bb864990486fcd70f29d255bddd7ae38fc6 100644 (file)
--- a/bacula/src/dird/run_conf.c
+++ b/bacula/src/dird/run_conf.c
@@ -124,26 +124,15 @@ static bool have_hour, have_mday, have_wday, have_month, have_wom;
 static bool have_at, have_woy;
 static RUN lrun;
 
-static void clear_defaults()
-{
-   have_hour = have_mday = have_wday = have_month = have_wom = have_woy = true;
-   clear_bit(0,lrun.hour);
-   clear_bits(0, 30, lrun.mday);
-   clear_bits(0, 6, lrun.wday);
-   clear_bits(0, 11, lrun.month);
-   clear_bits(0, 4, lrun.wom);
-   clear_bits(0, 53, lrun.woy);
-}
-
 static void set_defaults()
 {
    have_hour = have_mday = have_wday = have_month = have_wom = have_woy = false;
    have_at = false;
-   set_bit(0,lrun.hour);
+   set_bits(0, 23, lrun.hour);
    set_bits(0, 30, lrun.mday);
-   set_bits(0, 6, lrun.wday);
+   set_bits(0, 6,  lrun.wday);
    set_bits(0, 11, lrun.month);
-   set_bits(0, 4, lrun.wom);
+   set_bits(0, 4,  lrun.wom);
    set_bits(0, 53, lrun.woy);
 }
 
@@ -565,32 +554,22 @@ void store_run(LEX *lc, RES_ITEM *item, int index, int pass)
         }                      
         break;
       case s_hourly:
-        clear_defaults();
+        have_hour = true;
         set_bits(0, 23, lrun.hour);
-        set_bits(0, 30, lrun.mday);
-        set_bits(0, 11, lrun.month);
-        set_bits(0, 4, lrun.wom);
-        set_bits(0, 53, lrun.woy);
         break;
       case s_weekly:
-        clear_defaults();
-        set_bit(0, lrun.wday);
-        set_bits(0, 11, lrun.month);
-        set_bits(0, 4, lrun.wom);
-        set_bits(0, 53, lrun.woy);
-        break;
-      case s_daily:
-        clear_defaults();
+        have_mday = have_wom = have_woy = true;
         set_bits(0, 30, lrun.mday);
-        set_bits(0, 11, lrun.month);
         set_bits(0, 4,  lrun.wom);
         set_bits(0, 53, lrun.woy);
         break;
+      case s_daily:
+        have_mday = true;
+        set_bits(0, 6, lrun.wday);
+        break;
       case s_monthly:
-        clear_defaults();
+        have_month = true;
         set_bits(0, 11, lrun.month);
-        set_bits(0, 4,  lrun.wom);
-        set_bits(0, 53, lrun.woy);
         break;
       default:
          scan_err0(lc, _("Unexpected run state\n"));

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index c78822f33c5f4d1ebe2ab85341d55d522044bfd0..ab674e03b3a33b75ff7343cd1cbdef13495cc306 100644 (file)
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -762,7 +762,9 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx)
         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++;
+           if (node->extract) {
+              rx->selected_files++;  /* count only saved files */
+           }
         }
       }
    }

diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index d211b39b37aaae7c8c2ee1f26c29ce215196094c..991af1fe191a89f17ebc807b3364afc4845e4154 100644 (file)
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -802,6 +802,10 @@ STORE *get_storage_resource(UAContext *ua, int use_default)
            break;
 
          } else if (strcasecmp(ua->argk[i], _("job")) == 0) {
+           if (!ua->argv[i]) {
+               bsendmsg(ua, _("Job name not specified.\n"));
+              return NULL;
+           }
            if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) {
                bsendmsg(ua, _("Job \"%s\" is not running.\n"), ua->argv[i]);
               return NULL;

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 28cab1eed2ee19ac01187750b8692c380e99f678..f3fcaa480f1c909c175b23038f8432aec771714b 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -39,7 +39,7 @@ LIBSRCS = alloc.c attr.c base64.c bsys.c bget_msg.c \
          md5.c message.c mem_pool.c parse_conf.c \
          queue.c rwlock.c scan.c serial.c sha1.c \
          semlock.c signal.c smartall.c tree.c \
-         util.c var.c watchdog.c workq.c timers.c
+         util.c var.c watchdog.c workq.c btimers.c
 
 
 LIBOBJS = alloc.o attr.o base64.o bsys.o bget_msg.o \
@@ -50,7 +50,7 @@ LIBOBJS = alloc.o attr.o base64.o bsys.o bget_msg.o \
          md5.o message.o mem_pool.o parse_conf.o \
          queue.o rwlock.o scan.o serial.o sha1.o \
          semlock.o signal.o smartall.o tree.o \
-         util.o var.o watchdog.o workq.o timers.o
+         util.o var.o watchdog.o workq.o btimers.o
 
 
 EXTRAOBJS = @OBJLIST@

diff --git a/bacula/src/lib/btimers.c b/bacula/src/lib/btimers.c
new file mode 100644 (file)
index 0000000..d3de553
--- /dev/null
+++ b/bacula/src/lib/btimers.c
@@ -0,0 +1,247 @@
+/*
+ * Process and thread timer routines, built on top of watchdogs.
+ * 
+ *    Nic Bellamy <nic@bellamy.co.nz>, October 2004.
+ *
+*/
+/*
+   Copyright (C) 2000-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
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   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., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.
+
+ */
+
+#include "bacula.h"
+#include "jcr.h"
+
+/* Forward referenced functions */
+static void stop_btimer(btimer_t *wid);
+static btimer_t *btimer_start_common(uint32_t wait);
+
+/* Forward referenced callback functions */
+static void callback_child_timer(watchdog_t *self);
+static void callback_thread_timer(watchdog_t *self);
+#ifdef xxx
+static void destructor_thread_timer(watchdog_t *self);
+static void destructor_child_timer(watchdog_t *self);
+#endif
+
+/* 
+ * Start a timer on a child process of pid, kill it after wait seconds.
+ *
+ *  Returns: btimer_t *(pointer to btimer_t struct) on success
+ *          NULL on failure
+ */
+btimer_t *start_child_timer(pid_t pid, uint32_t wait)
+{
+   btimer_t *wid;
+
+   wid = btimer_start_common(wait);
+   if (wid == NULL) {
+      return NULL;
+   }
+   wid->type = TYPE_CHILD;
+   wid->pid = pid;
+   wid->killed = false;
+
+   wid->wd->callback = callback_child_timer;
+   wid->wd->one_shot = false;
+   wid->wd->interval = wait;
+   register_watchdog(wid->wd);
+
+   Dmsg3(200, "Start child timer %p, pid %d for %d secs.\n", wid, pid, wait);
+   return wid;
+}
+
+/*
+ * Stop child timer
+ */
+void stop_child_timer(btimer_t *wid)
+{
+   if (wid == NULL) {
+      Dmsg0(200, "stop_child_timer called with NULL btimer_id\n");
+      return;
+   }
+   Dmsg2(200, "Stop child timer %p pid %d\n", wid, wid->pid);
+   stop_btimer(wid);
+}
+
+#ifdef xxx
+static void destructor_child_timer(watchdog_t *self)
+{
+   btimer_t *wid = (btimer_t *)self->data;
+   free(wid->wd);
+   free(wid);
+}
+#endif
+
+static void callback_child_timer(watchdog_t *self)
+{
+   btimer_t *wid = (btimer_t *)self->data;
+
+   if (!wid->killed) {
+      /* First kill attempt; try killing it softly (kill -SONG) first */
+      wid->killed = true;
+
+      Dmsg2(200, "watchdog %p term PID %d\n", self, wid->pid);
+
+      /* Kill -TERM the specified PID, and reschedule a -KILL for 3 seconds
+       * later.
+       */
+      kill(wid->pid, SIGTERM);
+      self->interval = 3;
+   } else {
+      /* This is the second call - terminate with prejudice. */
+      Dmsg2(200, "watchdog %p kill PID %d\n", self, wid->pid);
+
+      kill(wid->pid, SIGKILL);
+
+      /* Setting one_shot to true before we leave ensures we don't get
+       * rescheduled.
+       */
+      self->one_shot = true;
+   }
+}
+
+/* 
+ * Start a timer on a thread. kill it after wait seconds.
+ *
+ *  Returns: btimer_t *(pointer to btimer_t struct) on success
+ *          NULL on failure
+ */
+btimer_t *start_thread_timer(pthread_t tid, uint32_t wait)
+{
+   btimer_t *wid;
+   wid = btimer_start_common(wait);
+   if (wid == NULL) {
+      return NULL;
+   }
+   wid->type = TYPE_PTHREAD;
+   wid->tid = tid;
+
+   wid->wd->callback = callback_thread_timer;
+   wid->wd->one_shot = true;
+   wid->wd->interval = wait;
+   register_watchdog(wid->wd);
+
+   Dmsg3(200, "Start thread timer %p tid %p for %d secs.\n", wid, tid, wait);
+
+   return wid;
+}
+
+/* 
+ * Start a timer on a BSOCK. kill it after wait seconds.
+ *
+ *  Returns: btimer_t *(pointer to btimer_t struct) on success
+ *          NULL on failure
+ */
+btimer_t *start_bsock_timer(BSOCK *bsock, uint32_t wait)
+{
+   btimer_t *wid;
+   wid = btimer_start_common(wait);
+   if (wid == NULL) {
+      return NULL;
+   }
+   wid->type = TYPE_BSOCK;
+   wid->tid = pthread_self();
+   wid->bsock = bsock;
+
+   wid->wd->callback = callback_thread_timer;
+   wid->wd->one_shot = true;
+   wid->wd->interval = wait;
+   register_watchdog(wid->wd);
+
+   Dmsg3(200, "Start thread timer %p tip %p for %d secs.\n", wid, wid->tid, wait);
+
+   return wid;
+}
+
+/*
+ * Stop bsock timer
+ */
+void stop_bsock_timer(btimer_t *wid)
+{
+   if (wid == NULL) {
+      Dmsg0(200, "stop_bsock_timer called with NULL btimer_id\n");
+      return;
+   }
+   Dmsg2(200, "Stop bsock timer %p tid %p.\n", wid, wid->tid);
+   stop_btimer(wid);
+}
+
+
+/*
+ * Stop thread timer
+ */
+void stop_thread_timer(btimer_t *wid)
+{
+   if (wid == NULL) {
+      Dmsg0(200, "stop_thread_timer called with NULL btimer_id\n");
+      return;
+   }
+   Dmsg2(200, "Stop thread timer %p tid %p.\n", wid, wid->tid);
+   stop_btimer(wid);
+}
+
+#ifdef xxx
+static void destructor_thread_timer(watchdog_t *self)
+{
+   btimer_t *wid = (btimer_t *)self->data;
+   free(wid->wd);
+   free(wid);
+}
+#endif
+
+static void callback_thread_timer(watchdog_t *self)
+{
+   btimer_t *wid = (btimer_t *)self->data;
+
+   Dmsg2(200, "watchdog %p kill thread %d\n", self, wid->tid);
+
+   if (wid->type == TYPE_BSOCK && wid->bsock) {
+      Dmsg0(200, "kill type bsock ...\n");
+      wid->bsock->timed_out = true;
+   }
+   pthread_kill(wid->tid, TIMEOUT_SIGNAL);
+}
+
+static btimer_t *btimer_start_common(uint32_t wait)
+{
+   btimer_t *wid = (btimer_t *)malloc(sizeof(btimer_t));
+
+   wid->wd = new_watchdog();
+   if (wid->wd == NULL) {
+      free(wid);
+      return NULL;
+   }
+   wid->wd->data = wid;
+   wid->killed = FALSE;
+
+   return wid;
+}
+
+/*
+ * Stop btimer
+ */
+static void stop_btimer(btimer_t *wid)
+{
+   if (wid == NULL) {
+      Emsg0(M_ABORT, 0, "stop_btimer called with NULL btimer_id\n");
+   }
+   unregister_watchdog(wid->wd);
+   free(wid->wd);
+   free(wid);
+}

diff --git a/bacula/src/lib/btimers.h b/bacula/src/lib/btimers.h
new file mode 100644 (file)
index 0000000..6b14b53
--- /dev/null
+++ b/bacula/src/lib/btimers.h
@@ -0,0 +1,36 @@
+/*
+ * Process and thread timer routines, built on top of watchdogs.
+ * 
+ *    Nic Bellamy <nic@bellamy.co.nz>, October 2003.
+ *
+*/
+/*
+   Copyright (C) 2003-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
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   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., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.
+
+ */
+
+typedef struct s_btimer_t {
+   watchdog_t *wd;                   /* Parent watchdog */
+   int type;
+   bool killed;
+   pid_t pid;                        /* process id if TYPE_CHILD */
+   pthread_t tid;                    /* thread id if TYPE_PTHREAD */
+   BSOCK *bsock;                     /* Pointer to BSOCK */
+} btimer_t;
+
+/* EOF */

diff --git a/bacula/src/lib/lib.h b/bacula/src/lib/lib.h
index 00934170bf1c9b3a7af850bfb4f700fe88a30823..89d9c2948d324090c9b2696eabdd64f13c31845f 100644 (file)
--- a/bacula/src/lib/lib.h
+++ b/bacula/src/lib/lib.h
@@ -51,7 +51,7 @@
 #include "sha1.h"
 #include "tree.h"
 #include "watchdog.h"
-#include "timers.h"
+#include "btimers.h"
 #include "bpipe.h"
 #include "attr.h"
 #include "var.h"

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 47c48ca5f1b741723fc3ecf64bed6d3a94c77a19..85f92eed33b877d26317ee75bf913968d505ad82 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -688,6 +688,9 @@ int read_block_from_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool check_bloc
    int retry;
    DCR *dcr = jcr->dcr;
 
+   if (!dcr) {
+      Jmsg(jcr, M_ABORT, 0, _("DCR is NULL!\n"));
+   }
    if (dev_state(dev, ST_EOT)) {
       return 0;
    }

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index dd6546324a32a56be0a7e290fc1e024729aee154..151554940850e92abe5e2b5d57fc0100107f5934 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -942,7 +942,11 @@ read_again:
             Pmsg0(-1, _("Got EOF on tape.\n"));
            goto read_again;
         }
-         Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno));
+         Pmsg1(0, _("Read block failed! ERR=%s\n\n"), strerror(dev->dev_errno));
+         Pmsg0(0, _("This may be because the tape drive block size is not\n"
+                    " set to variable blocking as normally used by Bacula.\n"
+                    " Please see the Tape Testing chapter in the manual and \n"
+                    " look for using mt with defblksize and setoptions\n"));
         goto bail_out;
       }
       memset(rec->data, 0, rec->data_len);

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 580c3f6aa02d188ffdb8b13b026a1d716a4169c2..e7dbf04a26aa9937969a4edd51117c2665fe6dde 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -29,6 +29,8 @@
 #ifndef __DEV_H
 #define __DEV_H 1
 
+#undef DCR                            /* used by Bacula */
+
 /* #define NEW_LOCK 1 */
 
 #define new_lock_device(dev)             _new_lock_device(__FILE__, __LINE__, (dev)) 

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index 902661543bbddf0742050bbf3060fa3ced1bd6ba..65e86d3384d043acd476a7a34e8ad5b33a5310bf 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -67,13 +67,13 @@ void list_spool_stats(BSOCK *bs)
 {
    char ed1[30], ed2[30];
    if (spool_stats.data_jobs || spool_stats.max_data_size) {
-      bnet_fsend(bs, "Data spooling: %d active jobs %s bytes; %d total jobs %s max bytes/job.\n",
+      bnet_fsend(bs, "Data spooling: %d active jobs, %s bytes; %d total jobs, %s max bytes/job.\n",
         spool_stats.data_jobs, edit_uint64_with_commas(spool_stats.data_size, ed1),
         spool_stats.total_data_jobs, 
         edit_uint64_with_commas(spool_stats.max_data_size, ed2));
    }
    if (spool_stats.attr_jobs || spool_stats.max_attr_size) {
-      bnet_fsend(bs, "Attr spooling: %d active jobs; %d total jobs %s max bytes/job.\n",
+      bnet_fsend(bs, "Attr spooling: %d active jobs; %d total jobs, %s max bytes/job.\n",
         spool_stats.attr_jobs, spool_stats.total_attr_jobs, 
         edit_uint64_with_commas(spool_stats.max_attr_size, ed1));
    }
@@ -109,8 +109,12 @@ bool discard_data_spool(JCR *jcr)
 bool commit_data_spool(JCR *jcr)
 {
    bool stat;
+   char ec1[40];
+
    if (jcr->dcr->spooling) {
       Dmsg0(100, "Committing spooled data\n");
+      Jmsg(jcr, M_INFO, 0, _("Writing spooled data to Volume. Despooling %s bytes ...\n"),
+           edit_uint64_with_commas(jcr->dcr->dev->spool_size, ec1));
       stat = despool_data(jcr->dcr);
       if (!stat) {
          Dmsg1(000, "Bad return from despool WroteVol=%d\n", jcr->dcr->WroteVol);
@@ -339,8 +343,9 @@ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block)
    }
    V(mutex);
    if (despool) {
+      char ec1[30];
 #ifdef xDEBUG 
-      char ec1[30], ec2[30], ec3[30], ec4[30];
+      char ec2[30], ec3[30], ec4[30];
       Dmsg4(100, "Despool in write_block_to_spool_file max_size=%s size=%s "
             "max_job_size=%s job_size=%s\n", 
            edit_uint64_with_commas(dcr->max_spool_size, ec1),
@@ -348,12 +353,13 @@ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block)
            edit_uint64_with_commas(dcr->dev->max_spool_size, ec3),
            edit_uint64_with_commas(dcr->dev->spool_size, ec4));
 #endif
-      Jmsg(dcr->jcr, M_INFO, 0, _("User specified spool size reached. Despooling ...\n"));
+      Jmsg(dcr->jcr, M_INFO, 0, _("User specified spool size reached. Despooling %s bytes ...\n"),
+           edit_uint64_with_commas(dcr->dev->spool_size, ec1));
       if (!despool_data(dcr)) {
          Dmsg0(000, "Bad return from despool in write_block.\n");
         return false;
       }
-      /* Despooling cleard these variables so reset them */
+      /* Despooling cleared these variables so reset them */
       P(dcr->dev->spool_mutex);
       dcr->spool_size += hlen + wlen;
       dcr->dev->spool_size += hlen + wlen;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 0996e32887b243c583dcc330e5f2fa8834529f00..058077b0ae447b6f9f45996523e8eedab255bed6 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.34.3"
 #define VSTRING "1"
-#define BDATE   "01 May 2004"
-#define LSMDATE "01May04"
+#define BDATE   "28 May 2004"
+#define LSMDATE "28May04"
 
 /* Debug flags */
 #undef  DEBUG