Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / src / lib / bpipe.h

diff --git a/bacula/src/lib/bpipe.h b/bacula/src/lib/bpipe.h
index de9c98951f587ca38469444a20ec8fc4ee215304..4c69b56da6c24c9258ff3f762d7877b803a512c6 100644 (file)
--- a/bacula/src/lib/bpipe.h
+++ b/bacula/src/lib/bpipe.h
@@ -1,34 +1,42 @@
-/* 
- *   Bi-directional pipe structure
- *
- *   Version $Id$
- */
-
 /*
-   Copyright (C) 2002-2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
 
-   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.
+   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 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 along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   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.
+*/
+/*
+ *   Bi-directional pipe structure
+ *
+ *   Version $Id$
  */
 
-typedef struct s_bpipe {
+class BPIPE {
+public:
    pid_t worker_pid;
    time_t worker_stime;
    int wait;
    btimer_t *timer_id;
    FILE *rfd;
    FILE *wfd;
-} BPIPE;
+};