mirror of
https://git.freebsd.org/ports.git
synced 2025-07-07 04:19:17 -04:00
68 lines
2.3 KiB
Text
68 lines
2.3 KiB
Text
--- full_backup.c.orig Thu Aug 23 13:33:04 2001
|
|
+++ full_backup.c Thu Sep 13 18:45:24 2001
|
|
@@ -165,6 +165,7 @@
|
|
UChar *default_paramfiles[] = { DEFAULT_CLIENT_CONFIGFILES , NULL };
|
|
|
|
UChar *bindir = NULL;
|
|
+UChar *libexecdir = NULL;
|
|
UChar *vardir = NULL;
|
|
UChar *libdir = NULL;
|
|
UChar *confdir = NULL;
|
|
@@ -172,6 +173,7 @@
|
|
|
|
ReplSpec dir_pat_repl[] = {
|
|
{ "%B", NULL, &bindir },
|
|
+ { "%E", NULL, &libexecdir },
|
|
{ "%L", NULL, &libdir },
|
|
{ "%V", NULL, &vardir },
|
|
{ "%C", NULL, &confdir },
|
|
@@ -1384,12 +1386,13 @@
|
|
|
|
/* construct file- and dirnames */
|
|
bindir = strapp(backuphome, FN_DIRSEPSTR "bin");
|
|
+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexecdir");
|
|
vardir = strapp(backuphome, FN_DIRSEPSTR "var");
|
|
libdir = strapp(backuphome, FN_DIRSEPSTR "lib");
|
|
logdir = strdup(vardir);
|
|
confdir = strdup(libdir);
|
|
|
|
- if(!bindir || !vardir || !libdir || !logdir || !confdir)
|
|
+ if(!bindir || !vardir || !libdir || !logdir || !confdir || !libexecdir)
|
|
nomemerrexit();
|
|
|
|
if(!paramfile)
|
|
@@ -1400,6 +1403,7 @@
|
|
if(!backuphome){
|
|
/* construct file- and dirnames */
|
|
bindir = DEFBINDIR;
|
|
+ libexecdir = DEFLIBEXECDIR;
|
|
vardir = DEFVARDIR;
|
|
libdir = DEFLIBDIR;
|
|
logdir = DEFLOGDIR;
|
|
@@ -1420,13 +1424,14 @@
|
|
}
|
|
}
|
|
ZFREE(cptr);
|
|
+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexec/afbackup");
|
|
vardir = strapp(backuphome, FN_DIRSEPSTR "var");
|
|
libdir = strapp(backuphome, FN_DIRSEPSTR "lib");
|
|
logdir = strapp(backuphome, FN_DIRSEPSTR "var");
|
|
confdir = strapp(backuphome, FN_DIRSEPSTR "lib");
|
|
}
|
|
|
|
- if(!bindir || !vardir || !libdir || !logdir || !confdir)
|
|
+ if(!bindir || !vardir || !libdir || !logdir || !confdir || !libexecdir)
|
|
nomemerrexit();
|
|
|
|
if(!paramfile)
|
|
@@ -1498,8 +1503,8 @@
|
|
if(!dont_compress_str)
|
|
dont_compress_str = "";
|
|
num_dont_compress = str2wordsq(&dont_compress, dont_compress_str);
|
|
- piperprogram = strapp(bindir, FN_DIRSEPSTR "__piper");
|
|
- zprogram = strapp(bindir, FN_DIRSEPSTR "__z");
|
|
+ piperprogram = strapp(libexecdir, FN_DIRSEPSTR "__piper");
|
|
+ zprogram = strapp(libexecdir, FN_DIRSEPSTR "__z");
|
|
server_ids_file = strapp(vardir, FN_DIRSEPSTR "server_ids");
|
|
index_stale_file = strapp(vardir, FN_DIRSEPSTR "index_stale");
|
|
if(!paramfile || !partfile || !oldmarkfile || !orgoldmarkfile
|