X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbaconfig.h;h=b9c6cd9719aa991451e76117d4f956ca2cb13ca0;hb=704b9ff20b643de80ea4e87b593d5f548162ded5;hp=ff4eef9e06f8e23426239716f739be6006b25758;hpb=b6a75b353230d2e66be0f5311b0ca672641e307e;p=bacula%2Fbacula

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index ff4eef9e06..b9c6cd9719 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -30,6 +30,8 @@
 
 /* Bacula common configuration defines */
 
+#undef  TRUE
+#undef  FALSE
 #define TRUE  1
 #define FALSE 0
 
@@ -60,10 +62,13 @@
 #define _(s) gettext((s))
 #define N_(s) (s)
 #else
+#undef _
 #define _(s) (s)
+#undef N_
 #define N_(s) (s)
+#undef textdomain
 #define textdomain(d)
-#define bindtextdomain(p, d)
+/* #define bindtextdomain(p, d) */
 #endif
 
 
@@ -71,7 +76,7 @@
 #define MAXSTRING 500
 
 /* Maximum length to edit time/date */
-#define MAX_TIME_LENGTH 30
+#define MAX_TIME_LENGTH 50  
 
 /* Maximum Name length including EOS */
 #define MAX_NAME_LENGTH 128
@@ -89,19 +94,30 @@
 #define DEV_BSIZE 512
 #endif
 
-/* Maximum number of bytes that you can push into a
+/*
+ * Maximum number of bytes that you can push into a
  * socket.
  */
 #define MAX_NETWORK_BUFFER_SIZE (32 * 1024)
 
-/* Stream definitions.  Once defined these must NEVER
+/*
+ * Stream definitions.  Once defined these must NEVER
  *   change as they go on the storage media.
+ * Note, the following streams are passed from the SD to the DIR
+ *   so that they may be put into the catalog (actually only the
+ *   stat packet part of the attr record is put in the catalog.
+ *
+ *   STREAM_UNIX_ATTRIBUTES
+ *   STREAM_UNIX_ATTRIBUTES_EX
+ *   STREAM_MD5_SIGNATURE
+ *   STREAM_SHA1_SIGNATURE
  */
 #define STREAM_UNIX_ATTRIBUTES    1    /* Generic Unix attributes */
 #define STREAM_FILE_DATA          2    /* Standard uncompressed data */
 #define STREAM_MD5_SIGNATURE      3    /* MD5 signature for the file */
 #define STREAM_GZIP_DATA          4    /* GZip compressed file data */
-#define STREAM_UNIX_ATTRIBUTES_EX 5    /* Extended Unix attr. Win32Ex/FreeBSD */
+/* 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 */
@@ -110,6 +126,37 @@
 #define STREAM_WIN32_DATA        11    /* Win32 BackupRead data */
 #define STREAM_WIN32_GZIP_DATA   12    /* Gzipped Win32 BackupRead data */
 
+/* 
+ *  File type (Bacula defined).           
+ *  NOTE!!! These are saved in the Attributes record on the tape, so
+ *          do not change them. If need be, add to them.
+ *
+ *  This is stored as 32 bits on tape, but only FT_MASK bits are
+ *    used for the file type. The upper bits are used to indicate
+ *    additional optional fields in the attribute record.
+ */
+#define FT_MASK       0xFFFF          /* Bits used by FT (type) */
+#define FT_LNKSAVED   1               /* hard link to file already saved */  
+#define FT_REGE       2               /* Regular file but empty */
+#define FT_REG        3               /* Regular file */
+#define FT_LNK        4               /* Soft Link */
+#define FT_DIR        5               /* Directory */
+#define FT_SPEC       6               /* Special file -- chr, blk, fifo, sock */
+#define FT_NOACCESS   7               /* Not able to access */
+#define FT_NOFOLLOW   8               /* Could not follow link */
+#define FT_NOSTAT     9               /* Could not stat file */
+#define FT_NOCHG     10               /* Incremental option, file not changed */
+#define FT_DIRNOCHG  11               /* Incremental option, directory not changed */
+#define FT_ISARCH    12               /* Trying to save archive file */
+#define FT_NORECURSE 13               /* No recursion into directory */
+#define FT_NOFSCHG   14               /* Different file system, prohibited */
+#define FT_NOOPEN    15               /* Could not open directory */
+#define FT_RAW       16               /* Raw block device */
+#define FT_FIFO      17               /* Raw fifo device */
+
+/* Definitions for upper part of type word (see above). */
+#define AR_DATA_STREAM (1<<16)        /* Data stream id present */
+
 /*
  * Internal code for Signature types
  */
@@ -334,7 +381,7 @@ extern void _v(char *file, int line, pthread_mutex_t *m);
 #define Mmsg15(buf,msg,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15) m_msg(__FILE__,__LINE__,buf,msg,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15)
 
 /* Edit message into Pool Memory buffer -- no __FILE__ and __LINE__ */
-int  Mmsg(char **msgbuf, char *fmt,...);
+int  Mmsg(POOLMEM **msgbuf, char *fmt,...);
 
 
 struct JCR;
@@ -342,13 +389,17 @@ void d_msg(char *file, int line, int level, char *fmt,...);
 void p_msg(char *file, int line, int level, char *fmt,...);
 void e_msg(char *file, int line, int type, int level, char *fmt,...);
 void j_msg(char *file, int line, JCR *jcr, int type, int level, char *fmt,...);
-int  m_msg(char *file, int line, char **msgbuf, char *fmt,...);
+int  m_msg(char *file, int line, POOLMEM **msgbuf, char *fmt,...);
 
 
 /* Use our strdup with smartalloc */
 #undef strdup
 #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf)
 
+/* Use our fgets which handles interrupts */
+#undef fgets
+#define fgets(x,y,z) bfgets((x), (y), (z))
+
 #ifdef DEBUG
 #define bstrdup(str) strcpy((char *) b_malloc(__FILE__,__LINE__,strlen((str))+1),(str))
 #else
@@ -383,7 +434,7 @@ extern int thr_setconcurrency(int);
 
 #ifdef HAVE_DARWIN_OS
 /* Apparently someone forgot to wrap getdomainname as a C function */
-extern "C" int getdomainname(char *name, size_t len);
+extern "C" int getdomainname(char *name, int len);
 
 /* Darwin lib fnmatch() doesn't work, so use our own */
 #undef HAVE_FNMATCH