Win32 build fixes

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

diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index 27347a3b47d7c5cf0a14af3b469ed74abac7f89b..635f1e85267a03cdee1c17fd49813437ec57033e 100644 (file)
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -353,7 +353,7 @@ int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr)
  *             Volumes are concatenated in VolumeNames
  *             separated by a vertical bar (|).
  */
-int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, char *VolumeNames)
+int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
 {
    int found = 0;
    JOBMEDIA_DBR jm;
@@ -380,9 +380,9 @@ int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, char *VolumeNames)
         while (fread(&mr, mrlen, 1, mdb->mediafd) > 0) {
            if (jm.MediaId == mr.MediaId) {
               if (*VolumeNames != 0) {         /* if not first name, */
-                  strcat(VolumeNames, "|");     /* add separator */
+                  pm_strcat(VolumeNames, "|");  /* add separator */
               }
-              strcat(VolumeNames, mr.VolumeName); /* add Volume Name */
+              pm_strcat(VolumeNames, mr.VolumeName); /* add Volume Name */
               found++;
            }
         }

diff --git a/bacula/src/filed/win32/Makefile.in b/bacula/src/filed/win32/Makefile.in
index b2d1a227268ba0aca35d04aae24cd36ecd8edd8a..414991feadbfe238e22fdcf1720d4bbcff60eb29 100755 (executable)
--- a/bacula/src/filed/win32/Makefile.in
+++ b/bacula/src/filed/win32/Makefile.in
@@ -72,9 +72,9 @@ install:
        @mkdir -p $(sbindir) /tmp $(sbindir)/../working
        @echo "Installing system binary files ..."
        @strip ../bacula-fd.exe
-       @strip ../../lib/smtp.exe
+       @strip ../../tools/smtp.exe
        @cp -f ../bacula-fd.exe bin/
-       @cp -f ../../lib/smtp.exe bin/
+       @cp -f ../../tools/smtp.exe bin/
        @cp -f bin/* $(sbindir)
 
 # Make a Win32 binary release 
@@ -85,10 +85,10 @@ binary-release:
        @echo "Copying system binary files ..."
        @cp bin/* wr/$(sbindir)
        @strip ../bacula-fd.exe
-       @strip ../../lib/smtp.exe
+       @strip ../../tools/smtp.exe
        @echo "Copying executables ..."
        @cp -f ../bacula-fd.exe wr/$(sbindir)/bacula-fd.exe 
-       @cp -f ../../lib/smtp.exe wr/$(sbindir)/smtp.exe 
+       @cp -f ../../tools/smtp.exe wr/$(sbindir)/smtp.exe 
        @echo "Copying bacula-fd.conf..."
        @cp -f ../bacula-fd.conf wr/$(sysconfdir)/bacula-fd.conf
 # the two dummy files are necessary to insure that WinZip