From ea8908c28de06ee0d493ac43b201e4b0adc56c1b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 30 May 2005 17:07:40 +0000 Subject: [PATCH] - Fix bextract.c compile problem - Create bacula.man - Make make distclean clean a bit better git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2096 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/Makefile.in | 7 +- bacula/kes-1.37 | 4 ++ bacula/scripts/bacula.man | 124 +++++++++++++++++++++++++++++++++++ bacula/src/stored/bextract.c | 1 + bacula/src/stored/stored.h | 21 +++--- 5 files changed, 139 insertions(+), 18 deletions(-) create mode 100644 bacula/scripts/bacula.man diff --git a/bacula/Makefile.in b/bacula/Makefile.in index 6ca9e149c6..ccdec6f3c1 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -195,11 +195,8 @@ distclean: @$(RMF) bacula fd Makefile startmysql stopmysql startit stopit btraceback @$(RMF) bconsole gconsole @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum - @$(RMF) working/* -# @$(RMF) -r examples/devices/CVS autoconf/CVS autoconf/gnome-macros/CVS -# @$(RMF) -r examples/CVS intl/CVS scripts/CVS -# @$(RMF) -r po/CVS src/immortal/CVS rescue/freebsd/CVS rescue/solaris/CVS -# @$(RMF) -r CVS src/gnome-console/CVS src/tconsole/CVS + @$(RMF) working/* kerns-* + @$(RMF) -rf txt diff src/python src/testprogs devclean: @for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || exit 1); done diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index fc1711bad5..2a58368cb6 100644 --- a/bacula/kes-1.37 +++ b/bacula/kes-1.37 @@ -4,6 +4,10 @@ General: Changes to 1.37.20: +30May05 +- Fix bextract.c compile problem +- Create bacula.man +- Make make distclean clean a bit better 29May05 - Remove old code in jcr.c - Make testls release jcr chain when terminating. diff --git a/bacula/scripts/bacula.man b/bacula/scripts/bacula.man new file mode 100644 index 0000000000..518470d250 --- /dev/null +++ b/bacula/scripts/bacula.man @@ -0,0 +1,124 @@ +.\" manual page [] for Bacula +.\" SH section heading +.\" SS subsection heading +.\" LP paragraph +.\" IP indented paragraph +.\" TP hanging label +.TH Bacula 8 "The Network Backup Solution" +.SH NAME +Bacula \- The Network Backup Solution +.SH SYNOPSIS +.B bacula-dir \- Director +.br +.B bacula-fd \- File daemon or Client +.br +.B bacula-sd \- Storage daemon +.br +.B bconsole \- Console to control Bacula +.br +.B wx-console \- GUI Console +.br +.SH DESCRIPTION +.LP +Bacula is a set of computer programs that permits you (or the +system administrator) to manage backup, recovery, and +verification of computer data across a network of computers of +different kinds. In technical terms, it is a network +Client/Server based backup program. Bacula is relatively easy to +use and efficient, while offering many advanced storage +management features that make it easy to find and recover lost or +damaged files. Due to its modular design, Bacula is scalable +from small single computer systems to systems consisting of +hundreds of computers located over a large network. + +.LP +Bacula Director service consists of the program that supervises +all the backup, restore, verify and archive operations. The +system administrator uses the Bacula Director to schedule backups +and to recover files. For more details see the Director Services +Daemon Design Document in the Bacula Developer's Guild. The +Director runs as a daemon or a service (i.e. in the background). + +.LP +Bacula Console services is the program that allows the +administrator or user to communicate with the Bacula Director +(see above). Currently, the Bacula Console is available in three +versions. The first and simplest is to run the Console program +in a shell window (i.e. TTY interface). Most system +administrators will find this completely adequate. The second +version is a GNOME GUI interface that for the moment (23 November +2003) is far from complete, but quite functional as it has most +the capabilities of the shell Console. The third version is a +wxWidgets GUI with an interactive file restore. It also has most +of the capabilities of the shell console, allows command +completion with tabulation, and gives you instant help about the +command you are typing. + +.LP +Bacula File services (or Client program) is the software program +that is installed on the machine to be backed up. It is specific +to the operating system on which it runs and is responsible for +providing the file attributes and data when requested by the +Director. The File services are also responsible for the file +system dependent part of restoring the file attributes and data +during a recovery operation. For more details see the File +Services Daemon Design Document in the Bacula Developer's Guide. +This program runs as a daemon on the machine to be backed up, and +in some of the documentation, the File daemon is referred to as +the Client (for example in Bacula's configuration file). In +addition to Unix/Linux File daemons, there is a Windows File +daemon (normally distributed in binary format). The Windows File +daemon runs on all currently known Windows versions (95, 98, Me, +NT, 2000, XP). + +.LP +Bacula Storage services consist of the software programs that +perform the storage and recovery of the file attributes and data +to the physical backup media or volumes. In other words, the +Storage daemon is responsible for reading and writing your tapes +(or other storage media, e.g. files). For more details see the +Storage Services Daemon Design Document in the Bacula Developer's +Guild. The Storage services runs as a daemon on the machine that +has the backup device (usually a tape drive). + +.LP +Catalog services are comprised of the software programs +responsible for maintaining the file indexes and volume databases +for all files backed up. The Catalog services permit the System +Administrator or user to quickly locate and restore any desired +file. The Catalog services sets Bacula apart from simple backup +programs like tar and bru, because the catalog maintains a record +of all Volumes used, all Jobs run, and all Files saved, +permitting efficicient restoration and Volume management. Bacula +currently supports three different databases, MySQL, PostgreSQL, +and SQLite, one of which must be chosen when building Bacula. + +.SH OPTIONS +See the HTML/PDF documentation for details of the command line options. + +.SH CONFIGURATION +Each daemon has its own configuration file which must be +tailored for each particular installation. Please see the HTML/PDF +documentation for the details. + +.SH SEE ALSO +The HTML manual installed on your system (typically found in +.br +/usr/share/doc/bacula-) or the online manual at: +.br + + +.SH BUGS +See + +.SH AUTHOR +Kern Sibbald +.SS Current maintainer +Kern Sibbald +.SS Contributors +An enormous list of past and former persons who have devoted +their time and energy to this project -- thanks. + +.SH COPYRIGHT +Bacula is distributed under a modified GPL version 2.0, as described in the +file LICENSE included with the source distribution. diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index b06a8dfb62..1896397065 100644 --- a/bacula/src/stored/bextract.c +++ b/bacula/src/stored/bextract.c @@ -22,6 +22,7 @@ */ +#include "bacula.h" #include "stored.h" #include "findlib/find.h" diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h index e9859f9250..10816451d4 100644 --- a/bacula/src/stored/stored.h +++ b/bacula/src/stored/stored.h @@ -7,19 +7,14 @@ Copyright (C) 2000-2005 Kern Sibbald 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. + modify it under the terms of the GNU General Public License + version 2 as ammended with additional clauses defined in the + file LICENSE in the main source directory. 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -47,7 +42,7 @@ #include "jcr.h" #include "protos.h" #ifdef HAVE_LIBZ -#include /* compression headers */ +#include /* compression headers */ #else #define uLongf uint32_t #endif @@ -66,9 +61,9 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result); /* Daemon globals from stored.c */ extern STORES *me; /* "Global" daemon resource */ -extern bool forge_on; /* proceed inspite of I/O errors */ +extern bool forge_on; /* proceed inspite of I/O errors */ extern pthread_mutex_t device_release_mutex; -extern pthread_cond_t wait_device_release; /* wait for any device to be released */ +extern pthread_cond_t wait_device_release; /* wait for any device to be released */ #ifdef debug_tracing extern int _rewind_dev(char *file, int line, DEVICE *dev); -- 2.39.5