Correct FS size calculation for FreeBSD, Solaris, and Windows

[bacula/bacula] / bacula / src / bc_types.h

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index 52af67ddc6b187e3d99e5feebd7232a37be86f52..f1cfacc9aa950b038fae0b13b015abb4829bdbb6 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -1,4 +1,24 @@
 /*
 /*

+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2017 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
+*/
+/*
+    Define integer types for Bacula -- Kern Sibbald
+

     Integer types.  These types should be be used in all
     contexts in which the length of an integer stored on
     removable media must be known regardless of the
     Integer types.  These types should be be used in all
     contexts in which the length of an integer stored on
     removable media must be known regardless of the


@@ -8,37 +28,30 @@
 
     int8_t,  int16_t,  int32_t,  int64_t
     uint8_t, uint16_t, uint32_t, uint64_t
 
     int8_t,  int16_t,  int32_t,  int64_t
     uint8_t, uint16_t, uint32_t, uint64_t

-    float32_t, float64_t

 
     Also, we define types such as file address lengths.
 
     Also, we define types such as file address lengths.

-

  */
  */

-/*
-
-   Copyright (C) 2000, 2001 Kern Sibbald and John Walker
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.

 
 

-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.

 
 

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#ifndef __bc_types_INCLUDED
+#define __bc_types_INCLUDED

 
 

+/*
+ * These are the sizes of the current definitions of database
+ *  Ids.  In general, FileId_t can be set to uint64_t and it
+ *  *should* work.  Users have reported back that it does work
+ *  for PostgreSQL.  For the other types, all places in Bacula
+ *  have been converted, but no one has actually tested it.
+ * In principle, the only field that really should need to be
+ *  64 bits is the FileId_t

  */
  */

+typedef uint64_t FileId_t;
+typedef uint32_t DBId_t;              /* general DB id type */
+typedef uint32_t JobId_t;

 
 
 
 

-#ifndef __bc_types_INCLUDED
-#define __bc_types_INCLUDED
+typedef char POOLMEM;

 
 

-/* ****FIXME***** implement 64 bit file addresses ! */
-#define faddr_t long 

 
 /* Types */
 
 
 /* Types */
 


@@ -51,7 +64,7 @@ typedef unsigned int u_int;
 
 #ifndef HAVE_INTXX_T
 # if (SIZEOF_CHAR == 1)
 
 #ifndef HAVE_INTXX_T
 # if (SIZEOF_CHAR == 1)

-typedef char int8_t;
+typedef signed char int8_t;

 # else
 #  error "8 bit int type not found."
 # endif
 # else
 #  error "8 bit int type not found."
 # endif


@@ -78,17 +91,17 @@ typedef uint32_t u_int32_t;
 #  if (SIZEOF_CHAR == 1)
 typedef unsigned char u_int8_t;
 #  else
 #  if (SIZEOF_CHAR == 1)
 typedef unsigned char u_int8_t;
 #  else

-#   error "8 bit int type not found."
+#   error "8 bit int type not found. Required!"

 #  endif
 #  if (SIZEOF_SHORT_INT == 2)
 typedef unsigned short int u_int16_t;
 #  else
 #  endif
 #  if (SIZEOF_SHORT_INT == 2)
 typedef unsigned short int u_int16_t;
 #  else

-#   error "16 bit int type not found."
+#   error "16 bit int type not found. Required!"

 #  endif
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
 #  else
 #  endif
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
 #  else

-#   error "32 bit int type not found."
+#   error "32 bit int type not found. Required!"

 #  endif
 # endif
 #endif
 #  endif
 # endif
 #endif


@@ -110,7 +123,7 @@ typedef long int int64_t;
 # ifdef HAVE_INT64_T
 typedef int64_t intmax_t;
 # else
 # ifdef HAVE_INT64_T
 typedef int64_t intmax_t;
 # else

-typedef int32_t intmax_t;
+#   error "64 bit type not found. Required!"

 # endif
 #endif
 
 # endif
 #endif
 


@@ -122,6 +135,8 @@ typedef unsigned long long int u_int64_t;
 #  if (SIZEOF_LONG_INT == 8)
 typedef unsigned long int u_int64_t;
 #   define HAVE_U_INT64_T 1
 #  if (SIZEOF_LONG_INT == 8)
 typedef unsigned long int u_int64_t;
 #   define HAVE_U_INT64_T 1

+#  else
+#   error "64 bit type not found. Required!"

 #  endif
 # endif
 #endif
 #  endif
 # endif
 #endif


@@ -130,20 +145,45 @@ typedef unsigned long int u_int64_t;
 # ifdef HAVE_U_INT64_T
 typedef u_int64_t u_intmax_t;
 # else
 # ifdef HAVE_U_INT64_T
 typedef u_int64_t u_intmax_t;
 # else

-typedef u_int32_t u_intmax_t;
+#   error "64 bit type not found. Required!"
+# endif
+#endif
+
+#ifndef HAVE_INTPTR_T
+#define HAVE_INTPTR_T 1
+# if (SIZEOF_INT_P == 4)
+typedef int32_t intptr_t;
+# else
+#  if (SIZEOF_INT_P == 8)
+typedef int64_t intptr_t;
+#  else
+#   error "Can't find sizeof pointer. Required!"
+#  endif

 # endif
 #endif
 
 # endif
 #endif
 

+#ifndef HAVE_UINTPTR_T
+#define HAVE_UINTPTR_T 1
+# if (SIZEOF_INT_P == 4)
+typedef uint32_t uintptr_t;
+# else
+#  if (SIZEOF_INT_P == 8)
+typedef uint64_t uintptr_t;
+#  else
+#   error "Can't find sizeof pointer. Required!"
+#  endif
+# endif
+#endif

 
 /* Limits for the above types. */
 
 /* Limits for the above types. */

-#undef INT8_MIN  
-#undef INT8_MAX  
-#undef UINT8_MAX 
-#undef INT16_MIN 
-#undef INT16_MAX 
+#undef INT8_MIN
+#undef INT8_MAX
+#undef UINT8_MAX
+#undef INT16_MIN
+#undef INT16_MAX

 #undef UINT16_MAX
 #undef UINT16_MAX

-#undef INT32_MIN 
-#undef INT32_MAX 
+#undef INT32_MIN
+#undef INT32_MAX

 #undef UINT32_MAX
 
 #define INT8_MIN        (-127-1)
 #undef UINT32_MAX
 
 #define INT8_MIN        (-127-1)


@@ -159,17 +199,54 @@ typedef u_int32_t u_intmax_t;
 typedef double            float64_t;
 typedef float             float32_t;
 
 typedef double            float64_t;
 typedef float             float32_t;
 

-#endif /* __bc_types_INCLUDED */

 
 /* Define the uint versions actually used in Bacula */
 
 /* Define the uint versions actually used in Bacula */

+#ifndef uint8_t

 #define uint8_t u_int8_t
 #define uint16_t u_int16_t
 #define uint32_t u_int32_t
 #define uint64_t u_int64_t
 #define uintmax_t u_intmax_t
 #define uint8_t u_int8_t
 #define uint16_t u_int16_t
 #define uint32_t u_int32_t
 #define uint64_t u_int64_t
 #define uintmax_t u_intmax_t

+#endif

 
 

-#define btime_t uint64_t
+/* Bacula time -- Unix time with microseconds */
+#define btime_t int64_t
+/* Unix time (time_t) widened to 64 bits */
+#define utime_t int64_t

 
 

-#ifdef HAVE_CYGWIN
+#ifndef HAVE_SOCKLEN_T

 #define socklen_t int
 #endif
 #define socklen_t int
 #endif

+
+#ifndef HAVE_WIN32
+#ifndef SOCKET_ERROR
+#define SOCKET_ERROR (-1)
+#endif
+#endif
+
+#ifdef HAVE_OLD_SOCKOPT
+#define sockopt_val_t char *
+#else
+#define sockopt_val_t void *
+#endif
+
+/*
+ * Status codes returned by create_file()
+ *   Used in findlib, filed, and plugins
+ */
+enum {
+   CF_SKIP = 1,                   /* skip file (not newer or something) */
+   CF_ERROR,                      /* error creating file */
+   CF_EXTRACT,                    /* file created, data to extract */
+   CF_CREATED,                    /* file created, no data to extract */
+   CF_CORE                        /* let bacula core handle the file creation */
+};
+
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#endif /* __bc_types_INCLUDED */