diff --git a/AUTHORS b/AUTHORS index ca569d11..91441c0d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,4 +41,5 @@ Lukas De Groen 2:280/1027@fidonet Vince Coen 2:257/609@fidonet Joachim Kuwan 2:249/591@fidonet Greek greek@voyager.nnov.ru +Sergey Nechaev 2:5015/53@fidonet diff --git a/ChangeLog b/ChangeLog index d7b9ea71..d6868e52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ v0.35.03 06-Jul-2002 Added setup for nodes connected via directories (we are the FTP server side). Added setup setting for outbound queue in global setup. + Added support for default setup of the HA archiver. script: The bbsdoor.sh and rundoor.sh scripts are now only installed diff --git a/configure b/configure index 992e71b0..5abbbb9c 100755 --- a/configure +++ b/configure @@ -7416,6 +7416,45 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "ha", so it can be a program name with args. +set dummy ha; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_HA+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $HA in + [\\/]* | ?:[\\/]*) + ac_cv_path_HA="$HA" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_HA="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +HA=$ac_cv_path_HA + +if test -n "$HA"; then + echo "$as_me:$LINENO: result: $HA" >&5 +echo "${ECHO_T}$HA" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + # Extract the first word of "antivir", so it can be a program name with args. set dummy antivir; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8475,6 +8514,7 @@ s,@RAR@,$RAR,;t t s,@UNRAR@,$UNRAR,;t t s,@UNZIP@,$UNZIP,;t t s,@ZOO@,$ZOO,;t t +s,@HA@,$HA,;t t s,@ANTIVIR@,$ANTIVIR,;t t s,@FPROT@,$FPROT,;t t s,@UVSCAN@,$UVSCAN,;t t diff --git a/configure.in b/configure.in index f50e1def..fe8209d2 100644 --- a/configure.in +++ b/configure.in @@ -168,6 +168,7 @@ AC_PATH_PROG(TAR,tar) AC_PATH_PROG(ZIP,zip) AC_PATH_PROG(UNZIP,unzip) AC_PATH_PROG(ZOO,zoo) +AC_PATH_PROG(HA,ha) AC_PATH_PROG(ANTIVIR,antivir) AC_PATH_PROG(FPROT,f-prot) AC_PATH_PROG(UVSCAN,uvscan) diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c index 7586d6bf..7a434b37 100644 --- a/mbsetup/m_archive.c +++ b/mbsetup/m_archive.c @@ -305,9 +305,31 @@ int CountArchive(void) } fwrite(&archiver, sizeof(archiver), 1, fil); + memset(&archiver, 0, sizeof(archiver)); + sprintf(archiver.comment, "HA Harri Hirvola"); + sprintf(archiver.name, "HA"); + if (strlen(_PATH_HA)) { + archiver.available = TRUE; + sprintf(archiver.farc, "%s a21rq", _PATH_HA); + sprintf(archiver.marc, "%s a21q", _PATH_HA); + sprintf(archiver.tarc, "%s t", _PATH_HA); + sprintf(archiver.funarc, "%s eyq", _PATH_HA); + sprintf(archiver.munarc, "%s eyq", _PATH_HA); + sprintf(archiver.iunarc, "%s eyq", _PATH_HA); + } else { + archiver.available = FALSE; + sprintf(archiver.farc, "/usr/bin/ha a21rq"); + sprintf(archiver.marc, "/usr/bin/ha a21q"); + sprintf(archiver.tarc, "/usr/bin/ha t"); + sprintf(archiver.funarc, "/usr/bin/ha eyq"); + sprintf(archiver.munarc, "/usr/bin/ha eyq"); + sprintf(archiver.iunarc, "/usr/bin/ha eyq"); + } + fwrite(&archiver, sizeof(archiver), 1, fil); + fclose(fil); chmod(ffile, 0640); - return 8; + return 11; } else return -1; } diff --git a/paths.h.in b/paths.h.in index b5c65cf0..69950b9d 100644 --- a/paths.h.in +++ b/paths.h.in @@ -19,6 +19,7 @@ #define _PATH_ZIP "@ZIP@" #define _PATH_UNZIP "@UNZIP@" #define _PATH_ZOO "@ZOO@" +#define _PATH_HA "@HA@"