Detect mount/junction points and ignore junctions in Windows

[bacula/bacula] / bacula / src / lib / bsys.c

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index 7527ec412257e57a3545180c26354faeeaede86c..3bff1c5f783091c28ce7caf1a543df43df507e3d 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 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.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,7 +15,7 @@
    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
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
@@ -32,10 +32,12 @@
  *
  *  Bacula utility functions are in util.c
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
 
 
 static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -105,7 +107,11 @@ char *bstrncpy(char *dest, POOL_MEM &src, int maxlen)
    return dest;
 }
 
-
+/*
+ * Note: Here the maxlen is the maximum length permitted
+ *  stored in dest, while on Unix systems, it is the maximum characters
+ *  that may be copied from src.
+ */
 char *bstrncat(char *dest, const char *src, int maxlen)
 {
    int len = strlen(dest);
@@ -116,9 +122,13 @@ char *bstrncat(char *dest, const char *src, int maxlen)
    return dest;
 }
 
+/*
+ * Note: Here the maxlen is the maximum length permitted
+ *  stored in dest, while on Unix systems, it is the maximum characters
+ *  that may be copied from src.
+ */
 char *bstrncat(char *dest, POOL_MEM &src, int maxlen)
 {
-
    int len = strlen(dest);
    if (len < maxlen-1) {
       strncpy(dest+len, src.c_str(), maxlen-len-1);
@@ -152,6 +162,9 @@ int cstrlen(const char *str)
 {
    uint8_t *p = (uint8_t *)str;
    int len = 0;
+   if (str == NULL) {
+      return 0;
+   }
    while (*p) {
       if ((*p & 0xC0) != 0xC0) {
          p++;
@@ -662,3 +675,79 @@ char *escape_filename(const char *file_path)
 
    return escaped_path;
 }
+
+/*
+ * Deflate or compress and input buffer.  You must supply an
+ *  output buffer sufficiently long and the length of the
+ *  output buffer. Generally, if the output buffer is the
+ *  same size as the input buffer, it should work (at least
+ *  for text).
+ */
+int Zdeflate(char *in, int in_len, char *out, int &out_len)
+{
+#ifdef HAVE_LIBZ
+   z_stream strm;
+   int ret;
+
+   /* allocate deflate state */
+   strm.zalloc = Z_NULL;
+   strm.zfree = Z_NULL;
+   strm.opaque = Z_NULL;
+   ret = deflateInit(&strm, 9);
+   if (ret != Z_OK) {
+      Dmsg0(200, "deflateInit error\n");
+      (void)deflateEnd(&strm);
+      return ret;
+   }
+
+   strm.next_in = (Bytef *)in;
+   strm.avail_in = in_len;
+   Dmsg1(200, "In: %d bytes\n", strm.avail_in);
+   strm.avail_out = out_len;
+   strm.next_out = (Bytef *)out;
+   ret = deflate(&strm, Z_FINISH);
+   out_len = out_len - strm.avail_out;
+   Dmsg1(200, "compressed=%d\n", out_len);
+   (void)deflateEnd(&strm);
+   return ret;
+#else
+   return 1;
+#endif
+}
+
+/* 
+ * Inflate or uncompress an input buffer.  You must supply
+ *  and output buffer and an output length sufficiently long
+ *  or there will be an error.  This uncompresses in one call.
+ */
+int Zinflate(char *in, int in_len, char *out, int &out_len)
+{
+#ifdef HAVE_LIBZ
+   z_stream strm;
+   int ret;
+
+   /* allocate deflate state */
+   strm.zalloc = Z_NULL;
+   strm.zfree = Z_NULL;
+   strm.opaque = Z_NULL;
+   strm.next_in = (Bytef *)in;
+   strm.avail_in = in_len;
+   ret = inflateInit(&strm);
+   if (ret != Z_OK) {
+      Dmsg0(200, "inflateInit error\n");
+      (void)inflateEnd(&strm);
+      return ret;
+   }
+
+   Dmsg1(200, "In len: %d bytes\n", strm.avail_in);
+   strm.avail_out = out_len;
+   strm.next_out = (Bytef *)out;
+   ret = inflate(&strm, Z_FINISH);
+   out_len -= strm.avail_out;
+   Dmsg1(200, "Uncompressed=%d\n", out_len);
+   (void)inflateEnd(&strm);
+   return ret;
+#else
+   return 1;
+#endif
+}