From 1fdba84b45a4b3a4a2f0ea8cee8710022ae4bdf0 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 22 Apr 2004 16:27:19 +0000
Subject: [PATCH] Remove Win32 file open on G:

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1268 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/stored/bscan.c          | 8 ++++++--
 bacula/src/stored/read_record.c    | 2 +-
 bacula/src/version.h               | 6 +++---
 bacula/src/win32/compat/compat.cpp | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 059cf0f854..dcb141e083 100644
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -286,7 +286,7 @@ static int bscan_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
 	 dcr->EndFile = dev->EndFile;
       } else {
 	 dcr->EndBlock = (uint32_t)dev->file_addr;
-	 dcr->StartBlock = (uint32_t)(dev->file_addr >> 32);
+	 dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
       }
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -454,7 +454,11 @@ static int record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
 	 jr.PoolId = pr.PoolId;
 	 /* Set start positions into JCR */
 	 if (dev->state & ST_TAPE) {
-	    dcr->StartBlock = dev->block_num;
+	    /*
+	     * Note, we have already advanced past current block,
+	     *	so the correct number is block_num - 1 
+	     */ 
+	    dcr->StartBlock = dev->block_num - 1;
 	    dcr->StartFile = dev->file;
 	 } else {
 	    dcr->StartBlock = (uint32_t)dev->file_addr;
diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index e90cabeda1..64a3d6e49c 100644
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -271,7 +271,7 @@ static int try_repositioning(JCR *jcr, DEV_RECORD *rec, DEVICE *dev)
       return 1;
    }	 
    if (bsr) {
-      if (verbose > 1) {
+      if (verbose) {
          Jmsg(jcr, M_INFO, 0, "Reposition from (file:block) %d:%d to %d:%d\n",
 	    dev->file, dev->block_num, bsr->volfile->sfile,
 	    bsr->volblock->sblock);
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 1b5d48ef8b..2b3f37e450 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,9 +1,9 @@
 /* */
 #undef  VERSION
-#define VERSION "1.34.1"
+#define VERSION "1.34.2"
 #define VSTRING "1"
-#define BDATE   "20 Apr 2004"
-#define LSMDATE "20Apr04"
+#define BDATE   "22 Apr 2004"
+#define LSMDATE "22Apr04"
 
 /* Debug flags */
 #undef  DEBUG
diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index e61a3c4072..017c5443ca 100644
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -757,7 +757,7 @@ winver::winver(void)
     snprintf(WIN_VERSION, sizeof(WIN_VERSION), "%s %d.%d.%d",
              platform, osvinfo.dwMajorVersion, osvinfo.dwMinorVersion, osvinfo.dwBuildNumber);
 
-#if 1
+#if 0
     HANDLE h = CreateFile("G:\\foobar", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
     CloseHandle(h);
 #endif
-- 
2.39.5