Tweak fix MySQL quoting again :-(

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

diff --git a/bacula/src/findlib/bfile.h b/bacula/src/findlib/bfile.h
index 5c856b52d0b474c5c8c476f03c7670af753aed71..021dcc08637405249464fb30f71465f4e1566e71 100644 (file)
--- a/bacula/src/findlib/bfile.h
+++ b/bacula/src/findlib/bfile.h
@@ -1,26 +1,26 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2003-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2003-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.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   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.
 
    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
+   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.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -36,19 +36,6 @@
 #ifndef __BFILE_H
 #define __BFILE_H
 
-#ifdef HAVE_PYTHON
-#undef _POSIX_C_SOURCE
-#include <Python.h>
-struct Python_IO {
-   PyObject *fo;
-   PyObject *fr;
-   PyObject *fc;
-};
-#else
-struct Python_IO {
-};
-#endif
-
 
 /* this should physically correspond to WIN32_STREAM_ID
  * from winbase.h on Win32. We didn't inlcude cStreamName
@@ -98,11 +85,11 @@ struct BFILE {
    DWORD rw_bytes;                    /* Bytes read or written */
    DWORD lerror;                      /* Last error code */
    int berrno;                        /* errno */
-   char *prog;                        /* reader/writer program if any */
    JCR *jcr;                          /* jcr for editing job codes */
-   Python_IO pio;                     /* Python I/O routines */
    PROCESS_WIN32_BACKUPAPIBLOCK_CONTEXT win32DecompContext; /* context for decomposition of win32 backup streams */
    int use_backup_decomp;             /* set if using BackupRead Stream Decomposition */
+   bool reparse_point;                /* set if reparse point */ 
+   bool cmd_plugin;                   /* set if we have a command plugin */
 };
 
 HANDLE bget_handle(BFILE *bfd);
@@ -120,12 +107,13 @@ HANDLE bget_handle(BFILE *bfd);
 struct BFILE {
    int fid;                           /* file id on Unix */
    int m_flags;                       /* open flags */
-   int berrno;
-   char *prog;                        /* reader/writer program if any */
+   int berrno;                        /* errno */
+   int32_t lerror;                    /* not used - simplies Win32 builds */
    JCR *jcr;                          /* jcr for editing job codes */
-   Python_IO pio;                     /* Python I/O routines */
    PROCESS_WIN32_BACKUPAPIBLOCK_CONTEXT win32DecompContext; /* context for decomposition of win32 backup streams */
    int use_backup_decomp;             /* set if using BackupRead Stream Decomposition */
+   bool reparse_point;                /* not used in Unix */
+   bool cmd_plugin;                   /* set if we have a command plugin */
 };
 
 #endif
@@ -134,16 +122,14 @@ void    binit(BFILE *bfd);
 bool    is_bopen(BFILE *bfd);
 bool    set_win32_backup(BFILE *bfd);
 bool    set_portable_backup(BFILE *bfd);
-bool    set_prog(BFILE *bfd, char *prog, JCR *jcr);
+bool    set_cmd_plugin(BFILE *bfd, JCR *jcr);
 bool    have_win32_api();
 bool    is_portable_backup(BFILE *bfd);
 bool    is_restore_stream_supported(int stream);
 bool    is_win32_stream(int stream);
 char   *xberror(BFILE *bfd);          /* DO NOT USE  -- use berrno class */
 int     bopen(BFILE *bfd, const char *fname, int flags, mode_t mode);
-#ifdef HAVE_DARWIN_OS
 int     bopen_rsrc(BFILE *bfd, const char *fname, int flags, mode_t mode);
-#endif
 int     bclose(BFILE *bfd);
 ssize_t bread(BFILE *bfd, void *buf, size_t count);
 ssize_t bwrite(BFILE *bfd, void *buf, size_t count);