Fix result return in compat readdir_r

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

diff --git a/bacula/README b/bacula/README
index ecba375bb6829d6e232a968f34c16a7898d77583..513b130c99659e89fd3170292499e02217325f02 100644 (file)
--- a/bacula/README
+++ b/bacula/README
@@ -101,3 +101,14 @@ In addition to GPL, there are also parts of Bacula that are licensed
 under LGPL so that they may be used in proprietary code to interface
 with Bacula, and there are parts that are in the public domain.
              
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 8a4831ec00ed75cc6e4ab2fb1661b3aa23936276..ca5f31fc1be7c3a0cb86819150ac0c9b24823207 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -71,6 +71,8 @@ For 1.33 Testing/Documentation:
      http://howtos.linux.com/guides/nag2/x-087-2-nfs.mountd.shtml
 
 For 1.33
+- Dates are wrong in restore list from Win32 FD.
+- Dates are wrong in catalog from Win32 FD.
 - Remove h_errno from bnet.c by including proper header.
 - Do not err job if could not write bootstrap file.
 - Bizarre message: Error: Could not open WriteBootstrap file:

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 4b668191a4b4abe46acf9f5adf6800aea8823b71..a13f6bc02a5b6053438ba02bd971ac185b2e3254 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -105,7 +105,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
    /*
     * List running jobs  
     */
-   Dmsg0(200, "Begin status jcr loop.\n");
+   Dmsg0(1000, "Begin status jcr loop.\n");
    lock_jcr_chain();
    for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
       bstrftime_nc(dt, sizeof(dt), njcr->start_time);
@@ -155,7 +155,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
       free_locked_jcr(njcr);
    }
    unlock_jcr_chain();
-   Dmsg0(200, "Begin status jcr loop.\n");
+   Dmsg0(1000, "Begin status jcr loop.\n");
    if (!found) {
       len = Mmsg(&msg, _("No jobs running.\n"));
       sendit(msg, len, arg);
@@ -382,7 +382,7 @@ char *bac_status(int stat)
         break;
       }
    }
-   Dmsg0(200, "Begin bac_status jcr loop.\n");
+   Dmsg0(1000, "Begin bac_status jcr loop.\n");
    lock_jcr_chain();
    for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
       if (njcr->JobId != 0) {
@@ -394,7 +394,7 @@ char *bac_status(int stat)
       free_locked_jcr(njcr);
    }
    unlock_jcr_chain();
-   Dmsg0(200, "End bac_status jcr loop.\n");
+   Dmsg0(1000, "End bac_status jcr loop.\n");
    bstrncpy(buf, termstat, sizeof(buf));
    return buf;
 }

diff --git a/bacula/src/filed/win32/bacula.bmp b/bacula/src/filed/win32/bacula.bmp
index 9db8e64238735148978f23a2ffa21d8c1ddd44cb..a31eb1636902fbe82492cf1bcc9424b196296912 100644 (file)
Binary files a/bacula/src/filed/win32/bacula.bmp and b/bacula/src/filed/win32/bacula.bmp differ

diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c
index ae7c984746d0bf0838c4f95dc3323f8a3530bfd5..ef5f4bc860c600d00170e2d78768ee68890b0f77 100755 (executable)
--- a/bacula/src/findlib/find_one.c
+++ b/bacula/src/findlib/find_one.c
@@ -327,6 +327,8 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
 
         status  = readdir_r(directory, entry, &result);
         if (status != 0 || result == NULL) {
+//          Dmsg2(99, "readdir returned stat=%d result=0x%x\n",
+//            status, (long)result);
            break;
         }
         ASSERT(name_max+1 > (int)sizeof(struct dirent) + (int)NAMELEN(entry));