From b50275e658e5327c5996e0f3656ab3215bc83ad0 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertn@the-nelsons.org>
Date: Thu, 15 Mar 2007 10:31:52 +0000
Subject: [PATCH] Fix ACLS on zero length files on Windows.

Add ENODATA definition for building using MSVC.

Add new bsock.c to MSVC build.

Fix exports for MSVC.

Fix problem with icons not being removed for task bar on exit.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4345 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/filed/backup.c                    | 16 +++-
 bacula/src/win32/compat/compat.h             |  4 +
 bacula/src/win32/libbac/libbac.vcproj        | 16 +++-
 bacula/src/win32/libbac/msvc/bacula.def      | 86 +++++++++++---------
 bacula/src/win32/libwin32/wintray.cpp        |  8 +-
 bacula/src/win32/stored/baculasd/wintray.cpp |  8 +-
 6 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 4af0603576..a4b9d74d4b 100644
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -406,10 +406,20 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
     * Note, if is_win32_backup, we must open the Directory so that
     * the BackupRead will save its permissions and ownership streams.
     */
-   if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) &&
-         ff_pkt->statp.st_size > 0) ||
-         ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO ||
+   bool do_read = false;
+
+   if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode)) {
+#ifdef HAVE_WIN32
+      do_read = !is_portable_backup(&ff_pkt->bfd) || ff_pkt->statp.st_size > 0;
+#else
+      do_read = ff_pkt->statp.st_size > 0;
+#endif
+   } else if (ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO ||
          (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIREND)) {
+      do_read = true;
+   }
+
+   if (do_read) {
       btimer_t *tid;
       if (ff_pkt->type == FT_FIFO) {
          tid = start_thread_timer(pthread_self(), 60);
diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h
index 890e863428..0e25586b21 100644
--- a/bacula/src/win32/compat/compat.h
+++ b/bacula/src/win32/compat/compat.h
@@ -147,6 +147,10 @@ int gettimeofday(struct timeval *, struct timezone *);
 #define ENOMEDIUM 123
 #endif
 
+#if !defined(ENODATA)
+#define ENODATA 61
+#endif
+
 struct stat
 {
     _dev_t      st_dev;
diff --git a/bacula/src/win32/libbac/libbac.vcproj b/bacula/src/win32/libbac/libbac.vcproj
index 7e7ebc353f..d8e1c6c8c1 100644
--- a/bacula/src/win32/libbac/libbac.vcproj
+++ b/bacula/src/win32/libbac/libbac.vcproj
@@ -454,6 +454,18 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\lib\bsock.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\lib\bsys.c"
 				>
@@ -1585,11 +1597,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\lib\protos.h"
+				RelativePath="..\..\findlib\protos.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\findlib\protos.h"
+				RelativePath="..\..\lib\protos.h"
 				>
 			</File>
 			<File
diff --git a/bacula/src/win32/libbac/msvc/bacula.def b/bacula/src/win32/libbac/msvc/bacula.def
index 5dd7f30f2e..8bb1fb34de 100644
--- a/bacula/src/win32/libbac/msvc/bacula.def
+++ b/bacula/src/win32/libbac/msvc/bacula.def
@@ -63,50 +63,57 @@ EXPORTS
 ?blseek@@YA_JPAUBFILE@@_JH@Z
  
 ; bget_msg.obj 
-?bget_msg@@YAHPAUBSOCK@@@Z
+?bget_msg@@YAHPAVBSOCK@@@Z
  
 ; bnet.obj 
-?bnet_recv@@YAJPAUBSOCK@@@Z
-?is_bnet_stop@@YA_NPAUBSOCK@@@Z
-?is_bnet_error@@YAHPAUBSOCK@@@Z
-?bnet_suppress_error_messages@@YAXPAUBSOCK@@_N@Z
-?bnet_despool_to_bsock@@YAHPAUBSOCK@@P6AXH@ZH@Z
-?bnet_send@@YA_NPAUBSOCK@@@Z
-?bnet_tls_server@@YA_NPAUTLS_Context@@PAUBSOCK@@PAValist@@@Z
-?bnet_tls_client@@YA_NPAUTLS_Context@@PAUBSOCK@@@Z
-?bnet_wait_data@@YAHPAUBSOCK@@H@Z
-?bnet_wait_data_intr@@YAHPAUBSOCK@@H@Z
-?bnet_connect@@YAPAUBSOCK@@PAVJCR@@HHPBDPAD2HH@Z
-?bnet_strerror@@YAPBDPAUBSOCK@@@Z
-?bnet_fsend@@YA_NPAUBSOCK@@PBDZZ
-?bnet_get_peer@@YAHPAUBSOCK@@PADH@Z
-?bnet_set_buffer_size@@YA_NPAUBSOCK@@IH@Z
-?bnet_sig@@YA_NPAUBSOCK@@H@Z
-?bnet_sig_to_ascii@@YAPBDPAUBSOCK@@@Z
-?init_bsock@@YAPAUBSOCK@@PAVJCR@@HPBD1HPAUsockaddr@@@Z
-?dup_bsock@@YAPAUBSOCK@@PAU1@@Z
-?bnet_close@@YAXPAUBSOCK@@@Z
-?term_bsock@@YAXPAUBSOCK@@@Z
- 
-; bnet_server.obj 
+?bnet_recv@@YAJPAVBSOCK@@@Z
+?is_bnet_stop@@YA_NPAVBSOCK@@@Z
+?is_bnet_error@@YAHPAVBSOCK@@@Z
+?bnet_suppress_error_messages@@YAXPAVBSOCK@@_N@Z
+?bnet_despool_to_bsock@@YAHPAVBSOCK@@P6AXH@ZH@Z
+?bnet_send@@YA_NPAVBSOCK@@@Z
+?bnet_tls_server@@YA_NPAUTLS_Context@@PAVBSOCK@@PAValist@@@Z
+?bnet_tls_client@@YA_NPAUTLS_Context@@PAVBSOCK@@@Z
+?bnet_wait_data@@YAHPAVBSOCK@@H@Z
+?bnet_wait_data_intr@@YAHPAVBSOCK@@H@Z
+?bnet_connect@@YAPAVBSOCK@@PAVJCR@@HHPBDPAD2HH@Z
+?bnet_strerror@@YAPBDPAVBSOCK@@@Z
+?bnet_fsend@@YA_NPAVBSOCK@@PBDZZ
+?bnet_get_peer@@YAHPAVBSOCK@@PADH@Z
+?bnet_set_buffer_size@@YA_NPAVBSOCK@@IH@Z
+?bnet_sig@@YA_NPAVBSOCK@@H@Z
+?bnet_sig_to_ascii@@YAPBDPAVBSOCK@@@Z
+?bnet_close@@YAXPAVBSOCK@@@Z
+?term_bsock@@YAXPAVBSOCK@@@Z
+
+; bnet_server.obj
 ?bnet_stop_thread_server@@YAXPAUpthread_t_@@@Z
 ?bnet_thread_server@@YAXPAVdlist@@HPAUworkq_tag@@P6APAXPAX@Z@Z
- 
-; bpipe.obj 
+
+; bpipe.obj
 ?run_program@@YAHPADH0@Z
 ?run_program_full_output@@YAHPADH0@Z
- 
-; bregex.obj 
+
+; bregex.obj
 b_regcomp
 b_regexec
 b_regerror
 b_regfree
 
-; bsnprintf.obj 
+; bsnprintf.obj
 ?bsnprintf@@YAHPADJPBDZZ
 ?bvsnprintf@@YAHPADJPBD0@Z
- 
-; bsys.obj 
+
+; bsock.obj
+?close@BSOCK@@QAEXXZ
+?dup_bsock@@YAPAVBSOCK@@PAV1@@Z
+?fsend@BSOCK@@QAA_NPBDZZ
+?init_bsock@@YAPAVBSOCK@@PAVJCR@@HPBD1HPAUsockaddr@@@Z
+?recv@BSOCK@@QAEJXZ
+?send@BSOCK@@QAE_NXZ
+?signal@BSOCK@@QAE_NH@Z
+
+; bsys.obj
 ?bmicrosleep@@YAHJJ@Z
 ?bstrncpy@@YAPADPADPBDH@Z
 ?bstrncpy@@YAPADPADAAVPOOL_MEM@@H@Z
@@ -141,7 +148,7 @@ b_regfree
  
 ; btimers.obj 
 ?start_thread_timer@@YAPAUs_btimer_t@@PAUpthread_t_@@I@Z
-?start_bsock_timer@@YAPAUs_btimer_t@@PAUBSOCK@@I@Z
+?start_bsock_timer@@YAPAUs_btimer_t@@PAVBSOCK@@I@Z
 ?stop_bsock_timer@@YAXPAUs_btimer_t@@@Z
 ?stop_thread_timer@@YAXPAUs_btimer_t@@@Z
  
@@ -173,8 +180,8 @@ b_regfree
 ?utime@@YAHPBDPAUutimbuf@@@Z
  
 ; cram-md5.obj 
-?cram_md5_challenge@@YA_NPAUBSOCK@@PADHH@Z
-?cram_md5_respond@@YA_NPAUBSOCK@@PADPAH2@Z
+?cram_md5_challenge@@YA_NPAVBSOCK@@PADHH@Z
+?cram_md5_respond@@YA_NPAVBSOCK@@PADPAH2@Z
  
 ; crc32.obj 
 ?bcrc32@@YAIPAEH@Z
@@ -228,13 +235,14 @@ b_regfree
 ?binary_insert_multiple@dlist@@QAEXPAXP6AH00@Z@Z
 ?binary_search@dlist@@QAEPAXPAXP6AH00@Z@Z
 ?remove@dlist@@QAEXPAX@Z
-?next@dlist@@QBEPAXPBX@Z
+?next@dlist@@QAEPAXPAX@Z
 ?destroy@dlist@@QAEXXZ
- 
-; drivetype.obj 
+?new_dlistString@@YAPAVdlistString@@PBD@Z
+
+; drivetype.obj
 ?drivetype@@YA_NPBDPADH@Z
- 
-; edit.obj 
+
+; edit.obj
 ?str_to_uint64@@YA_KPAD@Z
 ?str_to_int64@@YA_JPAD@Z
 ?edit_uint64_with_commas@@YAPAD_KPAD@Z
diff --git a/bacula/src/win32/libwin32/wintray.cpp b/bacula/src/win32/libwin32/wintray.cpp
index 7111120658..ca70e5164f 100644
--- a/bacula/src/win32/libwin32/wintray.cpp
+++ b/bacula/src/win32/libwin32/wintray.cpp
@@ -113,7 +113,7 @@ bacMenu::bacMenu()
 bacMenu::~bacMenu()
 {
    // Remove the tray icon
-   SendTrayMsg(NIM_DELETE, 0);
+   DelTrayIcon();
         
    // Destroy the loaded menu
    if (m_hmenu != NULL)
@@ -136,7 +136,7 @@ bacMenu::DelTrayIcon()
 void
 bacMenu::UpdateTrayIcon(int bacstat)
 {
-   (void *)bac_status(NULL, 0);
+   (void)bac_status(NULL, 0);
    SendTrayMsg(NIM_MODIFY, bacstat);
 }
 
@@ -215,7 +215,6 @@ LRESULT CALLBACK bacMenu::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lP
 
    // Every five seconds, a timer message causes the icon to update
    case WM_TIMER:
-      // *** HACK for running servicified
       if (bacService::RunningAsService()) {
           // Attempt to add the icon if it's not already there
           _this->AddTrayIcon();
@@ -297,6 +296,9 @@ LRESULT CALLBACK bacMenu::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lP
       }
 
    case WM_CLOSE:
+      if (bacService::RunningAsService()) {
+          _this->DelTrayIcon();
+      }
       terminate_filed(0);
       break;
 
diff --git a/bacula/src/win32/stored/baculasd/wintray.cpp b/bacula/src/win32/stored/baculasd/wintray.cpp
index f755d17eb1..b9612cd442 100644
--- a/bacula/src/win32/stored/baculasd/wintray.cpp
+++ b/bacula/src/win32/stored/baculasd/wintray.cpp
@@ -113,7 +113,7 @@ bacMenu::bacMenu()
 bacMenu::~bacMenu()
 {
    // Remove the tray icon
-   SendTrayMsg(NIM_DELETE, 0);
+   DelTrayIcon();
         
    // Destroy the loaded menu
    if (m_hmenu != NULL)
@@ -136,7 +136,7 @@ bacMenu::DelTrayIcon()
 void
 bacMenu::UpdateTrayIcon(int bacstat)
 {
-   (void *)bac_status(NULL, 0);
+   (void)bac_status(NULL, 0);
    SendTrayMsg(NIM_MODIFY, bacstat);
 }
 
@@ -215,7 +215,6 @@ LRESULT CALLBACK bacMenu::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lP
 
    // Every five seconds, a timer message causes the icon to update
    case WM_TIMER:
-      // *** HACK for running servicified
       if (bacService::RunningAsService()) {
           // Attempt to add the icon if it's not already there
           _this->AddTrayIcon();
@@ -297,6 +296,9 @@ LRESULT CALLBACK bacMenu::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lP
       }
 
    case WM_CLOSE:
+      if (bacService::RunningAsService()) {
+         _this->DelTrayIcon();
+      }
       terminate_stored(0);
       break;
 
-- 
2.39.5