X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbaconfig.h;h=c0e6ef087da90731f45af374ab0721dadc891528;hb=d80730759db76731f110ff35fda81075f49dfbf3;hp=c947d31739fc6ea88aecdeb323bd79ae21938437;hpb=dca40049701012f57ee10d2aab330a2240e7c471;p=bacula%2Fbacula

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index c947d31739..c0e6ef087d 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -79,6 +79,10 @@
 #define NPRT(x) (x)?(x):_("*None*")
  
 #if defined(HAVE_WIN32)
+
+#define WIN32_REPARSE_POINT 1
+#define WIN32_MOUNT_POINT   2
+
 void InitWinAPIWrapper();
 
 #define  OSDependentInit()    InitWinAPIWrapper()
@@ -100,19 +104,14 @@ void InitWinAPIWrapper();
 #  define CATS_IMP_EXP
 #endif
 
-#else
+#else  /* HAVE_WIN32 */
 
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 
 #define  OSDependentInit()
-#define  tape_open            open
-#define  tape_ioctl           ioctl
-#define  tape_read            ::read
-#define  tape_write           ::write
-#define  tape_close           ::close
 
-#endif
+#endif /* HAVE_WIN32 */
 
 
 #ifdef ENABLE_NLS
@@ -207,27 +206,27 @@ void InitWinAPIWrapper();
  *   STREAM_SHA256_DIGEST
  *   STREAM_SHA512_DIGEST
  */
-#define STREAM_NONE               0    /* Reserved Non-Stream */
-#define STREAM_UNIX_ATTRIBUTES    1    /* Generic Unix attributes */
-#define STREAM_FILE_DATA          2    /* Standard uncompressed data */
-#define STREAM_MD5_SIGNATURE      3    /* deprecated */
-#define STREAM_MD5_DIGEST         3    /* MD5 digest for the file */
-#define STREAM_GZIP_DATA          4    /* GZip compressed file data */
+#define STREAM_NONE                        0    /* Reserved Non-Stream */
+#define STREAM_UNIX_ATTRIBUTES             1    /* Generic Unix attributes */
+#define STREAM_FILE_DATA                   2    /* Standard uncompressed data */
+#define STREAM_MD5_SIGNATURE               3    /* deprecated */
+#define STREAM_MD5_DIGEST                  3    /* MD5 digest for the file */
+#define STREAM_GZIP_DATA                   4    /* GZip compressed file data */
 /* Extended Unix attributes with Win32 Extended data.  Deprecated. */
-#define STREAM_UNIX_ATTRIBUTES_EX 5    /* Extended Unix attr for Win32 EX */
-#define STREAM_SPARSE_DATA        6    /* Sparse data stream */
-#define STREAM_SPARSE_GZIP_DATA   7
-#define STREAM_PROGRAM_NAMES      8    /* program names for program data */
-#define STREAM_PROGRAM_DATA       9    /* Data needing program */
-#define STREAM_SHA1_SIGNATURE    10    /* deprecated */
-#define STREAM_SHA1_DIGEST       10    /* SHA1 digest for the file */
-#define STREAM_WIN32_DATA        11    /* Win32 BackupRead data */
-#define STREAM_WIN32_GZIP_DATA   12    /* Gzipped Win32 BackupRead data */
-#define STREAM_MACOS_FORK_DATA   13    /* Mac resource fork */
-#define STREAM_HFSPLUS_ATTRIBUTES 14   /* Mac OS extra attributes */
+#define STREAM_UNIX_ATTRIBUTES_EX          5    /* Extended Unix attr for Win32 EX */
+#define STREAM_SPARSE_DATA                 6    /* Sparse data stream */
+#define STREAM_SPARSE_GZIP_DATA            7
+#define STREAM_PROGRAM_NAMES               8    /* program names for program data */
+#define STREAM_PROGRAM_DATA                9    /* Data needing program */
+#define STREAM_SHA1_SIGNATURE             10    /* deprecated */
+#define STREAM_SHA1_DIGEST                10    /* SHA1 digest for the file */
+#define STREAM_WIN32_DATA                 11    /* Win32 BackupRead data */
+#define STREAM_WIN32_GZIP_DATA            12    /* Gzipped Win32 BackupRead data */
+#define STREAM_MACOS_FORK_DATA            13    /* Mac resource fork */
+#define STREAM_HFSPLUS_ATTRIBUTES         14    /* Mac OS extra attributes */
 /*** FIXME ***/
-#define STREAM_UNIX_ATTRIBUTES_ACCESS_ACL 15 /* Standard ACL attributes on UNIX */
-#define STREAM_UNIX_ATTRIBUTES_DEFAULT_ACL 16 /* Default ACL attributes on UNIX */
+#define STREAM_UNIX_ACCESS_ACL            15   /* Standard ACL attributes on UNIX */
+#define STREAM_UNIX_DEFAULT_ACL           16   /* Default ACL attributes on UNIX */
 /*** FIXME ***/
 #define STREAM_SHA256_DIGEST              17   /* SHA-256 digest for the file */
 #define STREAM_SHA512_DIGEST              18   /* SHA-512 digest for the file */
@@ -277,6 +276,7 @@ void InitWinAPIWrapper();
 #define FT_INVALIDDT 20               /* Drive type not allowed for */
 #define FT_REPARSE   21               /* Win NTFS reparse point */
 #define FT_PLUGIN    22               /* Plugin generated filename */
+#define FT_DELETED   23               /* Deleted file entry */
 
 /* Definitions for upper part of type word (see above). */
 #define AR_DATA_STREAM (1<<16)        /* Data stream id present */
@@ -644,6 +644,9 @@ inline bool IsPathSeparator(int ch) { return ch == '/' || ch == '\\'; }
 inline char *first_path_separator(char *path) { return strpbrk(path, "/\\"); }
 inline const char *first_path_separator(const char *path) { return strpbrk(path, "/\\"); }
 
+extern void pause_msg(const char *file, const char *func, int line, const char *msg);
+#define pause(msg) if (debug_level) pause_msg(__FILE__, __func__, __LINE__, (msg))
+
 #else
 #define PathSeparator '/'
 /* Define Winsock functions if we aren't on Windows */
@@ -654,6 +657,7 @@ inline const char *first_path_separator(const char *path) { return strpbrk(path,
 inline bool IsPathSeparator(int ch) { return ch == '/'; }
 inline char *first_path_separator(char *path) { return strchr(path, '/'); }
 inline const char *first_path_separator(const char *path) { return strchr(path, '/'); }
+#define pause(msg)
 #endif