new devel_bacula + fixes to conio/console

[bacula/bacula] / bacula / src / findlib / bfile.c

diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c
index 84b2908c0a6376c48acff49af5b8c0da578bfc21..2ade59f41fb7f7737b6fbae8a92b667a1400e9e8 100644 (file)
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -37,6 +37,17 @@
  *
  * ===============================================================
  */
+
+int is_win32_stream(int stream)
+{
+   switch (stream) {
+   case STREAM_WIN32_DATA:
+   case STREAM_WIN32_GZIP_DATA:
+      return 1;
+   }
+   return 0;
+}
+
 char *stream_to_ascii(int stream)
 {
    static char buf[20];
@@ -46,8 +57,6 @@ char *stream_to_ascii(int stream)
       return "GZIP data";
    case STREAM_SPARSE_GZIP_DATA:
       return "GZIP sparse data";
-   case STREAM_WIN32_ATTRIBUTES:
-      return "Win32 attributes";
    case STREAM_WIN32_DATA:
       return "Win32 data";
    case STREAM_WIN32_GZIP_DATA:
@@ -89,41 +98,52 @@ void unix_name_to_win32(POOLMEM **win32_name, char *name);
 extern "C" HANDLE get_osfhandle(int fd);
 
 
+
 void binit(BFILE *bfd)
 {
    bfd->fid = -1;
    bfd->mode = BF_CLOSED;
-   bfd->use_backup_api = p_BackupRead && p_BackupWrite;
+   bfd->use_backup_api = have_win32_api();
    bfd->errmsg = NULL;
    bfd->lpContext = NULL;
    bfd->lerror = 0;
 }
 
 /*
- * Enables/disables using the Backup API (win32_data).
+ * Enables using the Backup API (win32_data).
  *   Returns 1 if function worked
  *   Returns 0 if failed (i.e. do not have Backup API on this machine)
  */
-int set_win32_backup(BFILE *bfd, int enable)
+int set_win32_backup(BFILE *bfd) 
 {
-   if (!enable) {
-      bfd->use_backup_api = 0;
-      return 1;
-   }
    /* We enable if possible here */
-   bfd->use_backup_api = p_BackupRead && p_BackupWrite;
+   bfd->use_backup_api = have_win32_api();
    return bfd->use_backup_api;
 }
 
+
+int set_portable_backup(BFILE *bfd)
+{
+   bfd->use_backup_api = 0;
+   return 1;
+}
+
 /*
- * Return 1 if we can do Win32 backup
- * return 0 if not
+ * Return 1 if we are NOT using Win32 BackupWrite() 
+ * return 0 if are
  */
-int is_win32_backup(void)
+int is_portable_backup(BFILE *bfd) 
+{
+   return !bfd->use_backup_api;
+}
+
+int have_win32_api()
 {
    return p_BackupRead && p_BackupWrite;
 }
 
+
+
 /*
  * Return 1 if we support the stream
  *       0 if we do not support the stream
@@ -137,10 +157,9 @@ int is_stream_supported(int stream)
    case STREAM_SPARSE_GZIP_DATA:
       return 0;
 #endif
-   case STREAM_WIN32_ATTRIBUTES:
    case STREAM_WIN32_DATA:
    case STREAM_WIN32_GZIP_DATA:
-      return is_win32_backup();   /* check if we support BackupRead/Write data */
+      return have_win32_api();
 
    /* Known streams */
 #ifdef HAVE_LIBZ
@@ -194,7 +213,7 @@ int bopen(BFILE *bfd, const char *fname, int flags, mode_t mode)
 
    } else if (flags & O_WRONLY) {     /* Open existing for write */
       if (bfd->use_backup_api) {
-        dwaccess = FILE_ALL_ACCESS|WRITE_OWNER|WRITE_DAC|ACCESS_SYSTEM_SECURITY;
+        dwaccess = GENERIC_WRITE|FILE_ALL_ACCESS|WRITE_OWNER|WRITE_DAC|ACCESS_SYSTEM_SECURITY;
         dwflags = FILE_FLAG_BACKUP_SEMANTICS;
       } else {
         dwaccess = GENERIC_WRITE;
@@ -233,6 +252,7 @@ int bopen(BFILE *bfd, const char *fname, int flags, mode_t mode)
    }
    bfd->errmsg = NULL;
    bfd->lpContext = NULL;
+   free_pool_memory(win32_fname);
    return bfd->mode == BF_CLOSED ? -1 : 1;
 }
 
@@ -391,14 +411,34 @@ void binit(BFILE *bfd)
    bfd->fid = -1;
 }
 
-int set_win32_backup(BFILE *bfd, int enable)
+int have_win32_api()
+{ 
+   return 0;                         /* no can do */
+} 
+
+/*
+ * Enables using the Backup API (win32_data).
+ *   Returns 1 if function worked
+ *   Returns 0 if failed (i.e. do not have Backup API on this machine)
+ */
+int set_win32_backup(BFILE *bfd) 
 {
-   return 0;
+   return 0;                         /* no can do */
+}
+
+
+int set_portable_backup(BFILE *bfd)
+{
+   return 1;                         /* no problem */
 }
 
-int is_win32_backup(void)
+/*
+ * Return 1 if we are writing in portable format
+ * return 0 if not
+ */
+int is_portable_backup(BFILE *bfd) 
 {
-   return 0;
+   return 1;                         /* portable by definition */
 }
 
 int is_stream_supported(int stream)
@@ -409,7 +449,6 @@ int is_stream_supported(int stream)
    case STREAM_GZIP_DATA:
    case STREAM_SPARSE_GZIP_DATA:
 #endif
-   case STREAM_WIN32_ATTRIBUTES:
    case STREAM_WIN32_DATA:
    case STREAM_WIN32_GZIP_DATA:
       return 0;
@@ -438,14 +477,21 @@ int bopen(BFILE *bfd, const char *fname, int flags, mode_t mode)
 {
    bfd->fid = open(fname, flags, mode);
    bfd->berrno = errno;
+   Dmsg1(50, "Open file %d\n", bfd->fid);
    return bfd->fid;
 }
 
 int bclose(BFILE *bfd)
 { 
-   int stat = close(bfd->fid);
+   int stat;  
+   Dmsg1(50, "Close file %d\n", bfd->fid);
+   if (bfd->fid == -1) {
+      return 0;
+   }
+   stat = close(bfd->fid);
    bfd->berrno = errno;
    bfd->fid = -1;
+
    return stat;
 }