projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.5.2p1
[debian/amanda]
/
client-src
/
sendbackup-gnutar.c
diff --git
a/client-src/sendbackup-gnutar.c
b/client-src/sendbackup-gnutar.c
index 0ef79374d6a6fa7b8b553fcb1d6448ac188f18d3..0aef9c707fc1f9ea98746dae0fddb211697dfc6d 100644
(file)
--- a/
client-src/sendbackup-gnutar.c
+++ b/
client-src/sendbackup-gnutar.c
@@
-24,7
+24,7
@@
* file named AUTHORS, in the root directory of this distribution.
*/
/*
* file named AUTHORS, in the root directory of this distribution.
*/
/*
- * $Id: sendbackup-gnutar.c,v 1.98
.2.1 2006/11/24 18:10:38
martinea Exp $
+ * $Id: sendbackup-gnutar.c,v 1.98
2006/07/25 18:35:21
martinea Exp $
*
* send backup data using GNU tar
*/
*
* send backup data using GNU tar
*/
@@
-36,7
+36,7
@@
#include "util.h"
#include "getfsent.h" /* for amname_to_dirname lookup */
#include "version.h"
#include "util.h"
#include "getfsent.h" /* for amname_to_dirname lookup */
#include "version.h"
-#include "c
lientconf
.h"
+#include "c
onffile
.h"
#ifdef SAMBA_CLIENT
#include "findpass.h"
#ifdef SAMBA_CLIENT
#include "findpass.h"
@@
-44,7
+44,7
@@
static amregex_t re_table[] = {
/* tar prints the size in bytes */
static amregex_t re_table[] = {
/* tar prints the size in bytes */
- AM_SIZE_RE("^ *Total bytes written: [0-9][0-9]*", 1),
+ AM_SIZE_RE("^ *Total bytes written: [0-9][0-9]*", 1
, 1
),
AM_NORMAL_RE("^Elapsed time:"),
AM_NORMAL_RE("^Throughput"),
AM_NORMAL_RE("^Elapsed time:"),
AM_NORMAL_RE("^Throughput"),
@@
-182,10
+182,10
@@
start_backup(
encpid = -1;
}
/* now do the client-side compression */
encpid = -1;
}
/* now do the client-side compression */
- if(options->compress == COMP
R_FAST || options->compress == COMPR
_BEST) {
+ if(options->compress == COMP
_FAST || options->compress == COMP
_BEST) {
compopt = skip_argument;
#if defined(COMPRESS_BEST_OPT) && defined(COMPRESS_FAST_OPT)
compopt = skip_argument;
#if defined(COMPRESS_BEST_OPT) && defined(COMPRESS_FAST_OPT)
- if(options->compress == COMP
R
_BEST) {
+ if(options->compress == COMP_BEST) {
compopt = COMPRESS_BEST_OPT;
} else {
compopt = COMPRESS_FAST_OPT;
compopt = COMPRESS_BEST_OPT;
} else {
compopt = COMPRESS_FAST_OPT;
@@
-200,7
+200,7
@@
start_backup(
dbprintf((" %s", compopt));
}
dbprintf(("\n"));
dbprintf((" %s", compopt));
}
dbprintf(("\n"));
- } else if (options->compress == COMP
R
_CUST) {
+ } else if (options->compress == COMP_CUST) {
compopt = skip_argument;
comppid = pipespawn(options->clntcompprog, STDIN_PIPE,
&dumpout, &compout, &mesgf,
compopt = skip_argument;
comppid = pipespawn(options->clntcompprog, STDIN_PIPE,
&dumpout, &compout, &mesgf,
@@
-216,7
+216,7
@@
start_backup(
comppid = -1;
}
comppid = -1;
}
- gnutar_list_dir =
client_getconf_str(CLN
_GNUTAR_LIST_DIR);
+ gnutar_list_dir =
getconf_str(CNF
_GNUTAR_LIST_DIR);
if (strlen(gnutar_list_dir) == 0)
gnutar_list_dir = NULL;
if (strlen(gnutar_list_dir) == 0)
gnutar_list_dir = NULL;
@@
-329,7
+329,7
@@
start_backup(
/* find previous dump time */
/* find previous dump time */
- amandates_file =
client_getconf_str(CLN
_AMANDATES);
+ amandates_file =
getconf_str(CNF
_AMANDATES);
if(!start_amandates(amandates_file, 0)) {
error("error [opening %s: %s]", amandates_file, strerror(errno));
/*NOTREACHED*/
if(!start_amandates(amandates_file, 0)) {
error("error [opening %s: %s]", amandates_file, strerror(errno));
/*NOTREACHED*/