Only in ./qico: .cirrus.yml
Only in ./qico: .git
Only in ./qico: .gitignore
Only in ./trunk: .svn
Only in ./qico: .travis.yml
Only in ./qico: CMakeLists.txt
diff -burw ./qico/ChangeLog ./trunk/ChangeLog
--- ./qico/ChangeLog	2024-02-01 18:09:52.525652000 +0300
+++ ./trunk/ChangeLog	2024-02-01 18:10:34.661102000 +0300
@@ -1,478 +1,612 @@
-2015-05-14 14:48  jame
+2007-08-06 00:56  mitry
 
-    * Update copyright years for Robert James Clay in LICENSE.
+	* src/: daemon.c (1.21), globals.c (1.12), globals.h (1.8), log.c
+	  (1.11):
 
-2015-05-13 14:17  jame
+	Fix logging to syslog.
 
-    * Correct ';' to ':' in the src/outbound.c file on line 782.
+2007-03-20 01:58  mitry
 
-    Closes https://sourceforge.net/p/qico/feature-requests/8/.
+	* src/binkp.c (1.26):
 
-2015-05-13 12:57  jame
+	[no log message]
 
-    * Rename configure.in as configure.ac in 'Makefile.in' file in sub-directories.
+2007-03-20 01:44  mitry
 
-    Closes https://sourceforge.net/p/qico/bugs/18/.
+	* configure.in (1.29):
 
-2014-11-26 06:25  jame
+	Changed config header parameter
 
-    * Rename configure.in as configure.ac
+2007-03-20 01:43  mitry
 
-    Closes https://sourceforge.net/p/qico/bugs/18/.
+	* autogen.sh (1.8):
 
-2014-11-26 05:12  jame
+	Add autoupdate call
 
-    * src/outbound.c
+2007-03-20 01:41  mitry
 
-    Add case for ' ' in floflist() in file src/outbound.c.
-    Reference also https://sourceforge.net/p/qico/feature-requests/8/
-    Thanks to Markus Reschke, 2:240/1661.
+	* src/daemon.c (1.20):
 
-2014-04-24 07:06  jame
+	Fixed longrescan
 
-    * LICENSE:
+2007-03-20 01:39  mitry
 
-    Update/correct copyright information in the LICENSE file.
+	* src/binkp.c (1.25):
 
-2014-04-24 06:22  jame
+	ND mode should be implemented
 
-    * README, README.ru;
+2007-03-20 01:11  mitry
 
-    Russian version as README.ru.  Initial English version of README.
+	* src/nodelist.c (1.23):
 
-2014-04-24 03:30  jame
+	Fix core dump after internet flags implementation
 
-    * src/tcp.c:
+2007-03-16 01:06  mitry
 
-    Correct display of port number such as "TCP/IP connection with
-    78.80.60.233:-1077956934" instead of "TCP/IP connection with
-    78.80.60.233:60179". (https://sourceforge.net/p/qico/bugs/16/)
-    Thanks to Victor Cizek, 2:421/79@fidonet, RC42.
+	* configure.in (1.28):
 
-2013-05-27 12:34  jame
+	Fixed typo error
 
-    * README:
+2007-03-14 02:04  mitry
 
-    Removed the no longer valid reference to the XE CVS repository in README.
+	* autogen.sh (1.7):
 
-2013-02-23 09:24  jame
+	Add support for autoconf version 2.60 and 2.61
+	Add support for automake version 1.10
 
-    * stuff/test.pl, configure, configure.in:
+2007-03-07 03:02  mitry
 
-    Change 'qicosi' or 'qicoxe' references in the current documentation and
-    code to be to just "qico".
+	* qico.conf.sample (1.15):
 
-2013-01-13 16:03  jame
+	[no log message]
 
-    * debian/:
+2007-03-07 03:01  mitry
 
-    The debian directory and its contents are separately vesioned, so removing
-    from the mainline branch and moving it to its own separate branch.
+	* src/nodelist.c (1.22):
 
-    * LICENSE, man/gcc.8, man/qctl.8, man/qico.8:
+	Check that IBN/IFC flags contain port if specified (not host)
+	Add support for IP-only nodes phone style via phonetr
 
-    Detail Copyright related for Robert James Clay <jame@rocasa.us>.
+2007-01-28 19:55  mitry
 
-    * man/gcc.8, man/qctl.8, man/qico.8:
+	* src/: daemon.c (1.19), ftn.c (1.14), ftn.h (1.13), nodelist.c
+	  (1.21), tcp.c (1.15):
 
-    Update the support information in the man pages.
+	Add support for INA flag and IBN/IFC optional port number.
 
-    * README, freebsd/Makefile, freebsd/pkg-descr, qico.spec, qico.spec.in,
-      qico.conf.sample:
+2006-07-22 16:13  mitry
 
-    Updates for next release.
+	* src/: globals.c (1.11), globals.h (1.7), protfm.c (1.19),
+	  session.c (1.28):
 
-2013-01-12 22:12  jame
+	Use file times in GMT on some protocols.
 
-	* debian/rules:
+2006-07-19 01:30  mitry
 
-	Update/correct distclean command in debian/rules.
+	* src/qcc.c (1.17):
 
-2013-01-12 00:58  jame
+	Delayed cyrillization
 
-	* debian/control, debian/compat:
+2006-07-19 01:22  mitry
 
-	Update debhelper Build-Depends and compatibility to 5.
+	* src/clserv.c (1.7):
 
-2013-01-11 23:54  jame
+	Make qico daemon to start on FreeBSD 4.6.2 :)
 
-	* src/main.c, src/tcp.c, src/tcp.h:
+2006-07-10 19:16  mitry
 
-	Apply patch file qico-0.57.1xe-ipv6.patch.
+	* src/: binkp.c (1.24), binkp.h (1.8), session.c (1.27):
 
+	Binkp: prevent infinite calling system if some files were suspended
+
+2006-04-24 18:04  mitry
+
+	* src/tty.c (1.28):
+
+	Fixed typo error.
+
+2006-04-14 21:55  mitry
+
+	* src/binkp.c (1.23):
+
+	Drop session if secure aka is busy.
+
+2006-04-14 21:51  mitry
+
+	* src/outbound.c (1.22):
+
+	Changed a bit node (un)lock logic.
+
+2006-04-14 21:49  mitry
+
+	* src/: slists.c (1.4), slists.h (1.4):
+
+	Changed return types.
+
+2006-04-14 21:45  mitry
+
+	* src/: ftn.c (1.13), ftn.h (1.12):
+
+	Added locked flag.
+
+2006-03-31 22:41  mitry
+
+	* src/tools.c (1.13):
+
+	Don't ignore return value of unlink()
+
+2006-03-31 22:38  mitry
+
+	* src/modem.c (1.19):
+
+	Fixed typo error
+
+2006-03-11 05:17  mitry
+
+	* qico.passwd.sample (1.3):
+
+	Removed ^M at the end of lines.
+
+2006-03-11 05:07  mitry
+
+	* src/: md5q.c (1.2), md5q.h (1.2), types.h (1.9):
+
+	Fixed internal md5 stuff if size of long is 8 bytes.
+
+2006-03-11 03:59  mitry
+
+	* configure.in (1.27):
+
+	Added option to disable system-wide RSA Data Security library libmd (FreeBSD).
+
+2006-03-09 15:01  mitry
+
+	* src/Makefile.am (1.13):
+
+	Fix qcc linking under current AltLinux.
+
+2005-12-31 17:27  mitry
+
+	* src/flaglex.l (1.6):
+
+	Fixed date evaluation
+
+2005-12-03 04:44  mitry
+
+	* src/binkp.c (1.22):
+
+	Fixed session timeout between two qicos
+
+2005-12-03 04:25  mitry
+
+	* src/tcp.c (1.14):
+
+	Fixed socks5 authentication
+
+2005-11-28 08:55  mitry
+
+	* src/main.c (1.25):
+
+	Fixed tty name detection if /dev/ttySX is linked to /dev/tts/X
+
+2005-11-27 03:41  mitry
+
+	* src/ftn.c (1.12):
+
+	Recode From and To fields to local charset in showpkt().
+
+2005-11-27 03:32  mitry
+
+	* src/hydra.c (1.31):
+
+	Fixed hydra_send() if file to be sent is disappeared.
+
+2005-10-31 19:21  mitry
+
+	* src/ftn.c (1.11):
+
+	Fixed showpkt which didn't handle national characters in `to' and `from' pkt fields.
+
+2005-09-06 23:42  mitry
+
+	* src/: binkp.c (1.21), hydra.c (1.30), janus.c (1.8), session.c
+	  (1.26):
+
+	Added macros to qpreset() calls
+
+2005-09-06 22:46  mitry
+
+	* src/defs.h (1.6):
+
+	Added some defines
+
+2005-08-24 16:31  mitry
+
+	* qico.conf.sample (1.14):
+
+	Added T loglevel description
+
 2005-08-23 19:51  mitry
 
-	* src/config.c:
+	* src/config.c (1.10):
 
 	Stop running if can't reread config
 
 2005-08-23 19:50  mitry
 
-	* src/log.c:
+	* src/log.c (1.10):
 
 	Handle NULL-able logfile
 
 2005-08-23 19:23  mitry
 
-	* src/types.h:
+	* src/types.h (1.8):
 
 	Fixed compilation if true/false were defined elsewhere
 
 2005-08-23 19:21  mitry
 
-	* debian/: README.Debian, copyright, qico-common.dirs,
-	  qico-common.docs, qico-common.init, qico-common.install,
-	  qico-common.postrm:
+	* debian/: README.Debian (1.2), copyright (1.3), qico-common.dirs
+	  (1.2), qico-common.docs (1.2), qico-common.init (1.2),
+	  qico-common.install (1.2), qico-common.postrm (1.2):
 
 	Updated debian scripts
 
 2005-08-23 15:46  tren
 
-	* debian/changelog:
+	* debian/changelog (1.4):
 
 	fixed postinst
 
 2005-08-23 15:43  tren
 
-	* debian/qico-common.postinst:
+	* debian/qico-common.postinst (1.2):
 
 	fixed postinst
 
 2005-08-23 14:21  mitry
 
-	* Changes, README:
+	* Changes (1.26), README (1.7):
 
 	0.57.1 released
 
 2005-08-23 14:18  mitry
 
-	* Makefile.am:
+	* Makefile.am (1.6):
 
 	Updated debian/ file list
 
 2005-08-23 14:09  mitry
 
-	* debian/control:
+	* debian/control (1.4):
 
 	Updated conftrol file
 
 2005-08-23 13:53  tren
 
-	* debian/: rules, qcc.8, qctl.8, qico.8:
+	* debian/: rules (1.4), qcc.8 (1.4), qctl.8 (1.4), qico.8 (1.6):
 
 	Updated debian package build script
 
 2005-08-23 13:47  tren
 
-	* debian/: changelog, conffiles, control, copyright, dirs,
-	  examples, inetd.conf, init.d, qcc.files, qctl.files, rules,
-	  README.Debian, compat, qico-common.dirs, qico-common.docs,
-	  qico-common.init, qico-common.install, qico-common.postinst,
-	  qico-common.postrm, qico-qcc.dirs, qico-qcc.install, qico.dirs,
-	  qico.install, qcc.8, qctl.8, qico.8:
+	* debian/: changelog (1.3), conffiles (1.3), control (1.3),
+	  copyright (1.2), dirs (1.2), examples (1.2), inetd.conf (1.2),
+	  init.d (1.2), qcc.files (1.2), qctl.files (1.2), rules (1.3),
+	  README.Debian (1.1), compat (1.1), qico-common.dirs (1.1),
+	  qico-common.docs (1.1), qico-common.init (1.1),
+	  qico-common.install (1.1), qico-common.postinst (1.1),
+	  qico-common.postrm (1.1), qico-qcc.dirs (1.1), qico-qcc.install
+	  (1.1), qico.dirs (1.1), qico.install (1.1), qcc.8 (1.3), qctl.8
+	  (1.3), qico.8 (1.5):
 
 	Updated debian package build script
 
 2005-08-23 13:15  mitry
 
-	* Makefile.am, configure.in, debian/Makefile.am:
+	* Makefile.am (1.5), configure.in (1.26), debian/Makefile.am (1.3):
 
 	Preparing for debianization
 
 2005-08-22 22:41  mitry
 
-	* Changes, src/nodelist.c:
+	* Changes (1.25), src/nodelist.c (1.20):
 
 	Fixed detection of stale index
 
 2005-08-22 20:21  mitry
 
-	* configure.in, src/Makefile.am:
+	* configure.in (1.25), src/Makefile.am (1.12):
 
 	Change logic to include or don't of binkp and/or perl support accoirding to configure options.
 
 2005-08-22 20:19  mitry
 
-	* src/: binkp.c, binkp.h:
+	* src/: binkp.c (1.20), binkp.h (1.7):
 
 	Changed names of functions to more proper form
 
 2005-08-22 20:16  mitry
 
-	* src/: protfm.c, perl.c:
+	* src/: protfm.c (1.18), perl.c (1.8):
 
 	Removed useless static function
 
 2005-08-22 20:12  mitry
 
-	* src/clserv.c:
+	* src/clserv.c (1.6):
 
 	Close socket fd if didn't make connection
 
 2005-08-22 15:51  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.19):
 
 	Fixed syntax error
 
 2005-08-21 10:38  mitry
 
-	* configure.in:
+	* configure.in (1.24):
 
 	Fixed the whole file
 
 2005-08-21 09:11  mitry
 
-	* configure.in:
+	* configure.in (1.23):
 
 	Fixed lost binkp
 
 2005-08-21 07:16  mitry
 
-	* Makefile.am, README, autogen.sh, configure.in, qico.spec,
-	  man/Makefile.am:
+	* Makefile.am (1.4), README (1.6), autogen.sh (1.6), configure.in
+	  (1.22), qico.spec (1.4), man/Makefile.am (1.1):
 
 	Updated to 0.57.1
 
 2005-08-21 07:14  mitry
 
-	* stuff/Makefile.am:
+	* stuff/Makefile.am (1.2):
 
 	Removed freebsd stuff
 
 2005-08-21 07:13  mitry
 
-	* debian/: Makefile.am, changelog, conffiles, control:
+	* debian/: Makefile.am (1.2), changelog (1.2), conffiles (1.2),
+	  control (1.2):
 
 	Updated to 0.57.1
 
 2005-08-21 06:51  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.18):
 
 	Fixed stupid error
 
 2005-08-21 04:28  mitry
 
-	* qico.conf.sample:
+	* qico.conf.sample (1.13):
 
 	Splitted into 3 files
 
 2005-08-21 04:27  mitry
 
-	* qico.passwd.sample, qico.substs.sample:
+	* qico.passwd.sample (1.2), qico.substs.sample (1.2):
 
 	Extracted from qico.conf.sample
 
 2005-08-21 04:21  mitry
 
-	* man/: qcc.8, qctl.8, qico.8:
+	* man/: qcc.8 (1.4), qctl.8 (1.4), qico.8 (1.4):
 
 	Updated
 
 2005-08-21 04:17  mitry
 
-	* man/: qcc.8, qctl.8, qico.8:
+	* man/: qcc.8 (1.1), qctl.8 (1.1), qico.8 (1.1):
 
 	Moved from debian/
 
 2005-08-21 04:15  mitry
 
-	* debian/: qcc.8, qctl.8, qico.8, rules:
+	* debian/: qcc.8 (1.2), qctl.8 (1.2), qico.8 (1.4), rules (1.2):
 
 	Man files moved to root/man directory
 
 2005-08-21 04:11  mitry
 
-	* src/: binkp.c, binkp.h:
+	* src/: binkp.c (1.17), binkp.h (1.6):
 
 	Added more explanations for session errors (I hope)
 
 2005-08-21 04:08  mitry
 
-	* freebsd/: Makefile, pkg-descr, pkg-install, pkg-plist:
+	* freebsd/: Makefile (1.3), pkg-descr (1.3), pkg-install (1.3),
+	  pkg-plist (1.3):
 
 	Moved from stuff/ directory
 
 2005-08-19 16:37  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.19):
 
 	Fixed wrong detection of '-' sign
 
 2005-08-18 22:50  mitry
 
-	* Changes:
+	* Changes (1.24):
 
 	Updated
 
 2005-08-18 22:45  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.18):
 
 	Fixed 'unknown subst flag' on valid subst statement
 
 2005-08-18 22:06  mitry
 
-	* Changes:
+	* Changes (1.23):
 
 	Updated
 
 2005-08-18 21:19  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.17):
 
 	Fixed Txy flag handling
 
 2005-08-18 19:21  mitry
 
-	* src/: ftn.c, nodelist.c:
+	* src/: ftn.c (1.10), nodelist.c (1.16):
 
 	Added debug messages
 
 2005-08-18 19:11  mitry
 
-	* src/queue.c:
+	* src/queue.c (1.12):
 
 	Extended debug message
 
 2005-08-17 23:44  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.15):
 
 	Modified checktimegaps()
 
 2005-08-16 23:23  mitry
 
-	* Changes, src/call.c, src/tty.c:
+	* Changes (1.22), src/call.c (1.10), src/tty.c (1.27):
 
 	Pre 0.57.1: minor changes
 
 2005-08-16 22:15  mitry
 
-	* Changes, qico.conf.sample, src/Makefile.am, src/qconf.x:
+	* Changes (1.21), qico.conf.sample (1.12), src/Makefile.am (1.11),
+	  src/qconf.x (1.11):
 
 	Pre 0.57.1
 
 2005-08-16 20:11  mitry
 
-	* src/qconf.x:
+	* src/qconf.x (1.10):
 
 	Fixed needalllisted keyword broken in 0.56.2
 
 2005-08-16 18:54  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.14):
 
 	Added lost '{'
 
 2005-08-16 18:44  mitry
 
-	* README:
+	* README (1.5):
 
 	Changed cvs address
 
 2005-08-16 18:17  mitry
 
-	* src/: ftn.h, nodelist.c, perl.c:
+	* src/: ftn.h (1.11), nodelist.c (1.13), perl.c (1.7):
 
 	Removed unused ninfo_t.haswtime field
 
 2005-08-16 17:49  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.17):
 
 	Replaced strncpy() with xstrcpy()
 
 2005-08-16 17:46  mitry
 
-	* src/daemon.c:
+	* src/daemon.c (1.18):
 
 	Changed DEBUG message
 
 2005-08-16 13:36  mitry
 
-	* src/qctl.c:
+	* src/qctl.c (1.12):
 
 	Removed unused print_worktime()
 
 2005-08-16 13:32  mitry
 
-	* src/: modem.c, tcp.c, tty.c:
+	* src/: modem.c (1.18), tcp.c (1.13), tty.c (1.26):
 
 	Fixed broken calls of loginscript
 
 2005-08-12 19:40  mitry
 
-	* src/: qcc.c, qctl.c, qslib.c, qslib.h:
+	* src/: qcc.c (1.16), qctl.c (1.11), qslib.c (1.12), qslib.h
+	  (1.14):
 
 	Added wktime_str()
 
 2005-08-12 19:39  mitry
 
-	* configure.in:
+	* configure.in (1.21):
 
 	Removed check for tm_gmtoff
 
 2005-08-12 18:36  mitry
 
-	* src/: binkp.c, emsi.c, nodelist.c, protfm.c, qcc.c, qctl.c,
-	  qslib.c, qslib.h:
+	* src/: binkp.c (1.16), emsi.c (1.24), nodelist.c (1.12), protfm.c
+	  (1.16), qcc.c (1.15), qctl.c (1.10), qslib.c (1.11), qslib.h
+	  (1.13):
 
 	Changed gmtoff()
 
 2005-08-11 22:20  mitry
 
-	* Changes, configure.in:
+	* Changes (1.20), configure.in (1.20):
 
 	0.57.1 started
 
 2005-08-11 22:15  mitry
 
-	* src/: config.c, main.c:
+	* src/: config.c (1.9), main.c (1.24):
 
 	Changed code a bit
 
 2005-08-11 22:14  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.11):
 
 	Added new macro MAILHOURS
 
 2005-08-11 22:13  mitry
 
-	* src/daemon.c:
+	* src/daemon.c (1.17):
 
 	Added new macro MAILHOURS.
 	Fixed core creation if got SIGTERM.
 
 2005-08-11 22:06  mitry
 
-	* src/: nodelist.h, session.c:
+	* src/: nodelist.h (1.4), session.c (1.25):
 
 	Added new macro MAILHOURS
 
 2005-08-10 22:45  mitry
 
-	* src/: outbound.c, tools.c, tools.h:
+	* src/: outbound.c (1.21), tools.c (1.12), tools.h (1.12):
 
 	Added param to qscandir() to return full path with file name
 
 2005-08-10 22:19  mitry
 
-	* src/ftn.c:
+	* src/ftn.c (1.9):
 
 	Changed strncasecmp() to strcasecmp() in whattype()
 
 2005-08-10 22:12  mitry
 
-	* src/daemon.c:
+	* src/daemon.c (1.16):
 
 	Added 'Connecting to' title on ip calls
 
 2005-08-10 21:24  mitry
 
-	* src/session.c:
+	* src/session.c (1.24):
 
 	Skip checking for mail hours on binkp session.
 	Removed commented out code.
@@ -480,57 +614,58 @@
 
 2005-08-10 19:15  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.15):
 
 	Changed time parsing logic on binkp session
 
 2005-08-03 14:34  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.14):
 
 	Changed timeout handling
 
 2005-06-13 21:30  mitry
 
-	* README:
+	* README (1.4):
 
 	Updated
 
 2005-06-13 21:19  mitry
 
-	* Changes, FAQ, qico.conf.sample, qico.spec:
+	* Changes (1.19), FAQ (1.3), qico.conf.sample (1.11), qico.spec
+	  (1.3):
 
 	Updated
 
 2005-06-13 20:51  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.23):
 
 	Speed up EMSI send with Argus clones.
 	Added emsi_log()
 
 2005-06-10 23:57  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.25):
 
 	Changed tty_bufblock()
 
 2005-06-10 23:56  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.29):
 
 	Changed exit from hydra_send()
 
 2005-06-10 23:54  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.22):
 
 	Added check for unexpected EMSI_DAT packet in emsi_send().
 	Stop showing 'intro:' after receiving second EMSI_REQ in emsi_init().
 
 2005-06-10 23:49  mitry
 
-	* src/queue.c:
+	* src/queue.c (1.11):
 
 	Updated q_each() to make qico to call a node if we have
 	empty FLOw file(s) or netmail packet(s) with callable
@@ -538,792 +673,811 @@
 
 2005-06-03 18:45  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.21):
 
 	Added check for expired timer in emsi_send()
 
 2005-06-03 17:13  mitry
 
-	* src/timer.h:
+	* src/timer.h (1.4):
 
 	Changed timer_expired()
 
 2005-06-03 17:12  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.20):
 
 	Misc changes in EMSI stages
 
 2005-06-03 17:08  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.17):
 
 	Added DCD check after hangup and modem_clean_line() before any input waiting
 
 2005-05-31 20:22  mitry
 
-	* src/: binkp.c, binkp.h:
+	* src/: binkp.c (1.13), binkp.h (1.5):
 
 	Added support for incoming FREQ on binkp/1.0
 
 2005-05-24 21:45  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.12):
 
 	Do not use crypt if got M_OK non-secure
 
 2005-05-17 23:01  mitry
 
-	* src/basename.c:
+	* src/basename.c (1.2):
 
 	Remove basename() replace
 
 2005-05-17 22:52  mitry
 
-	* configure.in, src/daemon.c, src/qcc.c:
+	* configure.in (1.19), src/daemon.c (1.15), src/qcc.c (1.14):
 
 	Added check for broken Sys5 signals
 
 2005-05-17 22:51  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.24):
 
 	Code cleaning
 
 2005-05-17 22:49  mitry
 
-	* src/main.c:
+	* src/main.c (1.23):
 
 	Included modem.h
 
 2005-05-17 22:49  mitry
 
-	* src/log.c:
+	* src/log.c (1.9):
 
 	Fixed strftime() arg broken by previous patch
 
 2005-05-17 21:17  mitry
 
-	* src/: binkp.c, freq.c, log.c, main.c, nodelist.c, outbound.c,
-	  protfm.c, replace.h, tools.c, tools.h, tty.c:
+	* src/: binkp.c (1.11), freq.c (1.7), log.c (1.8), main.c (1.22),
+	  nodelist.c (1.10), outbound.c (1.20), protfm.c (1.15), replace.h
+	  (1.5), tools.c (1.11), tools.h (1.11), tty.c (1.23):
 
 	Removed system basename() usage.
 	Added qbasename() implementation.
 
 2005-05-17 02:35  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.16):
 
 	Fixed doubled BUSY response
 
 2005-05-16 23:34  mitry
 
-	* Changes, configure.in, qico.conf.sample:
+	* Changes (1.18), configure.in (1.18), qico.conf.sample (1.10):
 
 	Snapshot
 
 2005-05-16 23:33  mitry
 
-	* src/: Makefile.am, defs.h, modem.h, nodelist.c, nodelist.h,
-	  outbound.c, tty.c, tty.h:
+	* src/: Makefile.am (1.10), defs.h (1.5), modem.h (1.1), nodelist.c
+	  (1.9), nodelist.h (1.3), outbound.c (1.19), tty.c (1.22), tty.h
+	  (1.16):
 
 	Code cleaning
 
 2005-05-16 23:33  mitry
 
-	* src/headers.h:
+	* src/headers.h (1.7):
 
 	Added more proper MAX_PATH define
 
 2005-05-16 23:31  mitry
 
-	* src/: ls_zmodem.c, main.c, hydra.c, protfm.c, session.c:
+	* src/: ls_zmodem.c (1.6), main.c (1.21), hydra.c (1.28), protfm.c
+	  (1.14), session.c (1.23):
 
 	Changed code a bit
 
 2005-05-16 23:28  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.19):
 
 	Changed EMSI stages
 
 2005-05-16 23:27  mitry
 
-	* src/: call.c, modem.c:
+	* src/: call.c (1.9), modem.c (1.15):
 
 	Changed code a bit
 
 2005-05-16 23:26  mitry
 
-	* src/qctl.c:
+	* src/qctl.c (1.9):
 
 	Added more proper MAX_PATH define
 
 2005-05-16 23:25  mitry
 
-	* src/qcc.c:
+	* src/qcc.c (1.13):
 
 	Fixed improper speed over 64K displaying
 
 2005-05-16 17:40  mitry
 
-	* src/tools.c:
+	* src/tools.c (1.10):
 
 	Added check for NULL fname in lunlink()
 
 2005-05-16 16:13  mitry
 
-	* src/: binkp.c, binkp.h:
+	* src/: binkp.c (1.10), binkp.h (1.4):
 
 	Added more rubust message handling
 
 2005-05-16 14:17  mitry
 
-	* src/: clserv.c, clserv.h, config.c, daemon.c, ftn.c, ftn.h,
-	  log.c, mailer.h, perl.c, qipc.c, qipc.h, queue.c, slists.c,
-	  slists.h, hydra.h, qslib.c, qslib.h, tools.c, tools.h:
+	* src/: clserv.c (1.5), clserv.h (1.3), config.c (1.8), daemon.c
+	  (1.14), ftn.c (1.8), ftn.h (1.10), log.c (1.7), mailer.h (1.12),
+	  perl.c (1.6), qipc.c (1.4), qipc.h (1.3), queue.c (1.10),
+	  slists.c (1.3), slists.h (1.3), hydra.h (1.12), qslib.c (1.10),
+	  qslib.h (1.12), tools.c (1.9), tools.h (1.10):
 
 	Updated function prototypes. Changed code a bit.
 
 2005-05-12 12:55  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.8):
 
 	Fixed nodelist compiling
 
 2005-05-11 23:26  mitry
 
-	* src/qslib.h:
+	* src/qslib.h (1.11):
 
 	Cosmetic change
 
 2005-05-11 23:18  mitry
 
-	* src/ftn.c:
+	* src/ftn.c (1.7):
 
 	Cosmetic change
 
 2005-05-11 23:17  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.18):
 
 	Changed int var; to size_t var; for strlen()
 
 2005-05-11 21:11  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.7):
 
 	Changed code with xrealloc()
 
 2005-05-11 21:08  mitry
 
-	* src/: qslib.c, qslib.h:
+	* src/: qslib.c (1.9), qslib.h (1.10):
 
 	Changed xrealloc() code
 
 2005-05-11 19:44  mitry
 
-	* src/queue.c:
+	* src/queue.c (1.9):
 
 	Changed a bit a call of outbound_rescan()
 
 2005-05-11 19:43  mitry
 
-	* src/daemon.c:
+	* src/daemon.c (1.13):
 
 	Changed a bit a call of q_rescan()
 
 2005-05-11 19:37  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.17):
 
 	Set initial values to static variables explicitly
 
 2005-05-11 19:35  mitry
 
-	* src/nodelist.c:
+	* src/nodelist.c (1.6):
 
 	Changed return code of ndl_read_entry()
 
 2005-05-11 19:34  mitry
 
-	* src/ftn.h:
+	* src/ftn.h (1.9):
 
 	Removed commented out typedefs
 
 2005-05-11 16:23  mitry
 
-	* configure.in:
+	* configure.in (1.17):
 
 	[no log message]
 
 2005-05-11 16:22  mitry
 
-	* src/: config.c, daemon.c, flaglex.l, freq.c, ftn.h, modem.c,
-	  nodelist.c, nodelist.h:
+	* src/: config.c (1.7), daemon.c (1.12), flaglex.l (1.5), freq.c
+	  (1.6), ftn.h (1.8), modem.c (1.14), nodelist.c (1.5), nodelist.h
+	  (1.2):
 
 	Snapshot
 
 2005-05-06 23:54  mitry
 
-	* Makefile.am, autogen.sh, configure.in, src/Makefile.am,
-	  src/qnlc.c, src/usleep.c:
+	* Makefile.am (1.3), autogen.sh (1.5), configure.in (1.16),
+	  src/Makefile.am (1.9), src/qnlc.c (1.5), src/usleep.c (1.2):
 
 	Snapshot
 
 2005-05-06 23:53  mitry
 
-	* src/: hydra.c, log.c, modem.c, qctl.c, replace.h, slists.h,
-	  tty.c, tty.h, types.h:
+	* src/: hydra.c (1.27), log.c (1.6), modem.c (1.13), qctl.c (1.8),
+	  replace.h (1.4), slists.h (1.2), tty.c (1.21), tty.h (1.15),
+	  types.h (1.7):
 
 	Changed misc code
 
 2005-05-06 23:47  mitry
 
-	* src/: tcp.c, tcp.h, tools.c, tools.h:
+	* src/: tcp.c (1.12), tcp.h (1.2), tools.c (1.8), tools.h (1.9):
 
 	Misc code cleanup
 
 2005-05-06 23:46  mitry
 
-	* src/: qcconst.h, queue.c:
+	* src/: qcconst.h (1.6), queue.c (1.8):
 
 	Empty FLOw file in outbound now can make a qico to poll node during mail hours.
 	Misc code cleanup.
 
 2005-05-06 23:41  mitry
 
-	* src/: qcc.c, qslib.c, qslib.h, qipc.c:
+	* src/: qcc.c (1.12), qslib.c (1.8), qslib.h (1.9), qipc.c (1.3):
 
 	Changed setproctitle() code
 
 2005-05-06 23:37  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.13):
 
 	Fixed dangerous syntax BUG :)
 
 2005-05-06 23:36  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.16):
 
 	Major rewrite again
 
 2005-05-06 23:34  mitry
 
-	* src/ftn.c:
+	* src/ftn.c (1.6):
 
 	whattype() is slightly changed.
 	Misc code cleanup.
 
 2005-05-06 23:31  mitry
 
-	* src/flagexp.y:
+	* src/flagexp.y (1.3):
 
 	Changed strtok() to strsep()
 
 2005-05-06 23:30  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.18):
 
 	Have to send '\r' at least once in emsi_init
 
 2005-05-06 23:26  mitry
 
-	* src/: crc.c, crc.h:
+	* src/: crc.c (1.5), crc.h (1.6):
 
 	Misc changes
 
 2005-05-06 23:21  mitry
 
-	* src/: call.c, daemon.c, ftn.h, main.c, nodelist.c, nodelist.h,
-	  session.c:
+	* src/: call.c (1.8), daemon.c (1.11), ftn.h (1.7), main.c (1.20),
+	  nodelist.c (1.4), nodelist.h (1.1), session.c (1.22):
 
 	Changed nodelist handling
 
 2005-05-06 23:16  mitry
 
-	* src/: binkp.c, binkp.h:
+	* src/: binkp.c (1.9), binkp.h (1.3):
 
 	Changed end-of-session detection
 
 2005-05-05 22:20  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.12):
 
 	Changed rxopen() and rxclose() a bit
 
 2005-04-14 21:04  mitry
 
-	* src/: outbound.c, tools.c, tools.h:
+	* src/: outbound.c (1.15), tools.c (1.7), tools.h (1.8):
 
 	Changed scandir() to qscandir()
 
 2005-04-14 18:13  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.12):
 
 	I'm tired of stupid errors
 
 2005-04-14 18:10  mitry
 
-	* src/: modem.c, tcp.c:
+	* src/: modem.c (1.11), tcp.c (1.11):
 
 	Fixed uninitialized tty_fd
 
 2005-04-14 17:48  mitry
 
-	* src/: modem.c, tcp.c, tty.c:
+	* src/: modem.c (1.10), tcp.c (1.10), tty.c (1.20):
 
 	Misc changes
 
 2005-04-12 02:08  mitry
 
-	* src/session.c:
+	* src/session.c (1.21):
 
 	Fixed crash on incoming session when cd is lost.
 
 2005-04-12 01:46  mitry
 
-	* src/session.c:
+	* src/session.c (1.20):
 
 	Fixed stupid typo
 
 2005-04-11 21:26  mitry
 
-	* src/daemon.c:
+	* src/daemon.c (1.10):
 
 	Changed check for daemon already running
 
 2005-04-11 21:24  mitry
 
-	* src/session.c:
+	* src/session.c (1.19):
 
 	Optimized session()
 
 2005-04-09 04:08  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.8):
 
 	Removed doubling total mail size send to remote
 
 2005-04-08 21:22  mitry
 
-	* Changes, configure.in, qico.conf.sample, src/Makefile.am:
+	* Changes (1.17), configure.in (1.15), qico.conf.sample (1.9),
+	  src/Makefile.am (1.8):
 
 	0.57xe pre-release 1
 
 2005-04-08 21:15  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.19):
 
 	More proper sighup handling
 
 2005-04-08 21:14  mitry
 
-	* src/tty.h:
+	* src/tty.h (1.14):
 
 	Insignificant changes of PUTxxx and BUFxxx defines
 
 2005-04-08 21:12  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.11):
 
 	check_cps() sets tty_gothup to HUP_CPS
 
 2005-04-08 21:11  mitry
 
-	* src/: mailer.h, perl.c, qcconst.h, tools.c:
+	* src/: mailer.h (1.11), perl.c (1.5), qcconst.h (1.5), tools.c
+	  (1.6):
 
 	Insignificant changes
 
 2005-04-08 21:05  mitry
 
-	* src/: emsi.c, qconf.x, session.c:
+	* src/: emsi.c (1.17), qconf.x (1.9), session.c (1.18):
 
 	Added support for HydraRH1 option
 
 2005-04-07 23:59  mitry
 
-	* src/mailer.h:
+	* src/mailer.h (1.10):
 
 	Updated M_STAT
 
 2005-04-07 23:58  mitry
 
-	* src/: hydra.c, hydra.h:
+	* src/: hydra.c (1.26), hydra.h (1.11):
 
 	Cleaned code
 
 2005-04-07 16:05  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.10):
 
 	Added check of nullable tosend arg
 
 2005-04-07 15:59  mitry
 
-	* src/main.c:
+	* src/main.c (1.19):
 
 	Removed mallopt call
 
 2005-04-07 15:58  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.7):
 
 	Changed TIME parsing and format to send
 
 2005-04-05 12:36  mitry
 
-	* src/ls_zmodem.c:
+	* src/ls_zmodem.c (1.5):
 
 	Updated BUFFLUSH() calls
 
 2005-04-05 12:36  mitry
 
-	* src/tcp.c:
+	* src/tcp.c (1.9):
 
 	Changed arg 2 of shutdown()
 
 2005-04-05 12:34  mitry
 
-	* src/main.c:
+	* src/main.c (1.18):
 
 	Removed commented out code
 
 2005-04-05 12:34  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.9):
 
 	New xstrcpy() and xstrcat()
 
 2005-04-05 12:33  mitry
 
-	* src/: log.c, tools.h:
+	* src/: log.c (1.5), tools.h (1.7):
 
 	Update write_debug_log() prototype
 
 2005-04-05 12:31  mitry
 
-	* src/: emsi.c, nodelist.c, outbound.c, qslib.c, qslib.h:
+	* src/: emsi.c (1.16), nodelist.c (1.3), outbound.c (1.14), qslib.c
+	  (1.7), qslib.h (1.8):
 
 	New xstrcpy() and xstrcat()
 
 2005-04-05 12:25  mitry
 
-	* src/: clserv.h, qcc.c, qipc.c:
+	* src/: clserv.h (1.2), qcc.c (1.11), qipc.c (1.2):
 
 	Fix for tty device name > 8 symbols
 
 2005-04-04 22:43  mitry
 
-	* src/: emsi.c, hydra.c, janus.c, tty.c, tty.h:
+	* src/: emsi.c (1.15), hydra.c (1.25), janus.c (1.7), tty.c (1.18),
+	  tty.h (1.13):
 
 	Added timeout arg to BUFFLUSH() - tty_bufflush()
 
 2005-04-04 22:37  mitry
 
-	* src/clserv.c:
+	* src/clserv.c (1.4):
 
 	Changed arg 2 of shutdown()
 
 2005-04-01 23:33  mitry
 
-	* src/qcc.c:
+	* src/qcc.c (1.10):
 
 	envp is back to main()
 
 2005-04-01 23:32  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.24):
 
 	Changed hydra_deinit()
 
 2005-03-31 23:40  mitry
 
-	* configure.in:
+	* configure.in (1.14):
 
 	Snapshot
 
 2005-03-31 23:39  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.17):
 
 	Added support for HUP_XXX and removed old code
 
 2005-03-31 23:34  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.8):
 
 	Removed code commented out and rewrote some functions
 
 2005-03-31 23:31  mitry
 
-	* src/call.c:
+	* src/call.c (1.7):
 
 	Added MC_CANCEL to modem_dial() result check
 
 2005-03-31 23:11  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.23):
 
 	Added check for tty_gothup's HUP_OPERATOR value
 
 2005-03-31 23:10  mitry
 
-	* src/timer.h:
+	* src/timer.h (1.3):
 
 	Changed timer_expired_in()
 
 2005-03-31 23:07  mitry
 
-	* src/session.c:
+	* src/session.c (1.17):
 
 	Changed tty_gothup value to HUP_SESLIMIT in sessalarm()
 
 2005-03-31 22:40  mitry
 
-	* src/: flagexp.y, ftn.h, hydra.h, janus.c, janus.h, log.c,
-	  ls_zmodem.c, ls_zmodem.h, ls_zreceive.c, ls_zsend.c, mailer.h,
-	  main.c, protfm.c, qcc.c, qctl.c, qipc.h, qslib.c, qslib.h,
-	  queue.c, tools.h, tty.h:
+	* src/: flagexp.y (1.2), ftn.h (1.6), hydra.h (1.10), janus.c
+	  (1.6), janus.h (1.2), log.c (1.4), ls_zmodem.c (1.4), ls_zmodem.h
+	  (1.3), ls_zreceive.c (1.4), ls_zsend.c (1.4), mailer.h (1.9),
+	  main.c (1.17), protfm.c (1.9), qcc.c (1.9), qctl.c (1.7), qipc.h
+	  (1.2), qslib.c (1.6), qslib.h (1.7), queue.c (1.7), tools.h
+	  (1.6), tty.h (1.12):
 
 	Update function prototypes and it's duplication
 
 2005-03-31 22:28  mitry
 
-	* src/: globals.c, globals.h:
+	* src/: globals.c (1.10), globals.h (1.6):
 
 	Removed unused variable 'calling'
 
 2005-03-29 23:41  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.16):
 
 	Restore saved tio settings before closing port
 
 2005-03-29 23:39  mitry
 
-	* src/strcasestr.c:
+	* src/strcasestr.c (1.2):
 
 	Changes in includes
 
 2005-03-29 23:38  mitry
 
-	* src/headers.h:
+	* src/headers.h (1.6):
 
 	Added four more underscores :)
 
 2005-03-29 23:37  mitry
 
-	* src/crc.h:
+	* src/crc.h (1.5):
 
 	Remove commented out code
 
 2005-03-29 23:35  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.22):
 
 	Check tx queue before sending next data block
 
 2005-03-28 23:17  mitry
 
-	* configure.in, src/modem.c, src/replace.h, src/strcasestr.c:
+	* configure.in (1.13), src/modem.c (1.7), src/replace.h (1.3),
+	  src/strcasestr.c (1.1):
 
 	Added new replace func strcasestr()
 
 2005-03-28 20:02  mitry
 
-	* Changes, debian/qico.8, src/Makefile.am, src/call.c,
-	  src/clserv.c, src/config.c, src/daemon.c, src/defs.h, src/emsi.c,
-	  src/freq.c, src/ftn.c, src/ftn.h, src/headers.h, src/ip_tools.c,
-	  src/ip_tools.h, src/janus.c, src/ls_zglue.c, src/ls_zmodem.c,
-	  src/ls_zreceive.c, src/ls_zsend.c, src/mailer.h, src/md5.c,
-	  src/protfm.c, src/qcc.c, src/qcconst.h, src/qctl.c, src/qnlc.c,
-	  src/qslib.h, src/queue.c, src/tools.c, src/tools.h, src/tty.c,
-	  src/tty.h, src/types.h:
+	* Changes (1.16), debian/qico.8 (1.3), src/Makefile.am (1.7),
+	  src/call.c (1.6), src/clserv.c (1.3), src/config.c (1.6),
+	  src/daemon.c (1.9), src/defs.h (1.4), src/emsi.c (1.14),
+	  src/freq.c (1.5), src/ftn.c (1.5), src/ftn.h (1.5), src/headers.h
+	  (1.5), src/ip_tools.c (1.5), src/ip_tools.h (1.4), src/janus.c
+	  (1.5), src/ls_zglue.c (1.3), src/ls_zmodem.c (1.3),
+	  src/ls_zreceive.c (1.3), src/ls_zsend.c (1.3), src/mailer.h
+	  (1.8), src/md5.c (1.2), src/protfm.c (1.8), src/qcc.c (1.8),
+	  src/qcconst.h (1.4), src/qctl.c (1.6), src/qnlc.c (1.4),
+	  src/qslib.h (1.6), src/queue.c (1.6), src/tools.c (1.5),
+	  src/tools.h (1.5), src/tty.c (1.15), src/tty.h (1.11),
+	  src/types.h (1.6):
 
 	Pre non-blocking i/o update. Mostly non working.
 
 2005-03-28 19:48  mitry
 
-	* src/: tcp.c, log.c:
+	* src/: tcp.c (1.8), log.c (1.3):
 
 	Code cleaning
 
 2005-03-28 19:47  mitry
 
-	* src/tcp.h:
+	* src/tcp.h (1.1):
 
 	New file
 
 2005-03-28 19:44  mitry
 
-	* src/session.c:
+	* src/session.c (1.16):
 
 	Changed HAT option handling
 
 2005-03-28 19:42  mitry
 
-	* src/qslib.c:
+	* src/qslib.c (1.5):
 
 	Moved common bin2strhex() and strhex2bin() funcs here
 
 2005-03-28 19:37  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.13):
 
 	Moved some code to mappath() function (see tools.c)
 
 2005-03-28 19:33  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.6):
 
 	Major code rewrite with non-blocking i/o support
 
 2005-03-28 19:25  mitry
 
-	* src/main.c:
+	* src/main.c (1.16):
 
 	Added non-blocking i/o support
 
 2005-03-28 19:15  mitry
 
-	* src/ftn.c:
+	* src/ftn.c (1.4):
 
 	Moved mapname() to tools.c
 
 2005-03-28 18:33  mitry
 
-	* src/: crc.c, crc.h, md5q.c, md5q.h:
+	* src/: crc.c (1.4), crc.h (1.4), md5q.c (1.1), md5q.h (1.1):
 
 	MD5 logic now in separate files
 
 2005-03-28 18:17  mitry
 
-	* src/: hydra.c, hydra.h:
+	* src/: hydra.c (1.21), hydra.h (1.9):
 
 	Added non-blocking i/o support
 
 2005-03-28 18:07  mitry
 
-	* src/: binkp.c, binkp.h:
+	* src/: binkp.c (1.6), binkp.h (1.2):
 
 	New non-blocking version of binkp
 
 2005-03-28 18:03  mitry
 
-	* Makefile.am, configure.in, lib/Makefile.am, lib/dlmalloc.c:
+	* Makefile.am (1.2), configure.in (1.12), lib/Makefile.am (1.1),
+	  lib/dlmalloc.c (1.1):
 
 	Added Doug Lea's malloc library support
 
 2005-02-25 18:53  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.13):
 
 	Fixed stupid syntax error
 
 2005-02-25 18:48  mitry
 
-	* Changes:
+	* Changes (1.15):
 
 	Snapshot
 
 2005-02-25 18:43  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.5):
 
 	Added ModemCheckDSR keyword logic
 
 2005-02-25 18:42  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.12):
 
 	Modified to support multi-line intro lines
 
 2005-02-25 18:41  mitry
 
-	* src/: tty.c, tty.h:
+	* src/: tty.c (1.14), tty.h (1.10):
 
 	Adding proper tio calls in progress
 	Changed some code
 
 2005-02-25 18:36  mitry
 
-	* src/qconf.x:
+	* src/qconf.x (1.8):
 
 	Added ModemCheckDSR keyword
 
 2005-02-25 18:29  mitry
 
-	* src/main.c:
+	* src/main.c (1.15):
 
 	Another fixing hangup after session
 
 2005-02-25 18:27  mitry
 
-	* src/binkp.c:
+	* src/binkp.c (1.5):
 
 	Revert last change
 
 2005-02-25 18:25  mitry
 
-	* qico.conf.sample:
+	* qico.conf.sample (1.8):
 
 	Added ModemCheckDSR keyword
 
 2005-02-23 23:58  mitry
 
-	* qico.spec, debian/qico.8:
+	* qico.spec (1.2), debian/qico.8 (1.2):
 
 	Pre-release again?
 
 2005-02-23 23:56  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.13):
 
 	Changed tty_carrier() code. To be rewritten
 
 2005-02-23 23:48  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.4):
 
 	Changed debug message
 
 2005-02-23 23:47  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.7):
 
 	tty_online and tty_gothup logic
 
 2005-02-23 23:37  mitry
 
-	* src/queue.c:
+	* src/queue.c (1.5):
 
 	Added debug messages
 
 2005-02-23 23:36  mitry
 
-	* src/session.c:
+	* src/session.c (1.15):
 
 	Changed emsi_send() call
 	tty_online was removed from sig alarm handler
 
 2005-02-23 23:34  mitry
 
-	* src/main.c:
+	* src/main.c (1.14):
 
 	Changed checking of CARRIER() to tty_online
 
 2005-02-23 23:33  mitry
 
-	* src/mailer.h:
+	* src/mailer.h (1.7):
 
 	Changed emsi_send() prototype
 
 2005-02-23 23:31  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.11):
 
 	Rewrite emsi_send()
 	Modified emsi_init() and emsi_recv()
@@ -1331,137 +1485,138 @@
 
 2005-02-23 23:27  mitry
 
-	* src/qcc.c:
+	* src/qcc.c (1.7):
 
 	Changed '* Node' to '* Address'
 
 2005-02-23 23:26  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.20):
 
 	Removed commented code
 
 2005-02-22 18:38  mitry
 
-	* src/main.c:
+	* src/main.c (1.13):
 
 	Added experimental mallopt call to prevent seg fault
 	on buggy glibc library
 
 2005-02-22 18:17  mitry
 
-	* Changes, autogen.sh:
+	* Changes (1.14), autogen.sh (1.4):
 
 	0.56.5 pre-release snapshot
 
 2005-02-22 18:15  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.12):
 
 	Code rewrite
 
 2005-02-22 18:09  mitry
 
-	* src/session.c:
+	* src/session.c (1.14):
 
 	Added tty_gothup to sessalarm code
 
 2005-02-22 18:00  mitry
 
-	* src/tty.h:
+	* src/tty.h (1.9):
 
 	Changed M_STAT definition
 
 2005-02-22 17:50  mitry
 
-	* src/tcp.c:
+	* src/tcp.c (1.7):
 
 	Commit non-blocking mode. Code cleaning.
 
 2005-02-22 17:47  mitry
 
-	* src/: daemon.c, globals.c, globals.h, main.c:
+	* src/: daemon.c (1.8), globals.c (1.9), globals.h (1.5), main.c
+	  (1.12):
 
 	Added 'run in foreground' mode
 
 2005-02-22 15:56  mitry
 
-	* src/protfm.c:
+	* src/protfm.c (1.6):
 
 	Removed warning about difference in signedness
 
 2005-02-21 23:59  mitry
 
-	* src/tcp.c:
+	* src/tcp.c (1.6):
 
 	Added preliminary support for non-blocking I/O
 
 2005-02-21 23:58  mitry
 
-	* src/headers.h:
+	* src/headers.h (1.4):
 
 	Added #include <sys/ioctl.h>
 
 2005-02-21 23:00  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.10):
 
 	Fix logic for preventive EMSI_INQ
 
 2005-02-21 22:58  mitry
 
-	* src/main.c:
+	* src/main.c (1.11):
 
 	Added tty_online=TRUE on incoming call
 
 2005-02-21 20:14  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.11):
 
 	One more tty_hangedup rename
 
 2005-02-21 18:33  mitry
 
-	* src/: binkp.c, globals.c, globals.h, protfm.c, session.c, tcp.c,
-	  tty.c, tty.h:
+	* src/: binkp.c (1.4), globals.c (1.8), globals.h (1.4), protfm.c
+	  (1.5), session.c (1.13), tcp.c (1.5), tty.c (1.10), tty.h (1.8):
 
 	Changed tty_hangedup to tty_online
 
 2005-02-19 23:40  mitry
 
-	* Changes:
+	* Changes (1.13):
 
 	0.56.5 pre-release
 
 2005-02-19 23:34  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.19):
 
 	hydra_chat() is dynamically assigned now
 	Fixed debug log output on linux OS
 
 2005-02-19 23:32  mitry
 
-	* src/main.c:
+	* src/main.c (1.10):
 
 	Changed setlocale setting to "C"
 	Removed superfluous strncasecmp in session detection
 
 2005-02-19 23:30  mitry
 
-	* src/: qcc.c, qctl.c:
+	* src/: qcc.c (1.6), qctl.c (1.5):
 
 	Changed setlocale setting to "C"
 
 2005-02-19 23:29  mitry
 
-	* src/session.c:
+	* src/session.c (1.12):
 
 	Do not init chat if we do not want it.
 
 2005-02-18 22:39  mitry
 
-	* src/tty.c:
+	* src/tty.c (1.9):
 
 	tty_block() commented out
 	tty_close() now has parameter (may be temporarily) and rewritten
@@ -1469,13 +1624,13 @@
 
 2005-02-18 22:36  mitry
 
-	* src/tty.h:
+	* src/tty.h (1.7):
 
 	Reflect to rename of functions
 
 2005-02-18 22:34  mitry
 
-	* src/modem.c:
+	* src/modem.c (1.3):
 
 	Changed alive() to modem_alive()
 	Changed hangup() to modem_hangup()
@@ -1487,152 +1642,146 @@
 
 2005-02-18 22:29  mitry
 
-	* src/call.c:
+	* src/call.c (1.5):
 
 	Changed mdm_dial() to modem_dial(), mdm_done() to modem_done().
 
 2005-02-18 22:28  mitry
 
-	* src/main.c:
+	* src/main.c (1.9):
 
 	Changed hangup() to modem_hangup(), stat_collect() to modem_stat_collect()
 
 2005-02-16 23:42  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.12):
 
 	Check the value returned from scandir (n <= 0) for out_aso_rescan(), out_bso_scan_zone(), out_bso_rescan().
 
 2005-02-16 13:25  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.11):
 
 	Next fix for out_bso_scan_zone()
 
 2005-02-16 00:12  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.10):
 
 	Fix for out_bso_scan_zone()
 
 2005-02-15 13:34  mitry
 
-	* configure.in:
+	* configure.in (1.11):
 
 	Start of 0.56.5
 
 2005-02-15 13:17  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.9):
 
 	Another fix for out_bso_rescan()
 
 2005-02-12 21:40  mitry
 
-	* Changes:
+	* Changes (1.12):
 
 	Hydra4/8/16k and chat are back.
 
 2005-02-12 21:38  mitry
 
-	* src/tools.c:
+	* src/tools.c (1.4):
 
 	Remove superfluous log message.
 
 2005-02-12 21:03  mitry
 
-	* src/session.c:
+	* src/session.c (1.11):
 
 	/tmp/qpkt.xxxxxx files now should be removed after session.
 
 2005-02-12 21:01  mitry
 
-	* src/perl.c:
+	* src/perl.c (1.4):
 
 	Minor cosmetic changes.
 
 2005-02-12 20:59  mitry
 
-	* src/main.c:
+	* src/main.c (1.8):
 
 	Fixing hangup after session.
 
 2005-02-12 20:57  mitry
 
-	* src/: hydra.c, hydra.h:
+	* src/: hydra.c (1.18), hydra.h (1.8):
 
 	Hydra-4/8/16k and chat are back. Chat is still buggy. Oversized Hydra too.
 
 2005-02-12 20:54  mitry
 
-	* src/: freq.c, globals.c:
+	* src/: freq.c (1.4), globals.c (1.7):
 
 	Fixing lost /tmp/qrep.xxxx files.
 
 2005-02-12 20:48  mitry
 
-	* src/emsi.c:
+	* src/emsi.c (1.9):
 
 	Adde some code in emsi_init() to speed up ifcico connect with fckng T-Mail.
 
 2005-02-12 20:46  mitry
 
-	* configure.in:
+	* configure.in (1.10):
 
 	Re-enabling Hydra-4/8/16k
 
 2005-02-09 14:44  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.8):
 
 	Changed free() to xfree()
 	Changed out_bso_rescan() code
 
 2005-02-09 13:18  mitry
 
-	* src/qslib.h:
+	* src/qslib.h (1.5):
 
 	More proper writing for XBLANK
 
 2005-02-09 13:14  mitry
 
-	* src/config.c:
+	* src/config.c (1.5):
 
 	Add support to escape next character with backslash (\)
 
 2005-02-08 22:30  mitry
 
-	* FAQ:
+	* FAQ (1.2):
 
 	Added answer about missing qcc
 
 2005-02-08 22:07  mitry
 
-	* Changes:
+	* Changes (1.11):
 
 	Add new bugfix
 
-2005-02-08 22:05  mitry
-
-	* cvs_com:
-
-	Prevent to call address if it is being dialled on another line.
-
 2005-02-08 22:02  mitry
 
-	* src/qslib.c:
+	* src/qslib.c (1.4):
 
 	Some code cleaning
 
 2005-02-08 22:02  mitry
 
-	* src/qslib.h:
+	* src/qslib.h (1.4):
 
 	New define for SIZES and SIZEC
 
 2005-02-08 21:57  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.7):
 
 	Added outbound_addr_busy().
 	Wiped out old outbound_rescan code.
@@ -1640,25 +1789,25 @@
 
 2005-02-08 21:53  mitry
 
-	* src/ftn.h:
+	* src/ftn.h (1.4):
 
 	Added outbound_addr_busy()
 
 2005-02-08 21:50  mitry
 
-	* src/daemon.c:
+	* src/daemon.c (1.7):
 
 	Prevent to call address if it is being dialled on another line
 
 2005-02-08 21:45  mitry
 
-	* src/tools.c:
+	* src/tools.c (1.3):
 
 	islocked() is rewritten to reflect zero-sized .csy/.bsy files
 
 2005-02-07 22:44  mitry
 
-	* Changes, cvs_com, src/flaglex.l, src/perl.c:
+	* Changes (1.10), src/flaglex.l (1.4), src/perl.c (1.3):
 
 	Fix qico crash if bso dir was unspecified.
 	Extend tty device name length up to 32 characters.
@@ -1666,35 +1815,37 @@
 
 2005-02-07 22:34  mitry
 
-	* src/main.c:
+	* src/main.c (1.7):
 
 	Try to fix qico hang after incoming call.
 
 2005-02-07 22:30  mitry
 
-	* configure.in:
+	* configure.in (1.9):
 
 	Version was changed to 0.56.4xe.
 
 2005-02-07 22:27  mitry
 
-	* src/outbound.c:
+	* src/outbound.c (1.6):
 
 	Fixed qico crash if bso dir was not defined.
 
 2005-02-07 15:45  mitry
 
-	* src/qcc.c:
+	* src/qcc.c (1.5):
 
 	Extend tty name length to 32 symbols.
 
 2005-02-07 14:31  mitry
 
-	* Changes, qico.conf.sample, src/Makefile.am, src/config.c,
-	  src/daemon.c, src/emsi.c, src/have.h, src/headers.h, src/hydra.c,
-	  src/ip_tools.h, src/main.c, src/outbound.c, src/perl.c,
-	  src/qconf.x, src/queue.c, src/replace.h, src/session.c,
-	  src/tools.h, src/tty.c, src/types.h:
+	* Changes (1.9), qico.conf.sample (1.7), src/Makefile.am (1.6),
+	  src/config.c (1.4), src/daemon.c (1.6), src/emsi.c (1.8),
+	  src/have.h (1.1), src/headers.h (1.3), src/hydra.c (1.17),
+	  src/ip_tools.h (1.3), src/main.c (1.6), src/outbound.c (1.5),
+	  src/perl.c (1.2), src/qconf.x (1.7), src/queue.c (1.4),
+	  src/replace.h (1.2), src/session.c (1.10), src/tools.h (1.4),
+	  src/tty.c (1.8), src/types.h (1.5):
 
 	At last Hydra works fine with T-Mail.
 	EMSI was partially rewritten.
@@ -1704,139 +1855,151 @@
 
 2005-02-05 19:03  mitry
 
-	* src/: crc.c, crc.h, hydra.c, janus.c, outbound.c, qcc.c, qslib.h,
-	  session.c, timer.h, tty.c, tty.h:
+	* src/: crc.c (1.3), crc.h (1.3), hydra.c (1.16), janus.c (1.4),
+	  outbound.c (1.4), qcc.c (1.4), qslib.h (1.3), session.c (1.9),
+	  timer.h (1.2), tty.c (1.7), tty.h (1.6):
 
 	Major Hydra code revising.
 
 2005-02-03 17:45  mitry
 
-	* src/: emsi.c, globals.c, hydra.c, qconf.x, tty.c, tty.h:
+	* src/: emsi.c (1.7), globals.c (1.6), hydra.c (1.15), qconf.x
+	  (1.6), tty.c (1.6), tty.h (1.5):
 
 	Hydra and EMSI improvements.
 
 2005-02-01 23:12  mitry
 
-	* configure.in, src/emsi.c, src/globals.c, src/hydra.c,
-	  src/mailer.h, src/protfm.c, src/tty.c:
+	* configure.in (1.8), src/emsi.c (1.6), src/globals.c (1.5),
+	  src/hydra.c (1.14), src/mailer.h (1.6), src/protfm.c (1.4),
+	  src/tty.c (1.5):
 
 	Tuning EMSI and hydra timers.
 
 2005-01-29 02:02  mitry
 
-	* Changes, src/hydra.c, src/qconf.x:
+	* Changes (1.8), src/hydra.c (1.13), src/qconf.x (1.5):
 
 	Returned HydraCRC16 logic.
 
 2005-01-28 23:43  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.12):
 
 	Temporary removed hydracrc16 :(
 
 2005-01-28 22:22  mitry
 
-	* src/hydra.c, Changes:
+	* src/hydra.c (1.11), Changes (1.7):
 
 	Hydra session can't be established between two qicoxe.
 
 2005-01-28 09:55  mitry
 
-	* Changes, qico.conf.sample, src/call.c, src/config.c, src/hydra.c,
-	  src/qconf.x, src/tools.h:
+	* Changes (1.6), qico.conf.sample (1.6), src/call.c (1.4),
+	  src/config.c (1.3), src/hydra.c (1.10), src/qconf.x (1.4),
+	  src/tools.h (1.3):
 
 	New keyword 'loginscript'.
 
 2005-01-28 05:35  mitry
 
-	* qico.conf.sample, src/hydra.c:
+	* qico.conf.sample (1.5), src/hydra.c (1.9):
 
 	Now if remote node wants CRC32 on Hydra and hydracrc16 yes the session is CRC32.
 
 2005-01-28 05:30  mitry
 
-	* src/qcc.c:
+	* src/qcc.c (1.3):
 
 	Now current node has got '>' pointer. Useful on b/w terminals.
 
 2005-01-28 00:09  mitry
 
-	* src/: hydra.c, hydra.h:
+	* src/: hydra.c (1.8), hydra.h (1.7):
 
 	Change HydraCRC16 logic.
 
 2005-01-27 22:24  mitry
 
-	* configure.in, qico.conf.sample, src/hydra.c, src/hydra.h,
-	  src/qconf.x, src/session.c, src/tty.c, src/tty.h:
+	* configure.in (1.7), qico.conf.sample (1.4), src/hydra.c (1.7),
+	  src/hydra.h (1.6), src/qconf.x (1.3), src/session.c (1.8),
+	  src/tty.c (1.4), src/tty.h (1.4):
 
 	Add HydraHDX and HydraCRC16 keywords.
 	Add tty_send_break function to tty.c.
 
 2005-01-27 13:07  mitry
 
-	* src/hydra.c:
+	* src/hydra.c (1.6):
 
 	Disable HOPT_NFI code which was uncompletely implemented.
 
 2005-01-27 02:00  mitry
 
-	* src/: hydra.c, hydra.h, mailer.h, protfm.c, session.c:
+	* src/: hydra.c (1.5), hydra.h (1.5), mailer.h (1.5), protfm.c
+	  (1.3), session.c (1.7):
 
 	Current htdra flush.
 
 2005-01-26 22:37  mitry
 
-	* Changes:
+	* Changes (1.5):
 
 	Put a warning to Changes.
 
 2005-01-26 22:31  mitry
 
-	* Changes, src/hydra.c, src/hydra.h, src/session.c:
+	* Changes (1.4), src/hydra.c (1.4), src/hydra.h (1.4),
+	  src/session.c (1.6):
 
 	Cosmetic changes.
 
 2005-01-26 15:23  mitry
 
-	* Changes, README, configure.in, src/Makefile.am, src/crc.c,
-	  src/crc.h, src/emsi.c, src/ftn.h, src/globals.c, src/outbound.c,
-	  src/protfm.c, src/queue.c, src/session.c, src/types.h:
+	* Changes (1.3), README (1.3), configure.in (1.6), src/Makefile.am
+	  (1.5), src/crc.c (1.2), src/crc.h (1.2), src/emsi.c (1.5),
+	  src/ftn.h (1.3), src/globals.c (1.4), src/outbound.c (1.3),
+	  src/protfm.c (1.2), src/queue.c (1.3), src/session.c (1.5),
+	  src/types.h (1.4):
 
 	[Un]successful try to fix aso_rescan.
 	First hydra fix try. Intruduced several corrections to protocol by AGL.
 
 2005-01-26 15:01  mitry
 
-	* src/: binkp.c, daemon.c, headers.h, janus.c, main.c, modem.c,
-	  tcp.c, tty.c, tty.h:
+	* src/: binkp.c (1.3), daemon.c (1.5), headers.h (1.2), janus.c
+	  (1.3), main.c (1.5), modem.c (1.2), tcp.c (1.4), tty.c (1.3),
+	  tty.h (1.3):
 
 	Updated due to timer.h
 
 2005-01-26 14:41  mitry
 
-	* src/: hydra.c, hydra.h:
+	* src/: hydra.c (1.3), hydra.h (1.3):
 
 	Introduced several corrections from AGL
 
 2005-01-26 14:37  mitry
 
-	* src/timer.h:
+	* src/timer.h (1.1):
 
 	Excerpted from tty.h
 
 2005-01-21 00:06  mitry
 
-	* src/Makefile.am:
+	* src/Makefile.am (1.4):
 
 	Some fixes.
 
 2005-01-20 21:28  mitry
 
-	* configure.in, qico.conf.sample, src/Makefile.am, src/daemon.c,
-	  src/emsi.c, src/flaglex.l, src/freq.c, src/ftn.c, src/globals.c,
-	  src/globals.h, src/hydra.h, src/janus.c, src/mailer.h,
-	  src/qcconst.h, src/qnlc.c, src/qslib.c, src/session.c, src/tcp.c:
+	* configure.in (1.5), qico.conf.sample (1.3), src/Makefile.am
+	  (1.3), src/daemon.c (1.4), src/emsi.c (1.4), src/flaglex.l (1.3),
+	  src/freq.c (1.3), src/ftn.c (1.3), src/globals.c (1.3),
+	  src/globals.h (1.3), src/hydra.h (1.2), src/janus.c (1.2),
+	  src/mailer.h (1.4), src/qcconst.h (1.3), src/qnlc.c (1.3),
+	  src/qslib.c (1.3), src/session.c (1.4), src/tcp.c (1.3):
 
 	Mark hydra session as xHydra if RH1.
 	Fix traps if mapin/mapout is empty (commented out). Thanks to Rodion Lisitsyn (2:5030/289).
@@ -1844,14 +2007,18 @@
 
 2005-01-14 20:20  mitry
 
-	* Changes, README, autogen.sh, configure.in, qico.conf.sample,
-	  src/call.c, src/clserv.c, src/config.c, src/daemon.c, src/defs.h,
-	  src/emsi.c, src/ftn.c, src/globals.c, src/globals.h, src/hydra.c,
-	  src/log.c, src/ls_zglue.c, src/ls_zmodem.c, src/ls_zmodem.h,
-	  src/ls_zreceive.c, src/ls_zsend.c, src/mailer.h, src/main.c,
-	  src/nodelist.c, src/qcc.c, src/qcconst.h, src/qctl.c, src/qnlc.c,
-	  src/qslib.c, src/qslib.h, src/session.c, src/slists.c, src/tcp.c,
-	  src/types.h:
+	* Changes (1.2), README (1.2), autogen.sh (1.3), configure.in
+	  (1.4), qico.conf.sample (1.2), src/call.c (1.3), src/clserv.c
+	  (1.2), src/config.c (1.2), src/daemon.c (1.3), src/defs.h (1.3),
+	  src/emsi.c (1.3), src/ftn.c (1.2), src/globals.c (1.2),
+	  src/globals.h (1.2), src/hydra.c (1.2), src/log.c (1.2),
+	  src/ls_zglue.c (1.2), src/ls_zmodem.c (1.2), src/ls_zmodem.h
+	  (1.2), src/ls_zreceive.c (1.2), src/ls_zsend.c (1.2),
+	  src/mailer.h (1.3), src/main.c (1.4), src/nodelist.c (1.2),
+	  src/qcc.c (1.2), src/qcconst.h (1.2), src/qctl.c (1.4),
+	  src/qnlc.c (1.2), src/qslib.c (1.2), src/qslib.h (1.2),
+	  src/session.c (1.3), src/slists.c (1.2), src/tcp.c (1.2),
+	  src/types.h (1.3):
 
 	Config parser now accepts environment variables like defines
 	Bugfix: eliminate Segmentation Fault on FreeBSD 4.X / gcc 2.95.4
@@ -1859,85 +2026,92 @@
 
 2004-12-31 00:02  mitry
 
-	* src/flaglex.l:
+	* src/flaglex.l (1.2):
 
 	Extended date format adding the form mon[dd]
 
 2004-12-30 21:24  mitry
 
-	* .cvsignore, configure.in, debian/.cvsignore, src/.cvsignore,
-	  src/ip_tools.c, src/main.c, src/qctl.c, stuff/.cvsignore:
+	* .cvsignore (1.2), configure.in (1.3), debian/.cvsignore (1.2),
+	  src/.cvsignore (1.2), src/ip_tools.c (1.4), src/main.c (1.3),
+	  src/qctl.c (1.3), stuff/.cvsignore (1.2):
 
 	Changed version to 0.55xe (eXtended Edition)
 	Show incoming host name along with remote ip.
 
 2004-12-30 15:26  mitry
 
-	* src/ip_tools.c:
+	* src/ip_tools.c (1.3):
 
 	[no log message]
 
 2004-12-30 15:20  mitry
 
-	* src/: ip_tools.c, ip_tools.h, outbound.c:
+	* src/: ip_tools.c (1.2), ip_tools.h (1.2), outbound.c (1.2):
 
 	Learning CVS tags :)
 
 2004-12-30 00:03  mitry
 
-	* src/: ip_tools.c, ip_tools.h, outbound.c:
+	* src/: ip_tools.c (1.1), ip_tools.h (1.1), outbound.c (1.1):
 
 		Adding new files.
 
 2004-12-30 00:01  mitry
 
-	* src/: Makefile.am, aso.c, binkp.c, call.c, daemon.c, defs.h,
-	  emsi.c, freq.c, ftn.h, mailer.h, main.c, qconf.x, qctl.c,
-	  queue.c, session.c, tools.c, tools.h, tty.c, tty.h, types.h:
+	* src/: Makefile.am (1.2), aso.c (1.2), binkp.c (1.2), call.c
+	  (1.2), daemon.c (1.2), defs.h (1.2), emsi.c (1.2), freq.c (1.2),
+	  ftn.h (1.2), mailer.h (1.2), main.c (1.2), qconf.x (1.2), qctl.c
+	  (1.2), queue.c (1.2), session.c (1.2), tools.c (1.2), tools.h
+	  (1.2), tty.c (1.2), tty.h (1.2), types.h (1.2):
 
 		Miscellaneous cleaning.
 
 2004-12-29 23:59  mitry
 
-	* autogen.sh, configure.in:
+	* autogen.sh (1.2), configure.in (1.2):
 
 		* src/aso.c: removed.
 
-2004-12-29 23:28  mitry
-
-	* cvs_com:
-
-	Init.
-
 2004-12-29 23:23  mitry
 
-	* .cvsignore, Changes, FAQ, INSTALL, Makefile.am, README,
-	  autogen.sh, compile, configure.in, cvs_com, qico.conf.sample,
-	  qico.spec, stamp-h.in, debian/.cvsignore, debian/Makefile.am,
-	  debian/changelog, debian/conffiles, debian/control,
-	  debian/copyright, debian/dirs, debian/examples,
-	  debian/inetd.conf, debian/init.d, debian/qcc.8, debian/qcc.files,
-	  debian/qctl.8, debian/qctl.files, debian/qico.8, debian/rules,
-	  debian/services, src/.cvsignore, src/Makefile.am, src/aso.c,
-	  src/basename.c, src/binkp.c, src/binkp.h, src/call.c,
-	  src/charset.h, src/clserv.c, src/clserv.h, src/config.c,
-	  src/crc.c, src/crc.h, src/daemon.c, src/defs.h, src/emsi.c,
-	  src/flagexp.y, src/flaglex.l, src/freq.c, src/ftn.c, src/ftn.h,
-	  src/getsid.c, src/globals.c, src/globals.h, src/headers.h,
-	  src/hydra.c, src/hydra.h, src/janus.c, src/janus.h, src/log.c,
-	  src/ls_zglue.c, src/ls_zmodem.c, src/ls_zmodem.h,
-	  src/ls_zreceive.c, src/ls_zsend.c, src/mailer.h, src/main.c,
-	  src/malloc.c, src/md5.c, src/memcmp.c, src/modem.c,
-	  src/nodelist.c, src/perl.c, src/protfm.c, src/qcc.c,
-	  src/qcconst.h, src/qconf.x, src/qctl.c, src/qipc.c, src/qipc.h,
-	  src/qnlc.c, src/qslib.c, src/qslib.h, src/queue.c, src/replace.h,
-	  src/session.c, src/slists.c, src/slists.h, src/strcspn.c,
-	  src/strsep.c, src/tcp.c, src/tools.c, src/tools.h, src/tty.c,
-	  src/tty.h, src/types.h, src/usleep.c, src/x2c.awk,
-	  stuff/.cvsignore, stuff/Makefile.am, stuff/ftn,
-	  stuff/koi8r_866.cp, stuff/onchat, stuff/qhistory, stuff/qico.xpm,
-	  stuff/qlinks, stuff/sfreq, stuff/stat.run, stuff/synctime,
-	  stuff/test.pl, stuff/tossing:
+	* .cvsignore (1.1), Changes (1.1), FAQ (1.1), INSTALL (1.1),
+	  Makefile.am (1.1), README (1.1), autogen.sh (1.1), compile (1.1),
+	  configure.in (1.1), qico.conf.sample (1.1), qico.spec (1.1),
+	  stamp-h.in (1.1), debian/.cvsignore (1.1), debian/Makefile.am
+	  (1.1), debian/changelog (1.1), debian/conffiles (1.1),
+	  debian/control (1.1), debian/copyright (1.1), debian/dirs (1.1),
+	  debian/examples (1.1), debian/inetd.conf (1.1), debian/init.d
+	  (1.1), debian/qcc.8 (1.1), debian/qcc.files (1.1), debian/qctl.8
+	  (1.1), debian/qctl.files (1.1), debian/qico.8 (1.1), debian/rules
+	  (1.1), debian/services (1.1), src/.cvsignore (1.1),
+	  src/Makefile.am (1.1), src/aso.c (1.1), src/basename.c (1.1),
+	  src/binkp.c (1.1), src/binkp.h (1.1), src/call.c (1.1),
+	  src/charset.h (1.1), src/clserv.c (1.1), src/clserv.h (1.1),
+	  src/config.c (1.1), src/crc.c (1.1), src/crc.h (1.1),
+	  src/daemon.c (1.1), src/defs.h (1.1), src/emsi.c (1.1),
+	  src/flagexp.y (1.1), src/flaglex.l (1.1), src/freq.c (1.1),
+	  src/ftn.c (1.1), src/ftn.h (1.1), src/getsid.c (1.1),
+	  src/globals.c (1.1), src/globals.h (1.1), src/headers.h (1.1),
+	  src/hydra.c (1.1), src/hydra.h (1.1), src/janus.c (1.1),
+	  src/janus.h (1.1), src/log.c (1.1), src/ls_zglue.c (1.1),
+	  src/ls_zmodem.c (1.1), src/ls_zmodem.h (1.1), src/ls_zreceive.c
+	  (1.1), src/ls_zsend.c (1.1), src/mailer.h (1.1), src/main.c
+	  (1.1), src/malloc.c (1.1), src/md5.c (1.1), src/memcmp.c (1.1),
+	  src/modem.c (1.1), src/nodelist.c (1.1), src/perl.c (1.1),
+	  src/protfm.c (1.1), src/qcc.c (1.1), src/qcconst.h (1.1),
+	  src/qconf.x (1.1), src/qctl.c (1.1), src/qipc.c (1.1), src/qipc.h
+	  (1.1), src/qnlc.c (1.1), src/qslib.c (1.1), src/qslib.h (1.1),
+	  src/queue.c (1.1), src/replace.h (1.1), src/session.c (1.1),
+	  src/slists.c (1.1), src/slists.h (1.1), src/strcspn.c (1.1),
+	  src/strsep.c (1.1), src/tcp.c (1.1), src/tools.c (1.1),
+	  src/tools.h (1.1), src/tty.c (1.1), src/tty.h (1.1), src/types.h
+	  (1.1), src/usleep.c (1.1), src/x2c.awk (1.1), stuff/.cvsignore
+	  (1.1), stuff/Makefile.am (1.1), stuff/ftn (1.1),
+	  stuff/koi8r_866.cp (1.1), stuff/onchat (1.1), stuff/qhistory
+	  (1.1), stuff/qico.xpm (1.1), stuff/qlinks (1.1), stuff/sfreq
+	  (1.1), stuff/stat.run (1.1), stuff/synctime (1.1), stuff/test.pl
+	  (1.1), stuff/tossing (1.1):
 
 	Initial revision
 
diff -burw ./qico/Changes ./trunk/Changes
--- ./qico/Changes	2024-02-01 18:09:52.525992000 +0300
+++ ./trunk/Changes	2024-02-01 18:10:34.661866000 +0300
@@ -1,41 +1,3 @@
-Version 0.59.1
-~~~~~~~~~~~~~~
-- Correct ';' to ':' in the src/outbound.c file.
-- Update copyright years for Robert James Clay in LICENSE.
-- Rename configure.in as configure.ac in 'Makefile.in' file in sub-directories.
-
-
-Version 0.59
-~~~~~~~~~~~~~~
-- Renamed configure.in as configure.ac, closing Bug #18.
-- Add case for ' ' in floflist() in file src/outbound.c. Reference also
-  https://sourceforge.net/p/qico/feature-requests/8/. Thanks to Markus Reschke,
-  2:240/1661.
-
-
-Version 0.58
-~~~~~~~~~~~~~~
-- Update/correct copyright information in the LICENSE file.
-- Save Russian version as README.ru. Create initial English version of README.
-- Correct format string for printing TCP/IP connection information.
-
-
-Version 0.57.3
-~~~~~~~~~~~~~~
-- Change 'qicosi' or 'qicoxe' references in the current documentation and
-  code to be to just "qico".
-- The debian directory and its contents are separately versioned, so removing
-  from the mainline branch and moving it to its own separate branch in the
-  code repository.
-- Update the support information in the man pages.
-
-
-Version 0.57.2xe
-~~~~~~~~~~~~~~~~
-- Apply IPv6 related changes from patch file qico-0.57.1xe-ipv6.patch,
-  as downloaded from http://andre.grueneberg.de/binkd/.
-
-
 Version 0.57.1xe
 ~~~~~~~~~~~~~~~~
 - changed: cvs address
@@ -534,4 +496,4 @@
 ~~~~~~~~~~~~~~
 truncated.
 
-/* $Id: Changes,v 1.26 2005/08/23 11:21:17 mitry Exp $ */
+/* $Id: Changes 18 2010-08-23 15:50:49Z semik $ */
diff -burw ./qico/FAQ ./trunk/FAQ
--- ./qico/FAQ	2024-02-01 18:09:52.526059000 +0300
+++ ./trunk/FAQ	2024-02-01 18:10:34.660252000 +0300
@@ -55,4 +55,4 @@
    Так-же существует эхоконференция поддержки мейлера RU.QICO.
 
 
-/* $Id: FAQ,v 1.3 2005/06/13 18:19:03 mitry Exp $ */
+/* $Id: FAQ 18 2010-08-23 15:50:49Z semik $ */
Only in ./qico: LICENSE
diff -burw ./qico/Makefile.am ./trunk/Makefile.am
--- ./qico/Makefile.am	2024-02-01 18:09:52.526327000 +0300
+++ ./trunk/Makefile.am	2024-02-01 18:10:34.639442000 +0300
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2005/08/23 11:18:18 mitry Exp $
+# $Id: Makefile.am 18 2010-08-23 15:50:49Z semik $
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.5
 
 SUBDIRS = lib src man stuff
diff -burw ./qico/README ./trunk/README
--- ./qico/README	2024-02-01 18:09:52.526415000 +0300
+++ ./trunk/README	2024-02-01 18:10:34.659919000 +0300
@@ -1,169 +1,182 @@
- Qico is an ftn compatible mailer that can run on older style modem ground lines as well as
- over IP using more modern (to be more precise - less fossil) binkp and ifcico protocols.
+,sS$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$Ss,
+$$$$'                    qico, an ftn compatible mailer                    `$$$$
+$$$$.                         * version 0.57.1xe *                         ,$$$$
+`?S$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$S?'
  
- This is version 0.59.1 forked from leenooks/qico with some number of small bugfixes.
- 
 Features
 ~~~~~~~~
- * EMSI Protocols: ZModem, ZedZap, Hydra (Std, 4k, 8k, 16k), Janus; Binkp.
- * Support 4D Binkley-Style, Amiga-style outbound, FileBoxes, LongNameBoxes.
- * "Muzzle" - a program that allows you to control the operation of mailer (ncurses based).
- * Daemon mode for outgoing calls and muzzle.
- * Asynchronous queue manager and sessions (both incoming and outgoing).
- * Built-in fast nodelist compiler.
- * Built-in utility for managing outbound.
- * Substitutions (substs) including ip addresses and hidden-lines setup.
- * Dynamic configuration - the ability to change most of the configuration parameters
-   on the fly depending on numerous conditions.
- * Ability to limit the time for the session.
- * Supports WaZOO-and SRIF-compatible freq processors.
- * Supports all kinds of local file and path names transformations
- * Ability to limit the minimum speed of a connection.
- * Ability to pass / retent incoming files.
- * Live Chat (Hydra, Z * and Binkp).
+ * Протоколы EMSI: ZModem, ZedZap, Hydra (Std, 4k, 8k, 16k), Janus; Binkp.
+ * Поддержка 4D Binkley-Style, Amiga-style outbound, FileBoxes, LongNameBoxes.
+ * "Морда" - программа, позволяющая управлять работой мейлера (ncurses based).
+ * Режим демона для исходящих звонков и морды.
+ * Асинхронная работа менеджера очереди и сессий(как входящих, так и исходящих).
+ * Встроенный быстрый компилятор нодлистов c маленькими индексами.
+ * Встроенная утилита для работы с аутбаундом, более удобная, т.к. следит за
+   состоянием bsy и csy файлов.
+ * Подстановки (substs) с поддержкой ip и hidden-линий.
+ * Проверка файл-флагов запрета исходящих звонков на портах.
+ * Встроенная "гляделка" нодлиста и аутбаунда.
+ * Динамическая конфигурация - возможность изменять большинство параметров
+   конфига во время работы в зависимости от различных условий.
+ * Возможность ограничения времени на сессию.
+ * Поддержка WaZOO- и SRIF-совместимых фрекпроцессоров.
+ * Поддержка всевозможных преобразований локальных и посылаемых путей и имён
+   файлов (поддержка досовских аутбаундов и т.д.).
+ * Возможность ограничения минимальной скорости коннекта.
+ * Возможность пропуска/задерживания входящих файлов.
+ * Чат (на Hydra, Z* и Binkp).
  * Perl-hooks.
 
 Building & Installation
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+   Optional:
+   $ mkdir ../obj_qicoxe
+   $ cd ../obj_qicoxe
    
-   $ autoupdate 
-   $ ./autogen.sh
-   $ ./configure --help
-   $ ./configure [options desired]
+   $ [path_to/]configure --help
+   $ [path_to/]configure [нужные опции]
    $ make
-   $ sudo make install
+   $ make install или make install-strip
 
-  Edit qico.conf, qico.passwd, qico.substs to fit your needs.
-  Default configuration files location is /usr/local/etc,
-  you may feed your own config file using -I option.
+   Положить конфиг в нужное место, подправить его под свои нужды.
   
 Using
 ~~~~~
- * For outgoing sessions it is enough to run qico -d, you may set your own
-   systemd service like so:
-   File: /etc/systemd/system/qico.service:
+ * Для исходящих достаточно запускать qico -d из какого-нибудь startup-скрипта,
+   а poll'ы генерить по cron'у.
+ * Для входящих (в случае mgetty) необходимо вписать следующую строчку в
+   login.config (mgetty должен быть собран с -DFIDO):
+       /FIDO/  $USER $USER $BINDIR/qico -a @
+   где $USER и $BINDIR значения соответствующих переменных из CONFIG.
+ * Можно ещё прописать в inetd.conf для ответа по tcp/ip ifcico и(или) binkp.
+ * qcc. Все кнопки регистрозависимы, краткую справку можно получить, нажав F1.
+   Там всё очень кратко/малопонятно, поэтому постараюсь объяснить тут.
+   Если в хелпе написана одна кнопка, то надо жать именно её. В командах
+   смены статуса кнопка в нижнем регистре сбрасывает соответствующий флаг,
+   а кнопка в верхнем регистре (с шифтом) - устанавливает. В командах, где
+   указано по две кнопки (т.е. одна, но в разных регистрах), при нажатии кнопки
+   в нижнем регистре спрашивается адрес, для которого нужно выполнить действие,
+   а при нажатии кнопки в верхнем регистре (с шифтом), в качестве адреса
+   используется текущий адрес (тот, что под курсором).
+   В поле адреса допускается краткая форма записи. Например, если ваш адрес
+   2:5050/125, то при вводе '33' получим адрес 2:5050/33, а при вводе '.12'
+   получим 2:5050/125.12. Поэкспериментируйте сами, разберётесь. ;)
+   Так-же редактор строки ввода запоминает 50 последних набранных строк,
+   прокручивание осуществляется клавишами `вверх' и `вниз', `pgdn` - очистка.
+   В окнах с коннектами можно листать последние 256 строчек лога клавишами
+   up\down\pgup\pgdn\home\end\ins\del. Последние две прокручивают по 2 строки.
+   В главном окне лог не листается. В чатовом окне, надеюсь, всё и так понятно.
    
-   [Unit]
-   Description=Qico Mailer
+Notes
+~~~~~
+ # Поддерживается _только_ 4D BSO, т.к. 5D имхо и нафиг не нужен - только
+   глюки плодить. При ftn-style софте потери совсем незаметно, а для гейта,
+   если хочется f56.n34.z12.othernet.org, а не f56.n34.z12.fidonet.org, то
+   можно юзать domtrans. И потом, не забывайте про сим- и хардлинки ;)
    
-   [Service]
-   User=<username>
-   Group=<group name>
-   ExecStart=/usr/local/sbin/qico -I <path to qico.conf>/qico.conf -d
-   ExecReload=/bin/kill -HUP $MAINPID
+ # .REQ является поводом для звонка и аналогичен паре .REQ+.FLO для ifcico.
    
-   [Install]
-   WantedBy=multi-user.target
+ # Структура .QST:
+   <N попытки> <флаги> <время окончания холда> <время окончания undial>
+  SP: В случае использования режима ND протокола Binkp, после этих параметров
+   могут быть ещё несколько. они должны просто игнорироваться.
    
-   ... and generate polls on cron using qctl tool.
+ # Все временные промежутки могут быть указаны как в формате d.hh:mm-d.hh:mm
+   (дни и/или минуты могут быть опущены), тогда они воспринимаются как
+   локальное время, так и в формате Txy, тогда они считаются относительно UTC.
+   Вместо 00:00-23:59 можно просто написать CM, вместо 0:00-0:00 - Never
+   Можно написать несколько промежутков через запятую.
+   В условиях также можно использовать промежутки в формате ifcico (иногда
+   это удобнее).
    
- * For incoming modem calls(if mgetty) you'll need to set up mgetty like so:
-   File: login.config:
+ # Чтобы описать хиддены, просто пропишите несколько subst'ов для одного адреса.
+   Нодлистовая линия в этом случае игнорируется, так что её надо тоже прописать
+   как subst.
    
-       / FIDO / $USER $USER $BINDIR/qico -I <path to qico.conf>/qico.conf -a @
+ # Команда qctl -f или f в qcc выдают информацию _только_ из нодлиста, без
+   учёта subst'ов!
 
-   where $ USER and $ BINDIR are values of those variables of CONFIG.
-   mgetty has to be built with -DFIDO option (take a look into mgetty documentation).
+ # Если у вас совсем нет никаких листов и они и не нужны, все равно придётся
+   прописать хотя бы один (хоть и несуществующий) лист и создать пустой
+   индекс, запустив 'qico -n'.
 
- * Qico doesn't handle incoming IP sessions on itself, but you can register it in inetd
-   or xinetd to accept incoming tcp/ip ifcico and (or) binkp connections.
-   Following is the example of xinetd setup:
+ # Если нужно перечитать конфиги, не делайте "killall -HUP qico", т.к. это
+   загасит все открытые сессии ;) Правильнее делать qctl -R.
+   Это также относится и к "killall qico"/"qctl -q".
+  SP: открытые сессии не гасятся, но управление ими стаёт невозможным.
+   а вообще, можно просто нажать `R' в qcc, конфиги нормально перечитаются.
    
-   File: /etc/services:
+ # Вся информация, которая используется для проверки условий в конфиге
+   до emsi берётся из нодлиста и subst'ов, а после - из полученного emsi.
    
-   ...
-   binkp      24554/tcp
-   ifcico     60179/tcp
-   ...
+ # В качестве фрекпроцессора можно взять мой же ifextrp-pk (лежит там же,
+   где и qico) или оригинальный ifextrp by Serge Oskin.
+  SP: а теперь появилась возможность использовать SRIF-совместимые
+   фрекпроцессоры, которые обычно более функциональны.
 
+ # "History" сделана для быстрой и лёгкой генерации статистики (должно хватать
+   одного awk). Формат следующий (одна строка - одна сессия):
+   <line>,<time>,<length>,<address>,[P][L]{I|O}{1|0},<sent_bytes>,<recd_bytes>
+   где <line> - терминал или tcpip для tcp/ip-сессий
+       <time> и <length> - в секундах (unix time)
+       P - protected, L - listed,
+       I/O - inbound/outbound,
+       1/0 - successful/failed
    
-   File: /etc/xinetd.d/binkp
+ # FileBox'ы сделаны по аналогии с ifcico - файлы из них отдаются в самом конце,
+   poll'а не вызывают, после успешной передачи удаляются. Обрабатываются
+   только обычные файлы и симлинки. LongNameBox'ы - тоже самое, только
+   просматривается каталог с именем вида '$longboxpath/zone.net.node.point'.
+  SP: теперь кика понимает флаворы боксов, т.е. zone.net.node.point.flavor.
+   флаворы d,f,n,i,c вызывают полл, h - не вызывает. если флавор не указан,
+   то его значение берётся из слова `defboxflv'.
    
-   service binkp
-   {
-      flags             = REUSE
-      socket_type       = stream
-      wait              = no
-      user              = <username>
-      server            = /usr/local/sbin/qico
-      server_args       = -I <path to qico.conf>/qico.conf -a binkp
-      log_on_failure    += USERID
-      disable           = no
-   }
+ # Прочитайте внимательно верхушку конфига насчёт условий! Эта штука позволяет
+   разделить логи/инбаунды/аутбаунды/прятать или добавлять разные aka
+   для разных линий и/или в зависимости от времени, удалённого адреса, телефона
+   CID'а и т.д. Короче, на каждую комбинацию условий у вас фактически будет
+   отдельный конфиг.
    
-   service ifcico
-   {
-      flags             = REUSE
-      socket_type       = stream
-      wait              = no
-      user              = <username>
-      server            = /usr/local/sbin/qico
-      server_args       = -I <path to qico.conf>/qico.conf -a auto
-      log_on_failure    += USERID
-      disable           = no
-   } 
+ # Догадываюсь, что описание опции mapout в конфиге более чем туманно, так что
+   попробую объяснить по-русски ;) Итак, преобразования имён делятся на два
+   типа - преобразование локальных имён, которые будут открываться для
+   пересылки и имён, под которыми файлы получит удалённая сторона.
+   Преобразования, заданные большими буквами + mappath влияют только на
+   локальное имя, их надо подогнать так, чтобы файлы прописанные в лошках
+   мейлер мог открыть, а остальные преобразования можно уже настроить так, как
+   вам хочется, чтобы ремота получала файлы.
    
-   Don't forget to start xinetd service.
+Download
+~~~~~~~~
 
+XE:
+ cvs: cvs -d:pserver:anonymous:@cvs.todes.by:/cvsroot login
  
- * Qcc.
-   Qcc stangs for Qico Control Center. It's the tool you can use to control your
-   running qico daemon, reread configs, create polls, manage the queue and so on.
+ !!! Внимание: в current может лежать неработающая версия. !!!
+ current:
+      cvs -d:pserver:anonymous@cvs.todes.by:/cvsroot co qicoxe
+ stable:
+      cvs -d:pserver:anonymous@cvs.todes.by:/cvsroot co -r xe-0_57-r1 qicoxe
    
-   All hotkeys are case sensitive, brief summary can be accessed by pressing F1.
-   For flag switches uppercase hotkey will set the flag and the lowercase will
-   clear the corresponding flag.
    
-   Address field will accept shortened addresses.
-   Input line editor remembers the last 50 lines. Scroll over the history using arrow keys.
+current:
+ web: http://www.sf.net/projects/qico -> files -> qico-0.55si.tar.bz2
+ cvs: cvs -d:pserver:anonymous@cvs.sf.net:/cvsroot/qico login
+      cvs -d:pserver:anonymous@cvs.sf.net:/cvsroot/qico co qicosi
 
-Notes
-~~~~~
-# Qico only Supports 4D BSO.
+stable:
+ web: http://www.sf.net/projects/qico -> files -> qico-0.54si.tar.bz2
+ cvs: cvs -d:pserver:anonymous@cvs.sf.net:/cvsroot/qico login
+      cvs -d:pserver:anonymous@cvs.sf.net:/cvsroot/qico co -r stbl54 qicosi
 
- #. REQ is the reason for the call. REQ +. FLO for ifcico.
-
- # qctl -f or f in qcc information will only mention nodelist, ignoring substs!
-
-# If you have absolutely no sheets and they are not needed, you still have
-   register at least one (though non-existent) and create an empty sheet
-   index by running 'qico-n'.
-
- # If you want to reread configuration files, don't go "killall-HUP qico", because it
-   will interrupt all running sessions. Do qctl -R instead.
-   This also applies to "killall qico" / "qctl -q".
-
- # All the information used to check session conditions first obtained from nodelist and
-   substs, and then from session EMSI.
-
-# You can use ifextrp-pk (bundled) as freq processor. It is also possible to use any
-  SRIF-compatible freq processor that is typically more functional.
-
- # "History" file is crated for quick and easy statistics generation (just awk should
- be enough). Simple stat generator is bundled with qico. History file format 
- (one line - one session):
-   <line>, <time>, <length>, <address>, [P] [L] {I | O} {1 | 0}, <sent_bytes>, <recd_bytes>
-   where <line> - terminal or tcpip for tcp / ip-sessions
-       <time> and <length> - in seconds (unix time)
-       P - protected, L - listed,
-       I / O - inbound / outbound,
-       1/0 - successful / failed
-
-
-Download
-~~~~~~~~
-git clone https://github.com/uncleeugene/qico.git
-
 Authors
 ~~~~~~~
 Pavel Kurnosoff, 2:5030/736.25, pqr@yasp.com, icq 45906870 (up to 0.45pl3.1)
 Lev Serebryakov, 2:5030/661, lev@serebryakov.spb.ru, icq 3670018 (up to 0.49.9)
 Cyril Margorin, 2:5020/2999.18, cyrilm@tower.pp.ru (official branch)
 Stepan Pologov, 2:467/126.125, sisoft@bk.ru (current)
+
 Mitry Matyushkov, 2:450/1024, r45c at mail dot ru (XE Maintainer)
-Robert James Clay, 1:120/544, jame@rocasa.us (after 0.57.1)
-ru.qico members made some contribution to this particular fork.
 
-
-
+/* $Id: README 18 2010-08-23 15:50:49Z semik $ */
Only in ./qico: README.ru
Only in ./qico: TODO
diff -burw ./qico/autogen.sh ./trunk/autogen.sh
--- ./qico/autogen.sh	2024-02-01 18:09:52.526695000 +0300
+++ ./trunk/autogen.sh	2024-02-01 18:10:34.615685000 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# $Id: autogen.sh,v 1.6 2005/08/21 04:16:41 mitry Exp $
+# $Id: autogen.sh 40 2012-12-26 08:28:44Z semik $
 #
 # Run this to update & generate all the automatic things
 # (thanks spamass-milter for idea)
@@ -9,7 +9,7 @@
 # hack because some OSes (cough RedHat cough) default to 2.13 even
 # though a perfectly good 2.5x is available
 AC=
-for i in 259 -2.59 258 -2.58 257 -2.57 256 -2.56 255 -2.55 2.55 254 -2.54 2.54 253 -2.53 2.53
+for i in -2.69 261 -2.61 260 -2.60 259 -2.59 258 -2.58 257 -2.57 256 -2.56 255 -2.55 2.55 254 -2.54 2.54 253 -2.53 2.53
 do
     if type autoconf$i >/dev/null 2>&1 ; then 
         AC=$i ; echo detected autoconf$AC ; break
@@ -21,7 +21,7 @@
 fi
 
 AM=
-for i in 19 -1.9 18 -1.8 17 -1.7 1.6 -1.6 15 -1.5
+for i in 110 -1.10 19 -1.9 18 -1.8 17 -1.7 1.6 -1.6 15 -1.5
 do
     if type automake$i >/dev/null 2>&1 ; then 
         AM=$i ; echo detected automake$AM ; break
@@ -38,8 +38,11 @@
 AUTOM4TE=autom4te$AC ; export AUTOM4TE
 ACLOCAL=aclocal$AM ; export ACLOCAL
 AUTOMAKE=automake$AM ; export AUTOMAKE
+AUTOUPDATE=autoupdate$AC; export AUTOUPDATE
 
 rm -rf autom4te* 2>/dev/null
+echo ===== $AUTOUPDATE
+$AUTOUPDATE -f
 echo ===== $ACLOCAL
 $ACLOCAL -I .
 echo ===== $AUTOHEADER
@@ -48,6 +51,5 @@
 $AUTOMAKE --copy --add-missing --force-missing
 echo ===== $AUTOCONF
 $AUTOCONF --force
-echo -n "cleaning up... "
-rm -rf autom4te* 2>/dev/null
 echo done.
+
Only in ./qico: cmake
Only in ./trunk: compile
Only in ./qico: config.cmake.h
Only in ./qico: configure.ac
Only in ./trunk: configure.in
diff -burw ./qico/cvs_com ./trunk/cvs_com
--- ./qico/cvs_com	2024-02-01 18:09:52.527132000 +0300
+++ ./trunk/cvs_com	2024-02-01 18:10:34.638896000 +0300
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvs_com,v 1.9 2004/06/09 22:25:49 sisoft Exp $
+# $Id: cvs_com 18 2010-08-23 15:50:49Z semik $
 if(-e "ChangeLog") {
     open(X,"new")||die("can't open 'new'\n");
     open(F,"TodayFixes")||die("can't open TodayFixes\n");
@@ -18,9 +18,10 @@
     close(X,F);
     unlink("ChangeLog");
 }
-system("cvs2cl -F trunk -I ChangeLog -I TodayFixes -I cvsdate.h --no-wrap -S");
+system("cvs2cl.pl -r -F trunk -I ChangeLog -I TodayFixes -I cvsdate.h -I 1234 -I cvs_com --no-wrap -S");
 exit if($?>>8);
 unlink("ChangeLog.bak");
 system('date +\'char cvsdate[]="%Y-%m-%d %H:%M";\' >src/cvsdate.h');
+#date +'char cvsdate[]="%Y-%m-%d %H:%M";' >src/cvsdate.h
 system("cvs com -F new");
 unless($?>>8){truncate("new",0);}
diff -burw ./qico/debian/changelog ./trunk/debian/changelog
--- ./qico/debian/changelog	2024-02-01 18:09:52.527290000 +0300
+++ ./trunk/debian/changelog	2024-02-01 18:10:34.595860000 +0300
@@ -1,21 +1,3 @@
-qico (0.59.1-1~2) UNRELEASED; urgency=low
-
-  * New upstream release.
-  * Change debhelper version from '5' to '8'.
-  * Explicitly mark package format as '3.0 (quilt)'.
-  * Remove reference to 'xe' branch from description in debian/control.
-
- -- Robert James Clay <jame@rocasa.us>  Fri, 15 May 2014 13:52:24 -0400
-
-qico (0.57.2xe-1) stable; urgency=low
-
-  * New maintainer.
-  * Update/correct distclean command in debian/rules.
-  * Update debhelper compatibility to 5 in debian/compat.
-  * Update debhelper Build-Depends in debian/control to >= 5.0.
-
- -- Robert James Clay <jame@rocasa.us>  Sat, 12 Jan 2013 23:08:52 -0500
-
 qico (0.57.1xe-1) unstable; urgency=low
 
   * New upstream release
diff -burw ./qico/debian/compat ./trunk/debian/compat
--- ./qico/debian/compat	2024-02-01 18:09:52.527335000 +0300
+++ ./trunk/debian/compat	2024-02-01 18:10:34.615943000 +0300
@@ -1 +1 @@
-8
+4
diff -burw ./qico/debian/control ./trunk/debian/control
--- ./qico/debian/control	2024-02-01 18:09:52.527391000 +0300
+++ ./trunk/debian/control	2024-02-01 18:10:34.594748000 +0300
@@ -1,8 +1,8 @@
 Source: qico
 Section: net
 Priority: optional
-Maintainer: Robert James Clay <jame@rocasa.us>
-Build-Depends: debhelper (>= 8.0), libncurses-dev
+Maintainer: Kaliuta Yauheni <y.kaliuta@gmail.com>
+Build-Depends: debhelper (>> 4.2), libncurses-dev
 Standards-Version: 3.6.2
 
 Package: qico-common
@@ -12,7 +12,7 @@
  It includes such features as: dynamic configuration, color ncurses
  frontend, chat, outbound manager, perl. Supported emsi and
  binkp protocols over modem and(or) tcp/ip. It uses Binkley
- and Amiga-style outbounds.
+ and Amiga-style outbounds. It is an "xe" branch of qico.
  .
  This package contains common directory structure, scripts and
  documentation.
@@ -20,11 +20,24 @@
 Package: qico
 Architecture: any
 Depends: qico-common, ${shlibs:Depends}
+Conflicts: qico-qcc
 Description: FTN compatible mailer with many features
  It includes such features as: dynamic configuration, color ncurses
  frontend, chat, outbound manager, perl. Supported emsi and
  binkp protocols over modem and(or) tcp/ip. It uses Binkley
- and Amiga-style outbounds.
+ and Amiga-style outbounds. It is an "xe" branch of qico.
  .
  This binary package is built without frontend support, good for
  servers.
+
+Package: qico-qcc
+Architecture: any
+Depends: qico-common, ${shlibs:Depends}
+Conflicts: qico
+Description: FTN compatible mailer with many features
+ It includes such features as: dynamic configuration, color ncurses
+ frontend, chat, outbound manager, perl. Supported emsi and
+ binkp protocols over modem and(or) tcp/ip. It uses Binkley
+ and Amiga-style outbounds. It is an "xe" branch of qico.
+ .
+ This is a full version with frontend support.
diff -burw ./qico/debian/copyright ./trunk/debian/copyright
--- ./qico/debian/copyright	2024-02-01 18:09:52.527479000 +0300
+++ ./trunk/debian/copyright	2024-02-01 18:10:34.616658000 +0300
@@ -1,32 +1,17 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Qico
-Source: http://qico.sourceforge.net/index.html
-Upstream-Contact: Robert James Clay <jame@rocasa.us>
-Comment: Stepan Pologov, sisoft@bk.ru, 2:467/126.125
+This package was debianized by Kaliuta Yauheni <y.kaliuta@gmail.com> on
+Tue, 23 Aug 2005 15:47:59 +0300
+
+It was downloaded from http://193.232.248.13:8080/qicoxe/
+
+Copyright:
+
+Stepan Pologov, sisoft@bk.ru, 2:467/126.125
 Cyril Margorin, cyrilm@tower.pp.ru, 2:5020/2999.18 (official branch)
 Lev Serebryakov, lev@serebryakov.spb.ru, 2:5030/661, icq 3670018 (up to 0.49.9)
 Pavel Kurnosoff, pqr@yasp.com, 2:5030/736.25, icq 45906870 (up to 0.45pl3.1)
+
   Mitry Matyushkov, <r45c at mail dot ru>, 2:450/1024 (XE Maintainer)
-  Robert James Clay, <jame at rocasa dot us>, 1:120/544 (after 0.57.1xe)
 
-Files: *
-Copyright: 2013-2015 Robert James Clay <jame@rocasa.us>
- 2004-2005 Mitry Matyushkov, <r45c@mail.ru>
- 2003-2004 Stepan A. Pologov <sisoft@bk.ru>
-      2003 Cyril Margorin <cyrilm@tower.pp.ru>
-      2003 Sir Raorn <raorn@users.sourceforge.net>
- 2001-2002 Eugeny Korekin <aaz@users.sourceforge.net> 
- 2000-2002 Lev Serebryakov <lev@serebryakov.spb.ru>
-License:  BSD-4-clause
-
-Files: debian/*
-Copyright: 2013-2015 Robert James Clay <jame@rocasa.us>
- 2004-2005 Mitry Matyushkov, <r45c@mail.ru>
-      2005 Kaliuta Yauheni <y.kaliuta@gmail.com>
- 2003-2004 Stepan A. Pologov <sisoft@bk.ru>
-License: BSD-4-clause
-
-License: BSD-4-clause
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
diff -burw ./qico/debian/qico-common.init ./trunk/debian/qico-common.init
--- ./qico/debian/qico-common.init	2024-02-01 18:09:52.527642000 +0300
+++ ./trunk/debian/qico-common.init	2024-02-01 18:10:34.593880000 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 # initscript for qico.
-# $Id: qico-common.init,v 1.2 2005/08/23 16:21:29 mitry Exp $
+# $Id: qico-common.init 18 2010-08-23 15:50:49Z semik $
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/usr/sbin/qico
Only in ./trunk/debian: qico-qcc.dirs
Only in ./trunk/debian: qico-qcc.install
diff -burw ./qico/debian/qico.install ./trunk/debian/qico.install
--- ./qico/debian/qico.install	2024-02-01 18:09:52.527887000 +0300
+++ ./trunk/debian/qico.install	2024-02-01 18:10:34.601032000 +0300
@@ -1,3 +1,2 @@
 debian/tmp/qico/qico usr/sbin
 debian/tmp/qico/qctl usr/bin
-debian/tmp/qico/qcc usr/bin
diff -burw ./qico/debian/rules ./trunk/debian/rules
--- ./qico/debian/rules	2024-02-01 18:09:52.527948000 +0300
+++ ./trunk/debian/rules	2024-02-01 18:10:34.616180000 +0300
@@ -1,29 +1,38 @@
 #!/usr/bin/make -f
 
-configure-options := --prefix=/usr --sysconfdir=/etc/qico --disable-notify --enable-hydra8k --enable-perl --with-config=/etc/qico/qico.conf
+configure-options := --prefix=/usr --sysconfdir=/etc/qico --disable-notify --enable-hydra8k
 
 TMPDIR := $(CURDIR)/debian/tmp
 
-build: build-stamp-qico
+build: build-stamp-qico build-stamp-qico-qcc
 
 build-stamp-qico:
 	dh_testdir
 	[ -d $(TMPDIR)/qico ] || mkdir -p $(TMPDIR)/qico
-	./autogen.sh
-	./configure $(configure-options)
+	./configure $(configure-options) --disable-qcc
 	$(MAKE)
 	cp src/qico $(TMPDIR)/qico
 	cp src/qctl $(TMPDIR)/qico
-	cp src/qcc $(TMPDIR)/qico
 
 	touch build-stamp-qico
 
+build-stamp-qico-qcc:
+	dh_testdir
+	[ -d $(TMPDIR)/qico-qcc ] || mkdir $(TMPDIR)/qico-qcc
+	./configure $(configure-options)
+	$(MAKE)
+	cp src/qico $(TMPDIR)/qico-qcc
+	cp src/qctl $(TMPDIR)/qico-qcc
+	cp src/qcc $(TMPDIR)/qico-qcc
+
+	touch build-stamp-qico-qcc
+
 clean:	
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp-qico
+	rm -f build-stamp-qico build-stamp-qico-qcc
 	rm -rf $(TMPDIR)
-	[ ! -f Makefile ] || $(MAKE) distclean
+	-$(MAKE) distclean
 	dh_clean
 
 binary-indep:
@@ -46,8 +55,10 @@
 	dh_testroot
 	dh_installdirs -a
 	dh_install -a
+	dh_installman -pqico man/qctl.8 man/qico.8
 	dh_link -pqico usr/share/doc/qico-common usr/share/doc/qico 
-	dh_installman -pqico man/qctl.8 man/qico.8 man/qcc.8
+	dh_installman -pqico-qcc man/qctl.8 man/qico.8 man/qcc.8
+	dh_link -pqico-qcc usr/share/doc/qico-common usr/share/doc/qico-qcc
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
Only in ./qico/debian: source
diff -burw ./qico/freebsd/Makefile ./trunk/freebsd/Makefile
--- ./qico/freebsd/Makefile	2024-02-01 18:09:52.528174000 +0300
+++ ./trunk/freebsd/Makefile	2024-02-01 18:10:34.688934000 +0300
@@ -1,17 +1,17 @@
-# New ports collection makefile for:    qico
+# New ports collection makefile for:	qicosi
 # Date created:                         26 May 2004
 # Whom:                                 Andrey Slusar <vasallia@ukr.net>
-# Date updated:                         27 May 2013
-# Whom:                                 Robert James Clay <jame@rocasa.us>
+#
+# $FreeBSD: ports/comms/qicosi/Makefile,v 1.22 2005/04/12 03:24:59 obrien Exp $
+#
 
-
-PORTNAME=       qico
-PORTVERSION=    0.59.1
+PORTNAME=	qicosi
+PORTVERSION=	0.57.1
 CATEGORIES=     comms
-MASTER_SITES=   http://qico.sourceforge.net
-DISTNAME=       qico-${PORTVERSION}
+MASTER_SITES=	http://193.232.248.13:8080/qicoxe/
+DISTNAME=	qico-${PORTVERSION}xe
 
-MAINTAINER=     jame@rocasa.us
+MAINTAINER=	anrays@gmail.com
 COMMENT=	Ip/modem fido compatible mailer
 
 USE_BZIP2=	yes
diff -burw ./qico/freebsd/pkg-descr ./trunk/freebsd/pkg-descr
--- ./qico/freebsd/pkg-descr	2024-02-01 18:09:52.528223000 +0300
+++ ./trunk/freebsd/pkg-descr	2024-02-01 18:10:34.688472000 +0300
@@ -1,2 +1,2 @@
-Qico is a simple ifcico like FTN mailer. It can work via TCP/IP
+Qicoxe is a simple ifcico like FTN mailer. It can work via TCP/IP
 as well as on modem links. Look at sample configs for more information.
Only in ./trunk: gentoo
diff -burw ./qico/lib/Makefile.am ./trunk/lib/Makefile.am
--- ./qico/lib/Makefile.am	2024-02-01 18:09:52.528390000 +0300
+++ ./trunk/lib/Makefile.am	2024-02-01 18:10:34.639169000 +0300
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2005/03/28 15:03:44 mitry Exp $
+# $Id: Makefile.am 18 2010-08-23 15:50:49Z semik $
 
 EXTRA_LIBRARIES = libdlmalloc.a
 
diff -burw ./qico/lib/dlmalloc.c ./trunk/lib/dlmalloc.c
--- ./qico/lib/dlmalloc.c	2024-02-01 18:09:52.530089000 +0300
+++ ./trunk/lib/dlmalloc.c	2024-02-01 18:10:34.663003000 +0300
@@ -1570,8 +1570,7 @@
 
 #endif
 
-Void_t* public_mALLOc(size_t bytes)
-{
+Void_t* public_mALLOc(size_t bytes) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1582,8 +1581,7 @@
     return m;
 }
 
-void public_fREe(Void_t* m)
-{
+void public_fREe(Void_t* m) {
   if (MALLOC_PREACTION != 0) {
     return;
   }
@@ -1592,8 +1590,7 @@
     }
 }
 
-Void_t* public_rEALLOc(Void_t* m, size_t bytes)
-{
+Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
   if (MALLOC_PREACTION != 0) {
     return 0;
   }
@@ -1603,8 +1600,7 @@
     return m;
 }
 
-Void_t* public_mEMALIGn(size_t alignment, size_t bytes)
-{
+Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1615,8 +1611,7 @@
     return m;
 }
 
-Void_t* public_vALLOc(size_t bytes)
-{
+Void_t* public_vALLOc(size_t bytes) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1627,8 +1622,7 @@
     return m;
 }
 
-Void_t* public_pVALLOc(size_t bytes)
-{
+Void_t* public_pVALLOc(size_t bytes) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1639,8 +1633,7 @@
     return m;
 }
 
-Void_t* public_cALLOc(size_t n, size_t elem_size)
-{
+Void_t* public_cALLOc(size_t n, size_t elem_size) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1652,8 +1645,7 @@
 }
 
 
-Void_t** public_iCALLOc(size_t n, size_t elem_size, Void_t** chunks)
-{
+Void_t** public_iCALLOc(size_t n, size_t elem_size, Void_t** chunks) {
   Void_t** m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1664,8 +1656,7 @@
     return m;
 }
 
-Void_t** public_iCOMALLOc(size_t n, size_t sizes[], Void_t** chunks)
-{
+Void_t** public_iCOMALLOc(size_t n, size_t sizes[], Void_t** chunks) {
   Void_t** m;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1676,8 +1667,7 @@
     return m;
 }
 
-void public_cFREe(Void_t* m)
-{
+void public_cFREe(Void_t* m) {
   if (MALLOC_PREACTION != 0) {
     return;
   }
@@ -1686,8 +1676,7 @@
     }
 }
 
-int public_mTRIm(size_t s)
-{
+int public_mTRIm(size_t s) {
   int result;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1698,8 +1687,7 @@
     return result;
 }
 
-size_t public_mUSABLe(Void_t* m)
-{
+size_t public_mUSABLe(Void_t* m) {
   size_t result;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -1710,8 +1698,7 @@
     return result;
 }
 
-void public_mSTATs()
-{
+void public_mSTATs() {
   if (MALLOC_PREACTION != 0) {
     return;
   }
@@ -1720,8 +1707,7 @@
     }
 }
 
-struct mallinfo public_mALLINFo()
-{
+struct mallinfo public_mALLINFo() {
   struct mallinfo m;
   if (MALLOC_PREACTION != 0) {
     struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -1733,8 +1719,7 @@
     return m;
 }
 
-int public_mALLOPt(int p, int v)
-{
+int public_mALLOPt(int p, int v) {
   int result;
   if (MALLOC_PREACTION != 0) {
     return 0;
@@ -2183,14 +2168,11 @@
   Compute index for size. We expect this to be inlined when
   compiled with optimization, else not, which works out well.
 */
-static int largebin_index(unsigned int sz)
-{
+static int largebin_index(unsigned int sz) {
     unsigned int  x = sz >> SMALLBIN_WIDTH;
     unsigned int m;            /* bit position of highest set bit of m */
 
-    if (x >= 0x10000) {
-        return NBINS-1;
-    }
+  if (x >= 0x10000) return NBINS-1;
 
   /* On intel, use BSRL instruction to find highest bit */
 #if defined(__GNUC__) && defined(i386)
@@ -2585,14 +2567,16 @@
                 assert(((char*)p) >= min_address);
                 assert(((char*)p + sz) <= ((char*)(av->top)));
             }
-        } else {
+    }
+    else {
             /* top size is always at least MINSIZE */
             assert((CHUNK_SIZE_T)(sz) >= MINSIZE);
             /* top predecessor always marked inuse */
             assert(prev_inuse(p));
         }
 
-    } else {
+  }
+  else {
 #if HAVE_MMAP
     /* address is outside main heap  */
     if (contiguous(av) && av->top != initial_top(av)) {
@@ -2631,7 +2615,8 @@
     assert (!chunk_is_mmapped(p));
 
     /* Unless a special marker, must have OK fields */
-    if ((CHUNK_SIZE_T)(sz) >= MINSIZE) {
+  if ((CHUNK_SIZE_T)(sz) >= MINSIZE)
+  {
     assert((sz & MALLOC_ALIGN_MASK) == 0);
     assert(aligned_OK(chunk2mem(p)));
     /* ... matching footer field */
@@ -2643,10 +2628,10 @@
         /* ... and has minimally sane links */
         assert(p->fd->bk == p);
         assert(p->bk->fd == p);
-    } else { /* markers are always of size SIZE_SZ */
+  }
+  else /* markers are always of size SIZE_SZ */
         assert(sz == SIZE_SZ);
     }
-}
 
 /*
   Properties of inuse chunks
@@ -2662,9 +2647,8 @@
     mchunkptr next;
     do_check_chunk(p);
 
-    if (chunk_is_mmapped(p)) {
+  if (chunk_is_mmapped(p))
         return;    /* mmapped chunks have no next/prev */
-    }
 
   /* Check whether it claims to be in use ... */
   assert(inuse(p));
@@ -2685,10 +2669,10 @@
     if (next == av->top) {
         assert(prev_inuse(next));
         assert(chunksize(next) >= MINSIZE);
-    } else if (!inuse(next)) {
+  }
+  else if (!inuse(next))
         do_check_free_chunk(next);
     }
-}
 
 /*
   Properties of chunks recycled from fastbins
@@ -2697,8 +2681,7 @@
 #if __STD_C
 static void do_check_remalloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
 #else
-static void do_check_remalloced_chunk(p, s) mchunkptr p;
-INTERNAL_SIZE_T s;
+static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
 #endif
 {
   INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
@@ -2722,8 +2705,7 @@
 #if __STD_C
 static void do_check_malloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
 #else
-static void do_check_malloced_chunk(p, s) mchunkptr p;
-INTERNAL_SIZE_T s;
+static void do_check_malloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
 #endif
 {
   /* same as recycled case ... */
@@ -2775,9 +2757,8 @@
     assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0);
 
     /* cannot run remaining checks until fully initialized */
-    if (av->top == 0 || av->top == initial_top(av)) {
+  if (av->top == 0 || av->top == initial_top(av))
         return;
-    }
 
   /* pagesize is a power of 2 */
   assert((av->pagesize & (av->pagesize-1)) == 0);
@@ -2793,9 +2774,8 @@
         p = av->fastbins[i];
 
         /* all bins past max_fast are empty */
-        if (i > max_fast_bin) {
+    if (i > max_fast_bin)
             assert(p == 0);
-        }
 
     while (p != 0) {
       /* each chunk claims to be inuse */
@@ -2807,11 +2787,10 @@
         }
     }
 
-    if (total != 0) {
+  if (total != 0)
         assert(have_fastchunks(av));
-    } else if (!have_fastchunks(av)) {
+  else if (!have_fastchunks(av))
         assert(total == 0);
-    }
 
   /* check normal bins */
   for (i = 1; i < NBINS; ++i) {
@@ -2821,12 +2800,11 @@
         if (i >= 2) {
             binbit = get_binmap(av,i);
             empty = last(b) == b;
-            if (!binbit) {
+      if (!binbit)
                 assert(empty);
-            } else if (!empty) {
+      else if (!empty)
                 assert(binbit);
             }
-        }
 
     for (p = last(b); p != b; p = p->bk) {
       /* each chunk claims to be free */
@@ -2848,11 +2826,10 @@
             for (q = next_chunk(p);
                     (q != av->top && inuse(q) &&
                      (CHUNK_SIZE_T)(chunksize(q)) >= MINSIZE);
-                    q = next_chunk(q)) {
+           q = next_chunk(q))
                 do_check_inuse_chunk(q);
             }
         }
-    }
 
   /* top chunk is OK */
   check_chunk(av->top);
@@ -2887,8 +2864,7 @@
 #if __STD_C
 static Void_t* sYSMALLOc(INTERNAL_SIZE_T nb, mstate av)
 #else
-static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb;
-mstate av;
+static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
 #endif
 {
   mchunkptr       old_top;        /* incoming value of av->top */
@@ -2970,7 +2946,8 @@
                     p = (mchunkptr)(mm + correction);
                     p->prev_size = correction;
                     set_head(p, (size - correction) |IS_MMAPPED);
-                } else {
+        }
+        else {
           p = (mchunkptr)mm;
           p->prev_size = 0;
           set_head(p, size|IS_MMAPPED);
@@ -2978,18 +2955,15 @@
 
                 /* update statistics */
 
-                if (++av->n_mmaps > av->max_n_mmaps) {
+        if (++av->n_mmaps > av->max_n_mmaps) 
                     av->max_n_mmaps = av->n_mmaps;
-                }
 
                 sum = av->mmapped_mem += size;
-                if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem)) {
+        if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem)) 
                     av->max_mmapped_mem = sum;
-                }
                 sum += av->sbrked_mem;
-                if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) {
+        if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) 
                     av->max_total_mem = sum;
-                }
 
         check_chunk(p);
         
@@ -3033,9 +3007,8 @@
       we don't actually get contiguous space.
     */
 
-    if (contiguous(av)) {
+  if (contiguous(av))
         size -= old_size;
-    }
 
   /*
     Round to a multiple of page size.
@@ -3053,9 +3026,8 @@
       below even if we cannot call MORECORE.
     */
 
-    if (size > 0) {
+  if (size > 0) 
         brk = (char*)(MORECORE(size));
-    }
 
   /*
     If have mmap, try using it as a backup when MORECORE fails or
@@ -3070,14 +3042,12 @@
     if (brk == (char*)(MORECORE_FAILURE)) {
 
         /* Cannot merge with old top, so add its size back in */
-        if (contiguous(av)) {
+    if (contiguous(av))
             size = (size + old_size + pagemask) & ~pagemask;
-        }
 
         /* If we are relying on mmap as backup, then use larger units */
-        if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(MMAP_AS_MORECORE_SIZE)) {
+    if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(MMAP_AS_MORECORE_SIZE))
             size = MMAP_AS_MORECORE_SIZE;
-        }
 
     /* Don't try if size wraps around 0 */
     if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb)) {
@@ -3157,9 +3127,8 @@
                    to foreign calls) but treat them as part of our space for
                    stats reporting.
                 */
-                if (old_size != 0) {
+        if (old_size != 0) 
                     av->sbrked_mem += brk - old_end;
-                }
         
         /* Guarantee alignment of first new chunk made from this space */
 
@@ -3199,7 +3168,8 @@
                     */
                     correction = 0;
                     snd_brk = (char*)(MORECORE(0));
-                } else if (snd_brk < brk) {
+        }
+        else if (snd_brk < brk) {
           /*
             If the second call gives noncontiguous space even though
             it says it won't, the only course of action is to ignore
@@ -3282,14 +3252,12 @@
 
         /* Update statistics */
         sum = av->sbrked_mem;
-        if (sum > (CHUNK_SIZE_T)(av->max_sbrked_mem)) {
+    if (sum > (CHUNK_SIZE_T)(av->max_sbrked_mem))
             av->max_sbrked_mem = sum;
-        }
 
         sum += av->mmapped_mem;
-        if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) {
+    if (sum > (CHUNK_SIZE_T)(av->max_total_mem))
             av->max_total_mem = sum;
-        }
 
     check_malloc_state();
     
@@ -3331,8 +3299,7 @@
 #if __STD_C
 static int sYSTRIm(size_t pad, mstate av)
 #else
-static int sYSTRIm(pad, av) size_t pad;
-mstate av;
+static int sYSTRIm(pad, av) size_t pad; mstate av;
 #endif
 {
   long  top_size;        /* Amount of top-most memory */
@@ -3433,9 +3400,8 @@
       Bypass search if no frees yet
      */
     if (!have_anychunks(av)) {
-        if (av->max_fast == 0) { /* initialization check */
+    if (av->max_fast == 0) /* initialization check */
             malloc_consolidate(av);
-        }
     goto use_top;
   }
 
@@ -3488,10 +3454,9 @@
 
     else {
         idx = largebin_index(nb);
-        if (have_fastchunks(av)) {
+    if (have_fastchunks(av)) 
             malloc_consolidate(av);
         }
-    }
 
   /*
     Process recently freed or remaindered chunks, taking one only if
@@ -3551,7 +3516,8 @@
             victim_index = smallbin_index(size);
             bck = bin_at(av, victim_index);
             fwd = bck->fd;
-        } else {
+    }
+    else {
       victim_index = largebin_index(size);
       bck = bin_at(av, victim_index);
       fwd = bck->fd;
@@ -3561,14 +3527,14 @@
                 if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(bck->bk->size)) {
                     fwd = bck;
                     bck = bck->bk;
-                } else if ((CHUNK_SIZE_T)(size) >=
+        }
+        else if ((CHUNK_SIZE_T)(size) >= 
                            (CHUNK_SIZE_T)(FIRST_SORTED_BIN_SIZE)) {
 
                     /* maintain large bins in sorted order */
                     size |= PREV_INUSE; /* Or with inuse bit to speed comparisons */
-                    while ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(fwd->size)) {
+          while ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(fwd->size)) 
                         fwd = fwd->fd;
-                    }
           bck = fwd->bk;
         }
       }
@@ -3641,9 +3607,8 @@
         /* Skip rest of block if there are no more set bits in this block.  */
         if (bit > map || bit == 0) {
             do {
-                if (++block >= BINMAPSIZE) { /* out of bins */
+        if (++block >= BINMAPSIZE)  /* out of bins */
                     goto use_top;
-                }
       } while ( (map = av->binmap[block]) == 0);
       
       bin = bin_at(av, (block << BINMAPSHIFT));
@@ -3694,9 +3659,8 @@
                 unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder;
                 remainder->bk = remainder->fd = unsorted_chunks(av);
                 /* advertise as last remainder */
-                if (in_smallbin_range(nb)) {
+        if (in_smallbin_range(nb)) 
                     av->last_remainder = remainder;
-                }
         
         set_head(victim, nb | PREV_INUSE);
         set_head(remainder, remainder_size | PREV_INUSE);
@@ -3868,15 +3832,13 @@
             */
 
             if ((CHUNK_SIZE_T)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD) {
-                if (have_fastchunks(av)) {
+        if (have_fastchunks(av)) 
                     malloc_consolidate(av);
-                }
 
 #ifndef MORECORE_CANNOT_TRIM
                 if ((CHUNK_SIZE_T)(chunksize(av->top)) >=
-                        (CHUNK_SIZE_T)(av->trim_threshold)) {
+            (CHUNK_SIZE_T)(av->trim_threshold))
                     sYSTRIm(av->top_pad, av);
-                }
 #endif
       }
 
@@ -4008,7 +3970,8 @@
 
             }
         } while (fb++ != maxfb);
-    } else {
+  }
+  else {
     malloc_init_state(av);
     check_malloc_state();
   }
@@ -4022,8 +3985,7 @@
 #if __STD_C
 Void_t* rEALLOc(Void_t* oldmem, size_t bytes)
 #else
-Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem;
-size_t bytes;
+Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
 #endif
 {
   mstate av = get_malloc_state();
@@ -4059,9 +4021,7 @@
 #endif
 
     /* realloc of null is supposed to be same as malloc */
-    if (oldmem == 0) {
-        return mALLOc(bytes);
-    }
+  if (oldmem == 0) return mALLOc(bytes);
 
   checked_request2size(bytes, nb);
 
@@ -4103,9 +4063,8 @@
             /* allocate, copy, free */
             else {
                 newmem = mALLOc(nb - MALLOC_ALIGN_MASK);
-                if (newmem == 0) {
+        if (newmem == 0)
                     return 0;    /* propagate failure */
-                }
       
         newp = mem2chunk(newmem);
         newsize = chunksize(newp);
@@ -4116,7 +4075,8 @@
                 if (newp == next) {
                     newsize += oldsize;
                     newp = oldp;
-                } else {
+        }
+        else {
           /*
             Unroll copy of <= 36 bytes (72 if 8byte sizes)
             We know that contents have an odd number of
@@ -4129,9 +4089,8 @@
                     ncopies = copysize / sizeof(INTERNAL_SIZE_T);
                     assert(ncopies >= 3);
 
-                    if (ncopies > 9) {
+          if (ncopies > 9)
                         MALLOC_COPY(d, s, copysize);
-                    }
           
           else {
             *(d+0) = *(s+0);
@@ -4167,7 +4126,8 @@
         if (remainder_size < MINSIZE) { /* not enough extra to split off */
             set_head_size(newp, newsize);
             set_inuse_bit_at_offset(newp, newsize);
-        } else { /* split remainder */
+    }
+    else { /* split remainder */
       remainder = chunk_at_offset(newp, nb);
       set_head_size(newp, nb);
       set_head(remainder, remainder_size | PREV_INUSE);
@@ -4197,9 +4157,8 @@
         newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask;
 
         /* don't need to remap if still within same page */
-        if (oldsize == newsize - offset) {
+    if (oldsize == newsize - offset) 
             return oldmem;
-        }
 
     cp = (char*)mremap((char*)oldp - offset, oldsize + offset, newsize, 1);
     
@@ -4213,22 +4172,20 @@
 
             /* update statistics */
             sum = av->mmapped_mem += newsize - oldsize;
-            if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem)) {
+      if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem)) 
                 av->max_mmapped_mem = sum;
-            }
             sum += av->sbrked_mem;
-            if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) {
+      if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) 
                 av->max_total_mem = sum;
-            }
 
             return chunk2mem(newp);
         }
 #endif
 
         /* Note the extra SIZE_SZ overhead. */
-        if ((CHUNK_SIZE_T)(oldsize) >= (CHUNK_SIZE_T)(nb + SIZE_SZ)) {
+    if ((CHUNK_SIZE_T)(oldsize) >= (CHUNK_SIZE_T)(nb + SIZE_SZ)) 
             newmem = oldmem;    /* do nothing */
-        } else {
+    else {
       /* Must alloc, copy, free. */
       newmem = mALLOc(nb - MALLOC_ALIGN_MASK);
       if (newmem != 0) {
@@ -4254,8 +4211,7 @@
 #if __STD_C
 Void_t* mEMALIGn(size_t alignment, size_t bytes)
 #else
-Void_t* mEMALIGn(alignment, bytes) size_t alignment;
-size_t bytes;
+Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
 #endif
 {
   INTERNAL_SIZE_T nb;             /* padded  request size */
@@ -4271,22 +4227,16 @@
 
     /* If need less alignment than we give anyway, just relay to malloc */
 
-    if (alignment <= MALLOC_ALIGNMENT) {
-        return mALLOc(bytes);
-    }
+  if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
 
     /* Otherwise, ensure that it is at least a minimum chunk size */
 
-    if (alignment <  MINSIZE) {
-        alignment = MINSIZE;
-    }
+  if (alignment <  MINSIZE) alignment = MINSIZE;
 
     /* Make sure alignment is power of 2 (in case MINSIZE is not).  */
     if ((alignment & (alignment - 1)) != 0) {
         size_t a = MALLOC_ALIGNMENT * 2;
-        while ((CHUNK_SIZE_T)a < (CHUNK_SIZE_T)alignment) {
-            a <<= 1;
-        }
+    while ((CHUNK_SIZE_T)a < (CHUNK_SIZE_T)alignment) a <<= 1;
     alignment = a;
   }
 
@@ -4302,9 +4252,7 @@
 
     m  = (char*)(mALLOc(nb + alignment + MINSIZE));
 
-    if (m == 0) {
-        return 0;    /* propagate failure */
-    }
+  if (m == 0) return 0; /* propagate failure */
 
   p = mem2chunk(m);
 
@@ -4320,9 +4268,8 @@
 
         brk = (char*)mem2chunk((PTR_UINT)(((PTR_UINT)(m + alignment - 1)) &
                                           -((signed long) alignment)));
-        if ((CHUNK_SIZE_T)(brk - (char*)(p)) < MINSIZE) {
+    if ((CHUNK_SIZE_T)(brk - (char*)(p)) < MINSIZE)
             brk += alignment;
-        }
 
     newp = (mchunkptr)brk;
     leadsize = brk - (char*)(p);
@@ -4369,8 +4316,7 @@
 #if __STD_C
 Void_t* cALLOc(size_t n_elements, size_t elem_size)
 #else
-Void_t* cALLOc(n_elements, elem_size) size_t n_elements;
-size_t elem_size;
+Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size;
 #endif
 {
   mchunkptr p;
@@ -4383,7 +4329,8 @@
     if (mem != 0) {
         p = mem2chunk(mem);
 
-        if (!chunk_is_mmapped(p)) {
+    if (!chunk_is_mmapped(p))
+    {  
       /*
         Unroll clear of <= 36 bytes (72 if 8byte sizes)
         We know that contents have an odd number of
@@ -4395,9 +4342,8 @@
             nclears = clearsize / sizeof(INTERNAL_SIZE_T);
             assert(nclears >= 3);
 
-            if (nclears > 9) {
+      if (nclears > 9)
                 MALLOC_ZERO(d, clearsize);
-            }
 
       else {
         *(d+0) = 0;
@@ -4418,7 +4364,8 @@
             }
         }
 #if ! MMAP_CLEARS
-        else {
+    else
+    {
       d = (INTERNAL_SIZE_T*)mem;
       /*
         Note the additional SIZE_SZ
@@ -4451,9 +4398,7 @@
 #if __STD_C
 Void_t** iCALLOc(size_t n_elements, size_t elem_size, Void_t* chunks[])
 #else
-Void_t** iCALLOc(n_elements, elem_size, chunks) size_t n_elements;
-size_t elem_size;
-Void_t* chunks[];
+Void_t** iCALLOc(n_elements, elem_size, chunks) size_t n_elements; size_t elem_size; Void_t* chunks[];
 #endif
 {
   size_t sz = elem_size; /* serves as 1-element array */
@@ -4468,9 +4413,7 @@
 #if __STD_C
 Void_t** iCOMALLOc(size_t n_elements, size_t sizes[], Void_t* chunks[])
 #else
-Void_t** iCOMALLOc(n_elements, sizes, chunks) size_t n_elements;
-size_t sizes[];
-Void_t* chunks[];
+Void_t** iCOMALLOc(n_elements, sizes, chunks) size_t n_elements; size_t sizes[]; Void_t* chunks[];
 #endif
 {
   return iALLOc(n_elements, sizes, 0, chunks);
@@ -4494,10 +4437,7 @@
                        int opts,
                        Void_t* chunks[])
 #else
-static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements;
-size_t* sizes;
-int opts;
-Void_t* chunks[];
+static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_t* sizes; int opts; Void_t* chunks[];
 #endif
 {
   mstate av = get_malloc_state();
@@ -4514,22 +4454,19 @@
     size_t          i;
 
     /* Ensure initialization */
-    if (av->max_fast == 0) {
-        malloc_consolidate(av);
-    }
+  if (av->max_fast == 0) malloc_consolidate(av);
 
     /* compute array length, if needed */
     if (chunks != 0) {
-        if (n_elements == 0) {
+    if (n_elements == 0)
             return chunks;    /* nothing to do */
-        }
         marray = chunks;
         array_size = 0;
-    } else {
+  }
+  else {
         /* if empty req, must still return chunk representing empty array */
-        if (n_elements == 0) {
+    if (n_elements == 0) 
             return (Void_t**) mALLOc(0);
-        }
     marray = 0;
     array_size = request2size(n_elements * (sizeof(Void_t*)));
   }
@@ -4538,13 +4475,13 @@
     if (opts & 0x1) { /* all-same-size */
         element_size = request2size(*sizes);
         contents_size = n_elements * element_size;
-    } else { /* add up all the sizes */
+  }
+  else { /* add up all the sizes */
         element_size = 0;
         contents_size = 0;
-        for (i = 0; i != n_elements; ++i) {
+    for (i = 0; i != n_elements; ++i) 
             contents_size += request2size(sizes[i]);
         }
-    }
 
   /* subtract out alignment bytes from total to minimize overallocation */
   size = contents_size + array_size - MALLOC_ALIGN_MASK;
@@ -4559,9 +4496,8 @@
     av->n_mmaps_max = 0;
     mem = mALLOc(size);
     av->n_mmaps_max = mmx;   /* reset mmap */
-    if (mem == 0) {
+  if (mem == 0) 
         return 0;
-    }
 
   p = mem2chunk(mem);
   assert(!chunk_is_mmapped(p)); 
@@ -4583,15 +4519,15 @@
     for (i = 0; ; ++i) {
         marray[i] = chunk2mem(p);
         if (i != n_elements-1) {
-            if (element_size != 0) {
+      if (element_size != 0) 
                 size = element_size;
-            } else {
+      else
                 size = request2size(sizes[i]);
-            }
             remainder_size -= size;
             set_head(p, size | PREV_INUSE);
             p = chunk_at_offset(p, size);
-        } else { /* the final element absorbs any overallocation slop */
+    }
+    else { /* the final element absorbs any overallocation slop */
       set_head(p, remainder_size | PREV_INUSE);
       break;
     }
@@ -4600,17 +4536,15 @@
 #if DEBUG
     if (marray != chunks) {
         /* final element must have exactly exhausted chunk */
-        if (element_size != 0) {
+    if (element_size != 0) 
             assert(remainder_size == element_size);
-        } else {
+    else
             assert(remainder_size == request2size(sizes[i]));
-        }
         check_inuse_chunk(mem2chunk(marray));
     }
 
-    for (i = 0; i != n_elements; ++i) {
+  for (i = 0; i != n_elements; ++i)
         check_inuse_chunk(mem2chunk(marray[i]));
-    }
 #endif
 
   return marray;
@@ -4629,9 +4563,7 @@
 {
     /* Ensure initialization */
     mstate av = get_malloc_state();
-    if (av->max_fast == 0) {
-        malloc_consolidate(av);
-    }
+  if (av->max_fast == 0) malloc_consolidate(av);
   return mEMALIGn(av->pagesize, bytes);
 }
 
@@ -4650,9 +4582,7 @@
     size_t pagesz;
 
     /* Ensure initialization */
-    if (av->max_fast == 0) {
-        malloc_consolidate(av);
-    }
+  if (av->max_fast == 0) malloc_consolidate(av);
   pagesz = av->pagesize;
   return mEMALIGn(pagesz, (bytes + pagesz - 1) & ~(pagesz - 1));
 }
@@ -4693,12 +4623,11 @@
     mchunkptr p;
     if (mem != 0) {
         p = mem2chunk(mem);
-        if (chunk_is_mmapped(p)) {
+    if (chunk_is_mmapped(p))
             return chunksize(p) - 2*SIZE_SZ;
-        } else if (inuse(p)) {
+    else if (inuse(p))
             return chunksize(p) - SIZE_SZ;
         }
-    }
   return 0;
 }
 
@@ -4719,9 +4648,7 @@
     int nfastblocks;
 
     /* Ensure initialization */
-    if (av->top == 0) {
-        malloc_consolidate(av);
-    }
+  if (av->top == 0)  malloc_consolidate(av);
 
   check_malloc_state();
 
@@ -4814,8 +4741,7 @@
 #if __STD_C
 int mALLOPt(int param_number, int value)
 #else
-int mALLOPt(param_number, value) int param_number;
-int value;
+int mALLOPt(param_number, value) int param_number; int value;
 #endif
 {
   mstate av = get_malloc_state();
@@ -4827,9 +4753,9 @@
         if (value >= 0 && value <= MAX_FAST_SIZE) {
             set_max_fast(av, value);
             return 1;
-        } else {
-            return 0;
     }
+    else
+      return 0;
 
   case M_TRIM_THRESHOLD:
     av->trim_threshold = value;
@@ -4845,9 +4771,8 @@
 
     case M_MMAP_MAX:
 #if !HAVE_MMAP
-        if (value != 0) {
+    if (value != 0)
             return 0;
-        }
 #endif
     av->n_mmaps_max = value;
     return 1;
@@ -5023,17 +4948,14 @@
 #ifdef USE_MALLOC_LOCK
 
 /* Wait for spin lock */
-static int slwait (int *sl)
-{
-    while (InterlockedCompareExchange ((void **) sl, (void *) 1, (void *) 0) != 0) {
+static int slwait (int *sl) {
+    while (InterlockedCompareExchange ((void **) sl, (void *) 1, (void *) 0) != 0) 
         Sleep (0);
-    }
     return 0;
 }
 
 /* Release spin lock */
-static int slrelease (int *sl)
-{
+static int slrelease (int *sl) {
     InterlockedExchange (sl, 0);
     return 0;
 }
@@ -5046,8 +4968,7 @@
 #endif /* USE_MALLOC_LOCK */
 
 /* getpagesize for windows */
-static long getpagesize (void)
-{
+static long getpagesize (void) {
     static long g_pagesize = 0;
     if (! g_pagesize) {
         SYSTEM_INFO system_info;
@@ -5056,8 +4977,7 @@
     }
     return g_pagesize;
 }
-static long getregionsize (void)
-{
+static long getregionsize (void) {
     static long g_regionsize = 0;
     if (! g_regionsize) {
         SYSTEM_INFO system_info;
@@ -5077,12 +4997,10 @@
 } region_list_entry;
 
 /* Allocate and link a region entry in the region list */
-static int region_list_append (region_list_entry **last, void *base_reserved, long reserve_size)
-{
+static int region_list_append (region_list_entry **last, void *base_reserved, long reserve_size) {
     region_list_entry *next = HeapAlloc (GetProcessHeap (), 0, sizeof (region_list_entry));
-    if (! next) {
+    if (! next)
         return FALSE;
-    }
     next->top_allocated = (char *) base_reserved;
     next->top_committed = (char *) base_reserved;
     next->top_reserved = (char *) base_reserved + reserve_size;
@@ -5092,12 +5010,10 @@
     return TRUE;
 }
 /* Free and unlink the last region entry from the region list */
-static int region_list_remove (region_list_entry **last)
-{
+static int region_list_remove (region_list_entry **last) {
     region_list_entry *previous = (*last)->previous;
-    if (! HeapFree (GetProcessHeap (), sizeof (region_list_entry), *last)) {
+    if (! HeapFree (GetProcessHeap (), sizeof (region_list_entry), *last))
         return FALSE;
-    }
     *last = previous;
     return TRUE;
 }
@@ -5111,8 +5027,7 @@
 /* #define SBRK_SCALE  4  */
 
 /* sbrk for windows */
-static void *sbrk (long size)
-{
+static void *sbrk (long size) {
     static long g_pagesize, g_my_pagesize;
     static long g_regionsize, g_my_regionsize;
     static region_list_entry *g_last;
@@ -5134,10 +5049,9 @@
         g_my_regionsize = g_regionsize << SBRK_SCALE;
     }
     if (! g_last) {
-        if (! region_list_append (&g_last, 0, 0)) {
+        if (! region_list_append (&g_last, 0, 0)) 
             goto sbrk_exit;
         }
-    }
     /* Assert invariants */
     assert (g_last);
     assert ((char *) g_last->top_reserved - g_last->reserve_size <= (char *) g_last->top_allocated &&
@@ -5166,15 +5080,13 @@
                 if (remaining_commit_size > 0) {
                     /* Assert preconditions */
                     assert ((unsigned) g_last->top_committed % g_pagesize == 0);
-                    assert (0 < remaining_commit_size && remaining_commit_size % g_pagesize == 0);
-                    {
+                    assert (0 < remaining_commit_size && remaining_commit_size % g_pagesize == 0); {
                         /* Commit this */
                         void *base_committed = VirtualAlloc (g_last->top_committed, remaining_commit_size,
                                                              MEM_COMMIT, PAGE_READWRITE);
                         /* Check returned pointer for consistency */
-                        if (base_committed != g_last->top_committed) {
+                        if (base_committed != g_last->top_committed)
                             goto sbrk_exit;
-                        }
                         /* Assert postconditions */
                         assert ((unsigned) base_committed % g_pagesize == 0);
 #ifdef TRACE
@@ -5183,8 +5095,7 @@
                         /* Adjust the regions commit top */
                         g_last->top_committed = (char *) base_committed + remaining_commit_size;
                     }
-                }
-                {
+                } {
                     /* Now we are going to search and reserve. */
                     int contiguous = -1;
                     int found = FALSE;
@@ -5227,9 +5138,8 @@
                             assert (0 < reserve_size && reserve_size % g_regionsize == 0);
                         }
                         /* Search failed? */
-                        if (! found) {
+                        if (! found) 
                             goto sbrk_exit;
-                        }
                         /* Assert preconditions */
                         assert ((unsigned) memory_info.BaseAddress % g_regionsize == 0);
                         assert (0 < reserve_size && reserve_size % g_regionsize == 0);
@@ -5238,17 +5148,15 @@
                                                       MEM_RESERVE, PAGE_NOACCESS);
                         if (! base_reserved) {
                             int rc = GetLastError ();
-                            if (rc != ERROR_INVALID_ADDRESS) {
+                            if (rc != ERROR_INVALID_ADDRESS) 
                                 goto sbrk_exit;
                             }
-                        }
                         /* A null pointer signals (hopefully) a race condition with another thread. */
                         /* In this case, we try again. */
                     } while (! base_reserved);
                     /* Check returned pointer for consistency */
-                    if (memory_info.BaseAddress && base_reserved != memory_info.BaseAddress) {
+                    if (memory_info.BaseAddress && base_reserved != memory_info.BaseAddress)
                         goto sbrk_exit;
-                    }
                     /* Assert postconditions */
                     assert ((unsigned) base_reserved % g_regionsize == 0);
 #ifdef TRACE
@@ -5267,9 +5175,8 @@
                         commit_size = CEIL (to_commit, g_my_pagesize);
                     }
                     /* Append the new region to the list */
-                    if (! region_list_append (&g_last, base_reserved, reserve_size)) {
+                    if (! region_list_append (&g_last, base_reserved, reserve_size))
                         goto sbrk_exit;
-                    }
                     /* Didn't we get contiguous memory? */
                     if (! contiguous) {
                         /* Recompute the size to commit */
@@ -5281,15 +5188,13 @@
             }
             /* Assert preconditions */
             assert ((unsigned) g_last->top_committed % g_pagesize == 0);
-            assert (0 < commit_size && commit_size % g_pagesize == 0);
-            {
+            assert (0 < commit_size && commit_size % g_pagesize == 0); {
                 /* Commit this */
                 void *base_committed = VirtualAlloc (g_last->top_committed, commit_size,
                                                      MEM_COMMIT, PAGE_READWRITE);
                 /* Check returned pointer for consistency */
-                if (base_committed != g_last->top_committed) {
+                if (base_committed != g_last->top_committed)
                     goto sbrk_exit;
-                }
                 /* Assert postconditions */
                 assert ((unsigned) base_committed % g_pagesize == 0);
 #ifdef TRACE
@@ -5313,15 +5218,13 @@
             void *base_reserved = (char *) g_last->top_reserved - release_size;
             /* Assert preconditions */
             assert ((unsigned) base_reserved % g_regionsize == 0);
-            assert (0 < release_size && release_size % g_regionsize == 0);
-            {
+            assert (0 < release_size && release_size % g_regionsize == 0); {
                 /* Release this */
                 int rc = VirtualFree (base_reserved, 0,
                                       MEM_RELEASE);
                 /* Check returned code for consistency */
-                if (! rc) {
+                if (! rc)
                     goto sbrk_exit;
-                }
 #ifdef TRACE
                 printf ("Release %p %d\n", base_reserved, release_size);
 #endif
@@ -5329,11 +5232,9 @@
             /* Adjust deallocation size */
             deallocate_size -= (char *) g_last->top_allocated - (char *) base_reserved;
             /* Remove the old region from the list */
-            if (! region_list_remove (&g_last)) {
+            if (! region_list_remove (&g_last))
                 goto sbrk_exit;
-            }
-        }
-        {
+        } {
             /* Compute the size to decommit */
             long to_decommit = (char *) g_last->top_committed - ((char *) g_last->top_allocated - deallocate_size);
             if (to_decommit >= g_my_pagesize) {
@@ -5343,15 +5244,13 @@
                 void *base_committed = (char *) g_last->top_committed - decommit_size;
                 /* Assert preconditions */
                 assert ((unsigned) base_committed % g_pagesize == 0);
-                assert (0 < decommit_size && decommit_size % g_pagesize == 0);
-                {
+                assert (0 < decommit_size && decommit_size % g_pagesize == 0); {
                     /* Decommit this */
                     int rc = VirtualFree ((char *) base_committed, decommit_size,
                                           MEM_DECOMMIT);
                     /* Check returned code for consistency */
-                    if (! rc) {
+                    if (! rc)
                         goto sbrk_exit;
-                    }
 #ifdef TRACE
                     printf ("Decommit %p %d\n", base_committed, decommit_size);
 #endif
@@ -5392,8 +5291,7 @@
 }
 
 /* mmap for windows */
-static void *mmap (void *ptr, long size, long prot, long type, long handle, long arg)
-{
+static void *mmap (void *ptr, long size, long prot, long type, long handle, long arg) {
     static long g_pagesize;
     static long g_regionsize;
 #ifdef TRACE
@@ -5404,12 +5302,10 @@
     slwait (&g_sl);
 #endif
     /* First time initialization */
-    if (! g_pagesize) {
+    if (! g_pagesize) 
         g_pagesize = getpagesize ();
-    }
-    if (! g_regionsize) {
+    if (! g_regionsize) 
         g_regionsize = getregionsize ();
-    }
     /* Assert preconditions */
     assert ((unsigned) ptr % g_regionsize == 0);
     assert (size % g_pagesize == 0);
@@ -5434,8 +5330,7 @@
 }
 
 /* munmap for windows */
-static long munmap (void *ptr, long size)
-{
+static long munmap (void *ptr, long size) {
     static long g_pagesize;
     static long g_regionsize;
     int rc = MUNMAP_FAILURE;
@@ -5447,20 +5342,17 @@
     slwait (&g_sl);
 #endif
     /* First time initialization */
-    if (! g_pagesize) {
+    if (! g_pagesize) 
         g_pagesize = getpagesize ();
-    }
-    if (! g_regionsize) {
+    if (! g_regionsize) 
         g_regionsize = getregionsize ();
-    }
     /* Assert preconditions */
     assert ((unsigned) ptr % g_regionsize == 0);
     assert (size % g_pagesize == 0);
     /* Free this */
     if (! VirtualFree (ptr, 0,
-                       MEM_RELEASE)) {
+                       MEM_RELEASE))
         goto munmap_exit;
-    }
     rc = 0;
 #ifdef TRACE
     printf ("Release %p %d\n", ptr, size);
@@ -5473,8 +5365,7 @@
     return rc;
 }
 
-static void vminfo (CHUNK_SIZE_T  *free, CHUNK_SIZE_T  *reserved, CHUNK_SIZE_T  *committed)
-{
+static void vminfo (CHUNK_SIZE_T  *free, CHUNK_SIZE_T  *reserved, CHUNK_SIZE_T  *committed) {
     MEMORY_BASIC_INFORMATION memory_info;
     memory_info.BaseAddress = 0;
     *free = *reserved = *committed = 0;
@@ -5494,8 +5385,7 @@
     }
 }
 
-static int cpuinfo (int whole, CHUNK_SIZE_T  *kernel, CHUNK_SIZE_T  *user)
-{
+static int cpuinfo (int whole, CHUNK_SIZE_T  *kernel, CHUNK_SIZE_T  *user) {
     if (whole) {
         __int64 creation64, exit64, kernel64, user64;
         int rc = GetProcessTimes (GetCurrentProcess (), 
diff -burw ./qico/man/Makefile.am ./trunk/man/Makefile.am
--- ./qico/man/Makefile.am	2024-02-01 18:09:52.530166000 +0300
+++ ./trunk/man/Makefile.am	2024-02-01 18:10:34.671740000 +0300
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2005/08/21 04:16:41 mitry Exp $
+# $Id: Makefile.am 18 2010-08-23 15:50:49Z semik $
 
 man_MANS = qico.8 qctl.8 qcc.8
 
diff -burw ./qico/man/qcc.8 ./trunk/man/qcc.8
--- ./qico/man/qcc.8	2024-02-01 18:09:52.530241000 +0300
+++ ./trunk/man/qcc.8	2024-02-01 18:10:34.672492000 +0300
@@ -1,4 +1,4 @@
-.TH QCC 8 "13 Jan 2013"
+.TH QCC 8 "21 Jul 2005"
 .SH NAME
 qcc \- ncurses frontend for qico ftn mailer.
 .SH SYNOPSIS
@@ -47,6 +47,5 @@
  Lev Serebryakov <lev@serebryakov.spb.ru> (up to 0.49.9),
  Pavel Kurnosoff <pqr@yasp.com> (up to 0.45pl3.1).
  Mitry Matyushkov <r45c at mail dot ru> (qicoxe branch).
- Robert James Clay <jame at rocasa dot us> (after 0.57.1).
 .SH "REPORTING BUGS"
-Report bugs at http://sourceforge.net/p/qico/bugs/
+Report bugs to <r45c at mail dot ru>
diff -burw ./qico/man/qctl.8 ./trunk/man/qctl.8
--- ./qico/man/qctl.8	2024-02-01 18:09:52.530295000 +0300
+++ ./trunk/man/qctl.8	2024-02-01 18:10:34.662109000 +0300
@@ -1,4 +1,4 @@
-.TH QCTL 8 "13 Jan 2013"
+.TH QCTL 8 "21 Jul 2005"
 .SH NAME
 qctl \- control tool for qico ftn mailer.
 .SH SYNOPSIS
@@ -106,6 +106,5 @@
  Lev Serebryakov <lev@serebryakov.spb.ru> (up to 0.49.9),
  Pavel Kurnosoff <pqr@yasp.com> (up to 0.45pl3.1).
  Mitry Matyushkov <r45c at mail dot ru> (qicoxe branch).
- Robert James Clay <jame at rocasa dot us> (after 0.57.1).
 .SH "REPORTING BUGS"
-Report bugs at http://sourceforge.net/p/qico/bugs/
+Report bugs to <r45c at mail dot ru>
diff -burw ./qico/man/qico.8 ./trunk/man/qico.8
--- ./qico/man/qico.8	2024-02-01 18:09:52.530370000 +0300
+++ ./trunk/man/qico.8	2024-02-01 18:10:34.660487000 +0300
@@ -1,4 +1,4 @@
-.TH QICO 8 "13 Jan 2013"
+.TH QICO 8 "21 Jul 2005"
 .SH NAME
 qico \- an FTN compatible mailer.
 .SH SYNOPSIS
@@ -81,12 +81,13 @@
 qico homepage:
 .BR
      http://qico.sourceforge.net/
+.BR
+     http://193.232.248.13:8080/qicoxe/
 .SH AUTHORS
  Stepan Pologov <sisoft@bk.ru>, and others:
  Cyril Margorin <cyrilm@tower.pp.ru> (official branch),
  Lev Serebryakov <lev@serebryakov.spb.ru> (up to 0.49.9),
  Pavel Kurnosoff <pqr@yasp.com> (up to 0.45pl3.1).
  Mitry Matyushkov <r45c at mail dot ru> (qicoxe branch).
- Robert James Clay <jame at rocasa dot us> (after 0.57.1).
 .SH "REPORTING BUGS"
-Report bugs at http://sourceforge.net/p/qico/bugs/
+Report bugs to <r45c at mail dot ru>
diff -burw ./qico/qico.conf.sample ./trunk/qico.conf.sample
--- ./qico/qico.conf.sample	2024-02-01 18:09:52.530584000 +0300
+++ ./trunk/qico.conf.sample	2024-02-01 18:10:34.661499000 +0300
@@ -1,6 +1,8 @@
 ###############################################################################
 ########################  qico configuration file  ############################
 ###############################################################################
+# $Id: qico.conf.sample 18 2010-08-23 15:50:49Z semik $
+# for 0.57.1xe
 #
 # config structure:
 # ~~~~~~~~~~~~~~~~
@@ -204,11 +206,12 @@
 #  Q -- Queue management
 #  R -- File requests
 #  S -- Session
+#  T -- TTY routines
 #  X -- Max debug level for send to clients
 #  Y -- Config `if' expressions parsing and executing
 #  Z -- ZModem
 #
-loglevels	B0,C0,E0,H0,I0,J0,M0,N0,P0,Q0,R0,S0,X0,Y0,Z0
+loglevels	B0,C0,E0,H0,I0,J0,M0,N0,P0,Q0,R0,S0,T0,X0,Y0,Z0
 
 # Show estimated transfer time before each file transfer
 estimatedtime	no
@@ -327,10 +330,22 @@
 # Long rescan. Each 'longrescan' time the rescanning of ?lo files is forced.
 ;longrescan	4
 
-# phone translations, `=' means all other phones - must be last translation,
-# because first matching translation will be used (required for modem)
-phonetr		7-095-
+# phone translations
+# (required for modem)
+#
+# cut 7-495- from beginning of phone number
+phonetr		7-495-
+
+# here is a trick: if pattern covers whole number then node is considered as Pvt.
+# you can use it for nodes with IP-only phone numbers. for IP-only of 2:5030:
+phonetr		00-00-000000
+
+# all numbers starting with 7- is changed to 8W-
 phonetr		7-	8W-
+
+# `=' means all other phones - must be last translation, because first
+# matching translation is used.
+# all rest numbers prepended with 8W10-
 phonetr		=	8W10-
 
 # when outbound calls are enabled
diff -burw ./qico/qico.spec ./trunk/qico.spec
--- ./qico/qico.spec	2024-02-01 18:09:52.530684000 +0300
+++ ./trunk/qico.spec	2024-02-01 18:10:34.662337000 +0300
@@ -1,10 +1,10 @@
 Summary:	qico, an ftn-compatible mailer
 Name:		qico
-Version:	0.59.1
+Version:	0.57.1xe
 Release:	1
 Copyright:	BSD
 Group:		System Environment/Daemons
-Source:		http://sf.net/projects/qico/files/qico-%{version}/qico-%{version}.tar.bz2/download
+Source:		http://193.232.248.13:8080/qicoxe/qico-%{version}.tar.bz2
 URL:		http://qico.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Prefix:		%{_prefix}
@@ -51,4 +51,15 @@
 %doc %{_mandir}/man8/qico.8*
 %doc %{_mandir}/man8/qctl.8*
 %doc %{_mandir}/man8/qcc.8*
+
+%changelog
+* Sat May 29 2004 sisoft <sisoft@bk.ru>
+  [0.53si-1]
+- ported to current version.
+* Wed Sep 27 2000 pqr <pqr@yasp.com>
+  [0.49.0-1]
+- some fixes about prefix and others
+* Tue Aug 29 2000 pqr <pqr@yasp.com>
+  [0.47-1]
+- initial version
 
Only in ./qico: qico.spec.in
Only in ./qico/src: .gitignore
Only in ./qico/src: CMakeLists.txt
diff -burw ./qico/src/Makefile.am ./trunk/src/Makefile.am
--- ./qico/src/Makefile.am	2024-02-01 18:09:52.531005000 +0300
+++ ./trunk/src/Makefile.am	2024-02-01 18:10:34.599159000 +0300
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.12 2005/08/22 17:21:32 mitry Exp $
+# $Id: Makefile.am 26 2010-10-25 13:14:56Z semik $
 
 sbin_PROGRAMS = qico
 bin_PROGRAMS = qctl @QCC@
@@ -23,8 +23,7 @@
 
 EXTRA_qico_SOURCES = binkp.c perl.c
 
-qico_LDADD = @LIBOBJS@ @LIB_MALLOC@ @BINKP_O@ @PERL_O@
-qico_LDFLAGS = @PERLLDFLAGS@
+qico_LDADD = @LIBOBJS@ @LIB_MALLOC@ @BINKP_O@ @PERL_O@ @PERLLDFLAGS@
 qico_DEPENDENCIES = @BINKP_O@ @PERL_O@
 
 qctl_SOURCES = qctl.c clserv.c md5q.c qslib.c
Only in ./qico/src: anylist.c
Only in ./qico/src: anylist.h
diff -burw ./qico/src/binkp.c ./trunk/src/binkp.c
--- ./qico/src/binkp.c	2024-02-01 18:09:52.531552000 +0300
+++ ./trunk/src/binkp.c	2024-02-01 18:10:34.584562000 +0300
@@ -2,9 +2,27 @@
  * Binkp protocol implementation.
  ******************************************************************/
 /*
- * $Id: binkp.c,v 1.20 2005/08/22 17:19:41 mitry Exp $
+ * $Id: binkp.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: binkp.c,v $
+ * Revision 1.26  2007/03/19 23:58:06  mitry
+ * *** empty log message ***
+ *
+ * Revision 1.25  2007/03/19 23:39:41  mitry
+ * ND mode should be implemented
+ *
+ * Revision 1.24  2006/07/10 16:16:29  mitry
+ * Binkp: prevent infinite calling system if some files were suspended
+ *
+ * Revision 1.23  2006/04/14 18:55:10  mitry
+ * Drop session if secure aka is busy.
+ *
+ * Revision 1.22  2005/12/03 02:44:19  mitry
+ * Fixed session timeout between two qicos
+ *
+ * Revision 1.21  2005/09/06 20:42:04  mitry
+ * Added macros to qpreset() calls
+ *
  * Revision 1.20  2005/08/22 17:19:41  mitry
  * Changed names of functions to more proper form
  *
@@ -142,7 +160,10 @@
 			break;
 
 		case 'd':					/* No dupes mode */
+			break;
+#if 0
 			bps->opt_nd |= O_NO; /*mode?O_THEY:O_NO;*/
+#endif
 
 		case 'r':					/* Non-reliable mode */
 			bps->opt_nr |= to ? O_WANT : O_NO;
@@ -161,11 +182,11 @@
         }
     }
 
-    if ( !to && !tcp_setsockopts( tty_fd )) {
+	if ( !to && !tcp_setsockopts( tty_fd ))
         return ERROR;
-    }
 
 	bps->MD_chal = NULL;
+	bps->was_suspend = 0;
 
 	return OK;
 }
@@ -180,9 +201,8 @@
     xfree( bps->MD_chal );
     xfree( bps->rfname );
     for( i = 0; i < bps->nmsgs; i++ )
-        if ( bps->mqueue[i].msg ) {
+		if ( bps->mqueue[i].msg )
             xfree( bps->mqueue[i].msg );
-        }
 	xfree( bps->mqueue );
 
 	xfree( bps );
@@ -242,9 +262,8 @@
     size = strsep( &n, " " );
     time = strsep( &n, " " );
 
-    if ( offs ) {
+	if ( offs )
         off = strsep( &n, " " );
-    }
 
 	DEBUG(('B',4,"pars: name=%s, size=%s, time=%s, offs=%s",
 		name, size, time, off));
@@ -252,9 +271,8 @@
         *fn = name;
         *sz = atol( size );
         *tm = atol( time );
-        if ( offs ) {
+		if ( offs )
             *offs = atol( off );
-        }
 		DEBUG(('B',3,"pars: name=%s, size=%lu, time=%lu, offs=%ld",
 			*fn, *sz, *tm, offs ? *offs : -3l ));
 		return 1;
@@ -297,35 +315,33 @@
 
     recode_to_local( buf );
 
-    if ( !strncmp( buf, "SYS ", 4 )) {
+	if ( !strncmp( buf, "SYS ", 4 ))
         restrcpy( &rnode->name, skip_blanks( buf + 4 ));
-    } else if( !strncmp( buf, "ZYZ ", 4 )) {
+	else if( !strncmp( buf, "ZYZ ", 4 ))
         restrcpy( &rnode->sysop, skip_blanks( buf + 4 ));
-    } else if( !strncmp( buf, "LOC ", 4 )) {
+	else if( !strncmp( buf, "LOC ", 4 ))
         restrcpy( &rnode->place, skip_blanks( buf + 4 ));
-    } else if( !strncmp( buf, "NDL ", 4 )) {
+	else if( !strncmp( buf, "NDL ", 4 )) {
         long spd = atol( skip_blanks( buf + 4 ));
         char *comma = strchr( buf + 4, ',' );
 
         restrcpy( &rnode->flags, comma ? comma + 1 : NULL );
 
-        if ( spd >= 300 ) {
+		if ( spd >= 300 )
             rnode->speed = spd;
-        } else {
+		else {
             comma = skip_blanks( buf + 4 );
-            while( comma && *comma && isdigit( *comma )) {
+			while( comma && *comma && isdigit( *comma ))
                 comma++;
-            }
-            if ( !comma || !*comma ) {
+			if ( !comma || !*comma )
                 rnode->speed = TCP_SPEED;
-            } else if ( tolower( *comma ) == 'k' ) {
+			else if ( tolower( *comma ) == 'k' )
                 rnode->speed = spd * 1024;
-            } else if ( tolower( *comma ) == 'm' ) {
+			else if ( tolower( *comma ) == 'm' )
                 rnode->speed = spd * 1024 * 1024;
-            } else {
+			else
                 rnode->speed = TCP_SPEED;
             }
-        }
 	} else if( !strncmp( buf, "TIME ", 5 )) {
 		long		gmt = 0;
 		size_t		len = strlen( buf + 5 );
@@ -334,15 +350,14 @@
 
         ti = time( NULL );
         TZOFFSET = gmtoff( ti );
-        memcpy( &tt, localtime( &ti ), sizeof( struct tm ));
+		memmove( &tt, localtime( &ti ), sizeof( struct tm ));
 
 #define BMALTL ((size_t)((byte *) buf - (byte *) arg ) < len )
 
         buf = skip_blanks( buf + 5 );
 
-        if ( isalpha( *buf )) {		/* Skip day of week name "Mon, " */
+		if ( isalpha( *buf ))			/* Skip day of week name "Mon, " */
             buf = skip_blanks( buf + 5 );
-        }
 
 		DEBUG(('B',9,"1..... buf '%s'", buf));
 		if ( BMALTL && isdigit( *buf ) && ( isdigit( buf[1] ) || isspace( buf[1] ))) {
@@ -367,21 +382,19 @@
                     if ( BMALTL && isdigit( *buf )) {
                         gmt = atol( buf );
                         if ( errno != ERANGE ) {
-                            if ( gmt > 1900 ) {
+							if ( gmt > 1900 )
                                 tt.tm_year = (int) (gmt - 1900);
-                            } else if ( gmt < 50 ) {
+							else if ( gmt < 50 )
                                 tt.tm_year = (int) (gmt + 100);
-                            } else {
+							else
                                 tt.tm_year = (int) gmt;
-                            }
 
                             DEBUG(('B',9,"5..... gmt %ld", gmt));
                             gmt = 0;
                             n = strchr( buf, ':' ) - 2;
                             if ( n ) {
-                                if ( *n == ' ' ) {
+								if ( *n == ' ' )
                                     n++;
-                                }
 
 								DEBUG(('B',9,"6..... n '%s'", n));
 								tt.tm_hour = atoi( n );
@@ -402,11 +415,11 @@
 
                                     DEBUG(('B',9,"A..... n '%s'", n));
                                     if ( *n && isdigit( n[1] ) && isdigit( n[2] )
-                                            && isdigit( n[3] ) && isdigit( n[4] )) {
+										&& isdigit( n[3] ) && isdigit( n[4] ))
+									{
                                         gmt = ((xN(1) * 10 + xN(2)) * 60 + (xN(3) * 10 + xN(4))) * 60;
-                                        if ( *n == '-' ) {
+										if ( *n == '-' )
                                             gmt = -gmt;
-                                        }
 									} else if ( !strncmp( n, "GMT", 3 ) || !strncmp( n, "UT", 2 )) {
 										gmt = -TZOFFSET;
 									}
@@ -414,11 +427,10 @@
                             }
                         }
                     }
-                } else {
+				} else
                     gmt = 0;
                 }
             }
-        }
 #undef BMALTL
 
 		DEBUG(('B',9,"gmt %ld", gmt));
@@ -434,21 +446,14 @@
         } else {
             write_log("Binkp: got bad VER message: %s", buf );
         }
-        if ( BP_VER( bp ) <= 100 ) {
-            bp->delay_eob = 1;
-        }
     } else if ( !strncmp( buf, "TRF ", 4 )) {
         n = skip_blanks( buf + 4 );
         if ( n && *n && isdigit( *n )) {
             rnode->netmail = atoi( n );
             n = skip_blanks( strchr( n, ' ' ));
-            if ( n && *n && isdigit( *n )) {
+			if ( n && *n && isdigit( *n ))
                 rnode->files = atoi( n );
             }
-        }
-        if ( rnode->netmail + rnode->files ) {
-            bp->delay_eob = 1;
-        }
 	} else if( !strncmp( buf, "FREQ", 4 )) {
 		bp->delay_eob = 1;
 	} else if( !strncmp( buf, "PHN ", 4 )) {
@@ -460,39 +465,38 @@
 
         n = skip_blanks( buf + 4 );
         while( n && ( p = strsep( &n, " " ))) {
-            if ( !strcmp( p, "NR" )) {
+			if ( !strcmp( p, "NR" ))
                 bp->opt_nr |= O_WE;
-            } else if ( !strcmp( p, "MB" )) {
+			else if ( !strcmp( p, "MB" ))
                 bp->opt_mb |= O_WE;
-            } else if( !strcmp( p, "ND" )) {
+#if 0
+			else if( !strcmp( p, "ND" ))
                 bp->opt_nd |= O_WE;
-            } else if( !strcmp( p, "NDA" )) {
+			else if( !strcmp( p, "NDA" ))
                 bp->opt_nd |= O_EXT;
-            } else if( !strcmp( p, "CHAT" )) {
+#endif
+			else if( !strcmp( p, "CHAT" ))
                 bp->opt_cht |= O_WE;
-            } else if( !strcmp( p, "CRYPT" )) {
+			else if( !strcmp( p, "CRYPT" ))
                 bp->opt_cr |= O_THEY;
-            } else if( !strncmp( p, "CRAM-MD5-", 9 ) && bp->to && bp->opt_md ) {
-                if ( strlen( p + 9 ) > 64 ) {
+			else if( !strncmp( p, "CRAM-MD5-", 9 ) && bp->to && bp->opt_md ) {
+				if ( strlen( p + 9 ) > 64 )
                     write_log( "Binkp: got too long challenge string" );
-                } else {
+				else {
                     DEBUG(('B',2,"Remote requests MD mode"));
                     xfree( bp->MD_chal );
                     bp->MD_chal = md5_challenge((unsigned char *) p );
-                    if ( bp->MD_chal ) {
+					if ( bp->MD_chal )
                         bp->opt_md |= O_THEY;
                     }
-                }
-                if (( bp->opt_md & ( O_THEY | O_WANT )) == ( O_THEY | O_WANT )) {
+				if (( bp->opt_md & ( O_THEY | O_WANT )) == ( O_THEY | O_WANT ))
                     bp->opt_md = O_YES;
-                }
-            } else { /* if ( strcmp( p, "GZ" ) || strcmp( p, "BZ2" ) || strcmp( p, "EXTCMD" )) */
+			} else /* if ( strcmp( p, "GZ" ) || strcmp( p, "BZ2" ) || strcmp( p, "EXTCMD" )) */ {
                 DEBUG(('B',2,"got unsupported option '%s'",p));
             }
         }
-    } else {
+	} else
         write_log( "Binkp: got unknown NUL: \"%s\"", buf );
-    }
 
 	return 1;
 }
@@ -528,29 +532,36 @@
 
             /* Search for duplicated remote akas */
             if ( !falist_find( rnode->addrs, &fa )) {
-                if ( outbound_locknode( &fa, LCK_s )) {
+				char		*rpwd = findpwd( &fa );
+				falist_t	*xfa;
 
+				xfa = falist_add( &rnode->addrs, &fa );
+				if ( outbound_locknode( &xfa->addr, LCK_s )) {
+                    
                     DEBUG(('B',4,"locked: %s", rem_aka));
 
-                    if ( !bp->to && !rem_pwd ) {
-                        rem_pwd = findpwd( &fa );
-                        if ( rem_pwd ) {
+					if ( !bp->to && !rem_pwd && rpwd ) {
+						rem_pwd = rpwd;
                             DEBUG(('B',4,"found pwd '%s' for %s", rem_pwd, rem_aka));
                         }
-                    }
 
                     rc++;
-                    falist_add( &rnode->addrs, &fa );
                     makeflist( &fl, &fa, bp->to );
 
                     DEBUG(('B',4,"totalm: %lu, totalf: %lu", totalm, totalf));
 
                 } else {
-                    write_log( "Can't lock outbound for %s", ftnaddrtoa( &fa ));
+					write_log( "Can't lock outbound for %saka %s",
+						(rpwd ? "secure " : ""), ftnaddrtoa( &fa ));
+					if ( rpwd ) {
+						log_rinfo( rnode );
+						msgs( BPM_BSY, "Secure aka is busy" );
+						bp->rc = ( bp->to ? S_REDIAL | S_ADDTRY : S_BUSY );
+						return 0;
                 }
-            } else {
-                DEBUG(('B',4,"removed duplicated aka: %s", rem_aka));
 				}
+			} else
+				DEBUG(('B',4,"removed duplicated aka: %s", rem_aka));
 		} else {
 			log_rinfo( rnode );
 			write_log( "Remote sent bad address %s", rem_aka );
@@ -582,9 +593,8 @@
 
         rem_pwd = findpwd( bp->remaddr );
 
-        if ( rem_pwd == NULL ) {
+		if ( rem_pwd == NULL )
             rem_pwd = "-";
-        }
 
 		DEBUG(('B',4,"pwd: '%s'",rem_pwd));
 		if ( bp->MD_chal ) {
@@ -594,27 +604,23 @@
                 msgs( BPM_ERR, "Can't build digest" );
                 bp->rc = S_REDIAL | S_ADDTRY;
                 return 0;
-            } else {
+			} else
                 msgs( BPM_PWD, "CRAM-MD5-%s", dig );
-            }
             xfree( dig );
         } else if ( bp->opt_md == O_YES ) {
             msgs( BPM_ERR, "Can't use plaintext password" );
             bp->rc = S_FAILURE|S_ADDTRY;
             return 0;
-        } else {
+		} else
             msgs( BPM_PWD, "%s", rem_pwd );
-        }
-    } else if ( rem_pwd == NULL ) {
+	} else if ( rem_pwd == NULL )
         rem_pwd = "-";
-    }
 
     restrcpy( &rnode->pwd, rem_pwd );
-    if ( !strcmp( rnode->pwd, "-" )) {
+	if ( !strcmp( rnode->pwd, "-" ))
         rnode->options &= ~O_PWD;
-    } else {
+	else
         rnode->options |= O_PWD;
-    }
 
 	return 1;
 }
@@ -627,16 +633,11 @@
 {
     char *p, tmp[256];
 
-    if ( bp->opt_nd == O_WE || bp->opt_nd == O_THEY ) {
+	if ( bp->opt_nd == O_WE || bp->opt_nd == O_THEY )
         bp->opt_nd = O_NO;
-    }
 
-    if ( !rnode->phone || !*rnode->phone ) {
-        restrcpy( &rnode->phone, "-Unpublished-" );
-    }
-    if ( !( rnode->options & O_PWD ) || bp->opt_md != O_YES ) {
+	if ( !( rnode->options & O_PWD ) || bp->opt_md != O_YES )
         bp->opt_cr = O_NO;
-    }
 	if (( bp->opt_cr & O_WE ) && ( bp->opt_cr & O_THEY )) {
 		unsigned long *keys;
 
@@ -651,41 +652,33 @@
             init_keys( bp->keys_out, "-" );
             keys = bp->keys_out;
         }
-        for( p = rnode->pwd; *p; p++ ) {
+		for( p = rnode->pwd; *p; p++ )
             update_keys( keys, (int) *p );
         }
-    }
 
     log_rinfo( rnode );
     write_log( "we have: %d%c mail, %d%c files",
                SIZES( totalm ), SIZEC( totalm ), SIZES( totalf ), SIZEC( totalf ));
     rnode->starttime = time( NULL );
-    if ( cfgi( CFG_MAXSESSION )) {
+	if ( cfgi( CFG_MAXSESSION ))
         alarm( cci * 60 );
-    }
     DEBUG(('S',1,"Maxsession: %d",cci));
 
-    if ( bp->opt_cht & O_WANT ) {
+	if ( bp->opt_cht & O_WANT )
         chatinit( 0 );
-    }
 
-    if ( bp->opt_nd & O_WE || ( bp->to && ( bp->opt_nr & O_WANT) && BP_VER( bp ) >= 101 )) {
+	if ( bp->opt_nd & O_WE || ( bp->to && ( bp->opt_nr & O_WANT) && BP_VER( bp ) >= 101 ))
         bp->opt_nr |= O_WE;
-    }
 
-    if (( bp->opt_cht & O_WE ) && ( bp->opt_cht & O_WANT )) {
+	if (( bp->opt_cht & O_WE ) && ( bp->opt_cht & O_WANT ))
         bp->opt_cht = O_YES;
-    }
 
-    if ( BP_VER( bp ) > 100 || ( bp->opt_mb & O_WE )) {
+	if ( BP_VER( bp ) > 100 || ( bp->opt_mb & O_WE ))
         bp->opt_mb = O_YES;
-    } else {
+	else
         bp->opt_mb = O_NO;
-    }
 
-    if ( BP_VER( bp ) > 100 ) {
-        bp->delay_eob = 0;
-    }
+	bp->delay_eob = ( BP_VER( bp ) < 101 );
 
 	snprintf( tmp, 255, "Binkp%s%s%s%s%s%s%s%s%s",
 		( rnode->options & O_LST ) ? "/LST" : "",
@@ -702,8 +695,8 @@
 
     title( "%sbound session %s", bp->to ? "Out" : "In", ftnaddrtoa( &rnode->addrs->addr ));
     qemsisend( rnode );
-    qpreset( 0 );
-    qpreset( 1 );
+	qpreset( QPR_RECV );
+	qpreset( QPR_SEND );
 
 	sendf.allf = totaln;
 	sendf.ttot = totalf + totalm;
@@ -743,9 +736,8 @@
 
     DEBUG(('B',3,"FILE %s", buf));
 
-    if ( bp->sent_eob && bp->recv_eob ) {
+	if ( bp->sent_eob && bp->recv_eob )
         bp->sent_eob = 0;
-    }
 	bp->cls = 1;
 	bp->recv_eob = 0;
 
@@ -758,15 +750,15 @@
     if ( !file_parse( buf, &fname, &fsize, &ftime, &foffs )) {
         msgs( BPM_ERR, "M_FILE: unparsable file info: \"%s\"", buf );
         write_log( "Binkp: got unparsable file info: \"%s\"", buf );
-        if ( bp->send_file ) {
+		if ( bp->send_file )
             txclose( &txfd, FOP_ERROR );
-        }
         bp->rc = ( bp->to ? S_REDIAL | S_ADDTRY : S_BUSY );
         return 0;
     }
 
     if ( bp->rfname && !strncasecmp( fname, bp->rfname, MAX_PATH )
-            && bp->rmtime == ftime && recvf.ftot == fsize && recvf.soff == foffs ) {
+		&& bp->rmtime == ftime && recvf.ftot == fsize && recvf.soff == foffs )
+	{
 		bp->recv_file = 1;
 		bp->rxpos = foffs;
 		return 1;
@@ -780,10 +772,9 @@
         if ( fname[i] == '\\' && tolower( fname[i+1] ) == 'x' ) {
             fname[n++] = hexdcd( fname[i+2], fname[i+3] );
             i += 4;
-        } else {
+		} else
             fname[n++] = fname[i++];
         }
-    }
 
 	switch( rxopen( fname, ftime, fsize, &rxfd )) {
 	case FOP_ERROR:
@@ -801,9 +792,8 @@
 
     case FOP_OK:
         if ( foffs != -1 ) {
-            if ( !( bp->opt_nr & O_THEY )) {
+			if ( !( bp->opt_nr & O_THEY ))
                 bp->opt_nr |= O_THEY;
-            }
 			bp->recv_file = 1;
 			bp->rxpos = 0;
 			break;
@@ -879,24 +869,21 @@
         write_log( "Remote proposed password for us '%s'", buf );
     }
 
-    if (( bp->opt_md & ( O_THEY | O_WANT )) == ( O_THEY | O_WANT )) {
+	if (( bp->opt_md & ( O_THEY | O_WANT )) == ( O_THEY | O_WANT ))
         bp->opt_md = O_YES;
-    }
 
-    if ( !have_pwd || bp->opt_md != O_YES ) {
+	if ( !have_pwd || bp->opt_md != O_YES )
         bp->opt_cr = O_NO;
-    }
 
     snprintf( tmp, 128, "%s%s%s%s%s%s",
               ( bp->opt_nr & O_WANT ) ? " NR" : "",
               ( bp->opt_nd & O_THEY ) ? " ND" : "",
               ( bp->opt_mb & O_WANT ) ? " MB" : "",
               ( bp->opt_cht & O_WANT ) ? " CHAT" : "",
-              (( !( bp->opt_nd & O_WE )) != ( !( bp->opt_nd & O_THEY ))) ? " NDA": "",
+		/*(( !( bp->opt_nd & O_WE )) != ( !( bp->opt_nd & O_THEY ))) ? " NDA":*/ "",
               (( bp->opt_cr & O_WE ) && ( bp->opt_cr & O_THEY )) ? " CRYPT" : "" );
-    if ( strlen( tmp )) {
+	if ( strlen( tmp ))
         msgs( BPM_NUL, "OPT%s", tmp );
-    }
 
 	msgs( BPM_NUL, "TRF %lu %lu", totalm, totalf );
 	msgs( BPM_OK, "%ssecure", have_pwd ? "" : "non-" );
@@ -968,6 +955,8 @@
 		}
 	}
 
+	qpreset( QPR_RECV );
+
 	DEBUG(('B',4,"cls=%d, sent_eob=%d, recv_eob=%d", bp->cls, bp->sent_eob, bp->recv_eob));
 
 	return 1;
@@ -1014,14 +1003,16 @@
 static int M_get(BPS *bp, byte *arg)
 {
     char	*buf = (char *) arg, *fname;
-    long	fsize, ftime, foffs;
+	long	fsize, foffs;
+	time_t	ftime;
 
     DEBUG(('B',3,"GET %s", buf));
 
     if ( file_parse( buf, &fname, &fsize, &ftime, &foffs )) {
         if ( bp->send_file && sendf.fname
                 && !strncasecmp( fname,sendf. fname, MAX_PATH)
-                && sendf.mtime == ftime && sendf.ftot == fsize ) {
+			&& sendf.mtime == ftime && sendf.ftot == fsize )
+		{
 			if ( fseeko( txfd, foffs, SEEK_SET ) < 0 ) {
 				write_log( "can't send file from requested offset" );
 				msgs( BPM_ERR, "Can't send file from requested offset" );
@@ -1033,12 +1024,10 @@
                 msgs( BPM_FILE, "%s %lu %ld %lu", sendf.fname, (long) sendf.ftot,
                       sendf.mtime, (long) foffs );
             }
-        } else {
+		} else
             write_log( "Binkp: got M_GET for unknown file" );
-        }
-    } else {
+	} else
         DEBUG(('B',1,"got unparsable fileinfo"));
-    }
 
 	return 1;
 }
@@ -1052,21 +1041,26 @@
     char 	*buf = (char *) arg;
     char 	*fname;
     int 	id = *bp->rx_buf;
-    long 	fsize, ftime;
+	long 	fsize;
+	time_t	ftime;
 
     DEBUG(('B',3,"%s %s", mess[id], buf));
 
     if ( file_parse( buf, &fname, &fsize, &ftime, NULL )) {
         if ( sendf.fname && !strncasecmp( fname, sendf.fname, MAX_PATH )
-                && sendf.mtime == ftime && sendf.ftot == fsize ) {
+			&& sendf.mtime == ftime && sendf.ftot == fsize )
+		{
+			int	is_skip = ( id == BPM_SKIP );
+
             if ( bp->send_file ) {
                 DEBUG(('B',1,"file %s %s",
                        sendf.fname,
-                       ( id == BPM_GOT ) ? "skipped" : "suspended"));
+					is_skip ? "suspended" : "skipped"));
 
-                txclose( &txfd, ( id == BPM_GOT ) ? FOP_SKIP : FOP_SUSPEND );
-                bp->ticskip = ( id == BPM_GOT ) ? 1 : 2;
-                bp->oflist->suspend = ( id == BPM_SKIP );
+				txclose( &txfd, is_skip ? FOP_SUSPEND : FOP_SKIP );
+				bp->ticskip = is_skip + 1;
+				bp->oflist->suspend = is_skip;
+				bp->was_suspend += is_skip;
 				flexecute( bp->oflist );
 				bp->send_file = 0;
 				qpfsend();
@@ -1076,57 +1070,21 @@
             if ( bp->wait_got ) {
                 DEBUG(('B',1,"file %s %s",
                        sendf.fname,
-                       ( id == BPM_GOT ) ? "done" : "suspended"));
+					is_skip ? "suspended" : "done"));
 
                 bp->wait_got = 0;
-                txclose( &txfd, ( id == BPM_GOT ) ? FOP_OK : FOP_SUSPEND );
+				txclose( &txfd, is_skip ? FOP_SUSPEND : FOP_OK );
 
-                bp->ticskip = ( id == BPM_GOT ) ? 0 : 2;
-                bp->oflist->suspend = ( id == BPM_SKIP );
+				bp->ticskip = is_skip ? 2 : 0;
+				bp->oflist->suspend = is_skip;
+				bp->was_suspend += is_skip;
                 flexecute( bp->oflist );
                 qpfsend();
-            } else {
+			} else
                 write_log( "Binkp: got M_%s for unknown file", mess[id] );
             }
-        }
-#if 0
-        if ( bp->send_file && sendf.fname && !strncasecmp( fname, sendf.fname, MAX_PATH )
-                && sendf.mtime == ftime && sendf.ftot == fsize ) {
-
-            DEBUG(('B',1,"file %s %s", sendf.fname, ( id == BPM_GOT ) ? "skipped" : "suspended"));
-            txclose( &txfd, ( id == BPM_GOT ) ? FOP_SKIP : FOP_SUSPEND );
-            if ( id == BPM_GOT ) {
-                flexecute( bp->oflist );
-                bp->ticskip = 1;
-            } else {
-                bp->ticskip = 2;
-            }
-            bp->send_file = 0;
-            qpfsend();
-            return 1;
-        }
-
-        if ( bp->wait_got && sendf.fname && !strncasecmp( fname, sendf.fname, MAX_PATH )
-                && sendf.mtime == ftime && sendf.ftot == fsize ) {
-
-            DEBUG(('B',1,"file %s %s", sendf.fname, ( id == BPM_GOT ) ? "done" : "suspended"));
-            bp->wait_got = 0;
-            txclose( &txfd, ( id == BPM_GOT ) ? FOP_OK : FOP_SUSPEND );
-
-            if ( id == BPM_GOT ) {
-                flexecute( bp->oflist );
-                bp->ticskip = 0;
-            } else {
-                bp->ticskip = 2;
-            }
-            qpfsend();
-        } else {
-            write_log( "Binkp: got M_%s for unknown file", mess[id] );
-        }
-#endif
-    } else {
+	} else
         DEBUG(('B',1,"got unparsable fileinfo"));
-    }
 	return 1;
 }
 
@@ -1137,11 +1095,10 @@
 static int M_chat(BPS *bp, byte *arg)
 {
     DEBUG(('B',3,"CHAT"));
-    if ( bp->opt_cht == O_YES ) {
+	if ( bp->opt_cht == O_YES )
         binkp_devrecv( arg );
-    } else {
+	else
         DEBUG(('B',1,"got chat msg with disabled chat"));
-    }
 	return 1;
 }
 
@@ -1173,11 +1130,10 @@
         if ( bp->nmsgs ) {			/* there are unsent messages */
             for( i = 0; i < bp->nmsgs; i++ ) {
                 if ( bp->mqueue[i].msg ) {
-                    if ( (unsigned int) (bp->mqueue[i].len + bp->tx_left) > MAX_BLKSIZE ) {
+					if ( (unsigned int) (bp->mqueue[i].len + bp->tx_left) > MAX_BLKSIZE )
                         break;
-                    }
 
-                    memcpy( (void *) (bp->tx_buf + bp->tx_left),
+					memmove( (void *) (bp->tx_buf + bp->tx_left),
 						bp->mqueue[i].msg, bp->mqueue[i].len );
 					bp->tx_left += bp->mqueue[i].len;
 					xfree( bp->mqueue[i].msg );
@@ -1192,18 +1148,18 @@
         } else if ( bp->send_file && txfd && !bp->wait_for_get ) {
             int blksz = MIN( BP_BLKSIZE, sendf.ftot - bp->txpos );
 
-            if (( rc = fread( bp->tx_buf + BLK_HDR_SIZE, 1, blksz, txfd )) < 0 ) {
+			if (( rc = fread( bp->tx_buf + BLK_HDR_SIZE, 1, blksz, txfd )) < blksz ) {
                 sline("Binkp: file read error at pos %lu", bp->txpos);
-                DEBUG(('B',1,"Binkp: file read error at pos %lu", bp->txpos));
+				write_log( "file read error at pos %lu: read %i, expected %i",
+					bp->txpos, rc, blksz );
                 txclose( &txfd, FOP_ERROR );
                 bp->send_file = 0;
             } else {
                 DEBUG(('B',2,"read %d bytes of %d (data)", rc, blksz));
                 if ( rc ) {
                     mkheader( bp->tx_buf, rc );
-                    if ( bp->opt_cr == O_YES ) {
+					if ( bp->opt_cr == O_YES )
                         encrypt_buf( (void *) bp->tx_buf, (size_t) (rc + BLK_HDR_SIZE), bp->keys_out );
-                    }
 					bp->txpos += rc;
 					sendf.foff += rc;
 					bp->tx_left = rc + BLK_HDR_SIZE;
@@ -1224,9 +1180,9 @@
         bp->saved_errno = errno;
 
         if ( rc < 0 ) {
-            if ( EWBOEA() ) {
+			if ( EWBOEA() )
                 return 1;
-            } else {
+			else {
 				bp->error = 1;
 				return 0;
 			}
@@ -1253,7 +1209,8 @@
     DEBUG(('B',4,"got: data %d",bp->rx_size));
     DEBUG(('B',4,"data: rxpos %lu, recvf.foff %lu", (long) bp->rxpos, (long) recvf.foff ));
 
-    snprintf( tmp, 511, "%s %lu %lu", bp->rfname, (long) recvf.ftot, bp->rmtime );
+	snprintf( tmp, 511, "%s %lu %lu", bp->rfname, (long) recvf.ftot,
+		(long unsigned) bp->rmtime );
 
 	if ( rxstatus ) {
 		msgs(( rxstatus == RX_SUSPEND ) ? BPM_SKIP : BPM_GOT, tmp );
@@ -1262,7 +1219,7 @@
         return 1;
     }
 
-    if (( n = fwrite( bp->rx_buf, 1, bp->rx_size, rxfd )) < 0 ) {
+	if (( n = fwrite( bp->rx_buf, 1, bp->rx_size, rxfd )) < bp->rx_size ) {
 		bp->recv_file = 0;
 		sline( "Binkp: file write error" );
 		write_log( "can't write to %s, suspended", recvf.fname );
@@ -1307,9 +1264,9 @@
 
     DEBUG(('B',4,"recv-> blksz: %d, rx_ptr: %d, rx_size: %d", blksz, bp->rx_ptr, bp->rx_size));
 
-    if ( blksz == 0 ) {
+	if ( blksz == 0 )
         readsz = 0;
-    } else {
+	else {
 		getevt();
 
 		readsz = recv( tty_fd, &bp->rx_buf[bp->rx_ptr], (size_t) (blksz - bp->rx_ptr), 0 );
@@ -1317,9 +1274,9 @@
         bp->saved_errno = errno;
 
         if ( readsz < 0 ) {
-            if ( EWBOEA() ) {
+			if ( EWBOEA() )
                 return 1;
-            } else {
+			else {
 				bp->error = 1;
 				return 0;
 			}
@@ -1329,10 +1286,9 @@
             return 0;
         }
 
-        if ( bp->opt_cr == O_YES ) {
+		if ( bp->opt_cr == O_YES )
             decrypt_buf( (void *) &bp->rx_buf[bp->rx_ptr], (size_t) readsz, bp->keys_in );
         }
-    }
 
 	bp->rx_ptr += readsz;
 	DEBUG(('B',3,"rcvd: %d bytes", readsz ));
@@ -1344,9 +1300,8 @@
             bp->rx_ptr = 0;
             DEBUG(('B',2,"rcvd header: %d (%s)", bp->rx_size, HMD(bp)));
 
-            if ( bp->rx_size == 0 ) {
+			if ( bp->rx_size == 0 )
                 goto ZeroLen;
-            }
 
 			rc = 1;
 		} else {				/* Next block */
@@ -1386,9 +1341,8 @@
             bp->rx_ptr = 0;
             bp->rx_size = -1;
         }
-    } else {
+	} else
         rc = 1;
-    }
     
 	return rc;
 }
@@ -1429,9 +1383,8 @@
     msgs( BPM_NUL, "NDL %d,%s", cfgi( CFG_SPEED ), ccs );
 
     recode_to_remote( cfgs( CFG_PHONE ));
-    if ( ccs && *ccs ) {
+	if ( ccs && *ccs )
         msgs( BPM_NUL, "PHN %s", ccs );
-    }
 
 	tt = time( NULL );
 	tm = localtime( &tt );
@@ -1439,9 +1392,8 @@
     if ( offset < 0 ) {
         negative = 1;
         offset = -offset;
-    } else {
+	} else
         negative = 0;
-    }
 
 	msgs( BPM_NUL, "TIME %s, %2d %s %04d %02d:%02d:%02d %c%02d%02d",
 		weekday_names[tm->tm_wday],
@@ -1456,7 +1408,7 @@
     msgs( BPM_NUL, "VER %s %s", tmp, BP_PROT "/" BP_VERSION );
 
     if ( bp->to ) {
-        msgs( BPM_NUL, "OPT NDA%s%s%s%s%s",
+		msgs( BPM_NUL, "OPT %s%s%s%s%s",
 			( bp->opt_nr  & O_WANT ) ? " NR"    : "",
 			( bp->opt_nd  & O_THEY ) ? " ND"    : "",
 			( bp->opt_mb  & O_WANT ) ? " MB"    : "",
@@ -1492,19 +1444,19 @@
 
     if ( binkp_init( mode ) != OK ) {
         binkp_deinit();
-        if ( mode ) {
+		if ( mode )
             return (S_REDIAL | S_ADDTRY);
-        } else {
+		else
             return S_FAILURE;
         }
-    }
 
     bps->remaddr = remaddr;
-    xfree( rnode->phone );
+	restrcpy( &rnode->phone, "-Unpublished-" );
 
 	rxstatus = 0;
 	totaln = totalf = totalm = 0;
 	got_req = 0;
+	emsi_lo = ( is_freq_available() == FR_NOTHANDLED ) ? O_NOFREQS : 0;
 	receive_callback = receivecb;
 
 	write_log( "starting %sbound Binkp session", mode ? "out" : "in" );
@@ -1521,18 +1473,17 @@
             DEBUG(('B',2,"finding files"));
             DEBUG(('B',3,"oflist: %.8p, fl: %.8p", bps->oflist, fl));
 
-            if ( bps->oflist && bps->oflist != fl ) {
+			if ( bps->oflist && bps->oflist != fl )
                 bps->oflist = bps->oflist->next;
-            }
 
-            if ( bps->oflist ) {
+			if ( bps->oflist )
                 rc = cfgi( CFG_AUTOTICSKIP ) ? bps->ticskip : 0;
-            }
 
             while( bps->oflist && !txfd ) {
                 if ( !bps->oflist->sendas
                         || ( rc && istic( bps->oflist->tosend ))
-                        || !( txfd = txopen( bps->oflist->tosend, bps->oflist->sendas ))) {
+					|| !( txfd = txopen( bps->oflist->tosend, bps->oflist->sendas )))
+				{
 					if ( rc && istic( bps->oflist->tosend )) {
 						write_log( "tic file '%s' auto-%sed", bps->oflist->tosend,
 							rc == 1 ? "skipp" : "suspend" );
@@ -1553,29 +1504,28 @@
                 bps->txpos = ( bps->wait_for_get = ( bps->opt_nr & O_WE )) ? -1 : 0;
                 msgs( BPM_FILE, "%s %lu %lu %ld", sendf.fname, (long) sendf.ftot, sendf.mtime, bps->txpos );
 
-                if ( bps->wait_for_get ) {
+				if ( bps->wait_for_get )
                     DEBUG(('B',2,"waiting for M_GET"));
-                }
                 bps->sent_eob = 0;
                 bps->cls = 1;
-            } else {
+			} else
                 bps->nofiles = 1;
             }
-        }
         
 		if ( !bps->init && bps->nofiles && !bps->wait_got && !bps->sent_eob && !bps->delay_eob ) {
 			msgs( BPM_EOB, NULL );
 			bps->sent_eob = 1;
+			qpreset( QPR_SEND );
         }
 
         bps->rc = S_OK;
 
         if ( bps->sent_eob && bps->recv_eob ) {
             DEBUG(('B',4,"mib=%d", bps->mib));
-            if ( bps->mib < 3 || BP_VER( bps ) <= 100 ) {
+			if ( bps->mib < 3 || BP_VER( bps ) < 101 )
                 break;
-            }
 			bps->mib = bps->sent_eob = bps->recv_eob = 0;
+			continue;
 		}
 
 		wd = ( bps->nmsgs || bps->tx_left || ( bps->send_file && txfd && !bps->wait_for_get));
@@ -1598,13 +1548,11 @@
             break;
         }
 
-        if ( rd && !binkp_recv( bps )) {
+		if ( rd && !binkp_recv( bps ))
             break;
-        }
 
-        if ( wd && !binkp_send( bps )) {
+		if ( wd && !binkp_send( bps ))
             break;
-        }
 
 		check_cps();
 	}
@@ -1614,25 +1562,25 @@
 		msgs( BPM_EOB, NULL );
 	}
 
+	if ( bps->to && bps->was_suspend )
+		bps->rc |= ( S_REDIAL | S_ADDTRY );
+
     rc = bps->rc;
-    if ( bps->error == -1 ) {
+	if ( bps->error == -1 )
         write_log( "timeout" );
-    } else if ( bps->error > 0 ) {
+	else if ( bps->error > 0 )
         write_log( "%s", strerror( bps->saved_errno ));
-    }
 
     flkill( &fl, rc == S_OK );
 
     DEBUG(('B',1,"session done, rc=%d", rc));
 
     while( !bps->error ) {
-        if (( n = recv( tty_fd, bps->rx_buf, MAX_BLKSIZE, 0 )) == 0 ) {
+		if (( n = recv( tty_fd, bps->rx_buf, MAX_BLKSIZE, 0 )) == 0 )
             break;
-        }
         if ( n < 0 ) {
-            if ( !EWBOEA() ) {
+			if ( !EWBOEA() )
                 bps->error = 1;
-            }
 			break;
 		}
 		DEBUG(('B',4,"Purged %d bytes from input stream",n));
diff -burw ./qico/src/binkp.h ./trunk/src/binkp.h
--- ./qico/src/binkp.h	2024-02-01 18:09:52.531635000 +0300
+++ ./trunk/src/binkp.h	2024-02-01 18:10:34.580247000 +0300
@@ -1,6 +1,6 @@
 /******************************************************************
  * BinkP protocol
- * $Id: binkp.h,v 1.7 2005/08/22 17:19:41 mitry Exp $
+ * $Id: binkp.h 53 2023-10-12 08:43:45Z semik $
  ******************************************************************/
 
 #ifdef WITH_BINKP
@@ -124,6 +124,8 @@
     
     char *rfname;		/* Receiving file name */
     time_t rmtime;		/* ... mtime */
+
+    byte was_suspend;		/* Remote suspended some files */
 
     int ticskip;
     int nofiles;
diff -burw ./qico/src/call.c ./trunk/src/call.c
--- ./qico/src/call.c	2024-02-01 18:09:52.531743000 +0300
+++ ./trunk/src/call.c	2024-02-01 18:10:34.586218000 +0300
@@ -2,7 +2,7 @@
  * outgoing call implementation
  **********************************************************/
 /*
- * $Id: call.c,v 1.10 2005/08/16 20:23:23 mitry Exp $
+ * $Id: call.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: call.c,v $
  * Revision 1.10  2005/08/16 20:23:23  mitry
@@ -40,10 +40,9 @@
     if ( cfgs( CFG_RUNONCALL )) {
         char buf[MAX_PATH];
         snprintf( buf, MAX_PATH, "%s %s %s", ccs, ftnaddrtoa( fa ), port ? port : site );
-        if (( rc = execsh( buf ))) {
+        if (( rc = execsh( buf )))
             write_log( "exec '%s' returned rc=%d", buf, rc);
         }
-    }
 
     IFPerl( if (( rc = perl_on_call( fa, site, port )) != S_OK ) return rc );
 
@@ -84,11 +83,10 @@
         if ( cfgs( CFG_LOGINSCRIPT )) {
             char buf[MAX_PATH];
 
-            if ( *ccs == '!' ) {
+            if ( *ccs == '!' )
                 xstrcat( buf, ccs + 1, MAX_PATH - 1 );
-            } else {
+            else
                 snprintf( buf, MAX_PATH, "%s %s %s", ccs, ftnaddrtoa( fa ), port ? port : site );
-            }
 
             switch (( rc = execsh( buf ))) {
                 case EXT_OK:
@@ -118,11 +116,10 @@
         }
 
         sline( "Hanging up..." );
-        if ( port ) {
+        if ( port )
             modem_done();
-        } else {
+        else
             tcp_done();
-        }
         
     }
 
@@ -140,9 +137,8 @@
 
     rc = nodelist_query( fa, &rnode );
 
-    if ( rc != 1 ) {
+    if ( rc != 1 )
         write_log( ndl_errors[0 - rc] );
-    }
 
     if ( !rnode ) {
         rnode = xcalloc( 1, sizeof( ninfo_t ));
@@ -156,36 +152,30 @@
 
     if (( flags & FC_ANY ) != FC_ANY ) {
         do {
-            if ( !ports ) {
+            if ( !ports )
                 return S_FAILURE;
-            }
 
             port = tty_findport( ports, cfgs( CFG_NODIAL ));
-            if ( !port ) {
+            if ( !port )
                 return S_FAILURE;
-            }
-            if ( rnode->tty ) {
+            if ( rnode->tty )
                 xfree( rnode->tty );
-            }
 
             rnode->tty = xstrdup( baseport( port ));
             ports = ports->next;
         } while( !checktimegaps( cfgs( CFG_CANCALL )));
 
-        if ( !checktimegaps( cfgs( CFG_CANCALL ))) {
+        if ( !checktimegaps( cfgs( CFG_CANCALL )))
             return S_FAILURE;
-        }
     } else {
         if (( port = tty_findport( ports, cfgs( CFG_NODIAL )))) {
             rnode->tty = xstrdup( baseport( port ));
-        } else {
+        } else
             return S_FAILURE;
         }
-    }
 
-    if ( !cfgi( CFG_TRANSLATESUBST )) {
+    if ( !cfgi( CFG_TRANSLATESUBST ))
         phonetrans( &rnode->phone, cfgsl( CFG_PHONETR ));
-    }
 
     if ( line ) {
         applysubst( rnode, psubsts );
@@ -209,9 +199,8 @@
         }
     }
 
-    if ( cfgi( CFG_TRANSLATESUBST )) {
+    if ( cfgi( CFG_TRANSLATESUBST ))
         phonetrans( &rnode->phone, cfgsl( CFG_PHONETR ));
-    }
 
     if( !log_init( cfgs( CFG_LOG ), rnode->tty )) {
         write_log( "can't open log %s", ccs );
diff -burw ./qico/src/charset.h ./trunk/src/charset.h
--- ./qico/src/charset.h	2024-02-01 18:09:52.531816000 +0300
+++ ./trunk/src/charset.h	2024-02-01 18:10:34.581993000 +0300
@@ -1,6 +1,6 @@
 /**********************************************************
  * koi8r->cp866 and cp866->koi8-r tables by sisoft\\trg.
- * $Id: charset.h,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+ * $Id: charset.h 18 2010-08-23 15:50:49Z semik $
  **********************************************************/
 #ifndef __CHARSET_H__
 #define __CHARSET_H__
diff -burw ./qico/src/clserv.c ./trunk/src/clserv.c
--- ./qico/src/clserv.c	2024-02-01 18:09:52.531922000 +0300
+++ ./trunk/src/clserv.c	2024-02-01 18:10:34.584853000 +0300
@@ -2,9 +2,12 @@
  * client/server tools
  **********************************************************/
 /*
- * $Id: clserv.c,v 1.6 2005/08/22 17:12:45 mitry Exp $
+ * $Id: clserv.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: clserv.c,v $
+ * Revision 1.7  2006/07/18 22:22:09  mitry
+ * Make qico daemon to start on FreeBSD 4.6.2 :)
+ *
  * Revision 1.6  2005/08/22 17:12:45  mitry
  * Close socket fd if didn't make connection
  *
@@ -46,22 +49,30 @@
 	struct sockaddr_in	sa;
 	struct servent		*se;
 
+	memset( &sa, 0, sizeof sa);
     sa.sin_family = AF_INET;
 
     DEBUG(('I',1,"cls_conn: type=%d, port=%s, addr=%s", type, port, addr));
 
-    if ( port && atoi( port )) {
+	if ( port ) {
+		if ( atoi( port )) {
         sa.sin_port = htons( atoi( port ));
-    } else if( port && ( se = getservbyname( port, (type & CLS_UDP ) ? "udp" : "tcp" ))) {
+		}
+		else if (( se = getservbyname( port, ( type & CLS_UDP ) ? "udp" : "tcp" ))) {
         sa.sin_port = se->s_port;
-    } else if( !port && ( se = getservbyname( "qicoui", ( type & CLS_UDP ) ? "udp" : "tcp" ))) {
-        sa.sin_port = se->s_port;
-    } else if( !port ) {
-        sa.sin_port = htons( DEF_SERV_PORT );
-    } else {
+		}
+		else {
+			DEBUG(('I',1,"cls_conn: can't parse port"));
 			errno = EINVAL;
 			return -1;
 		}
+	}
+	else if (( se = getservbyname( "qicoui", ( type & CLS_UDP ) ? "udp" : "tcp" ))) {
+		sa.sin_port = se->s_port;
+	}
+	else {
+		sa.sin_port = htons( DEF_SERV_PORT );
+	}
 	
 	if ( addr ) {
 		int		a1;
@@ -69,13 +80,16 @@
 
         if ( sscanf( addr, "%d.%d.%d.%d", &a1, &a1, &a1, &a1 ) == 4 ) {
             sa.sin_addr.s_addr = inet_addr( addr );
-        } else if (( he = gethostbyname( addr ))) {
-            memcpy( &sa.sin_addr, he->h_addr, he->h_length );
-        } else {
+		}
+		else if (( he = gethostbyname( addr ))) {
+			memmove( &sa.sin_addr, he->h_addr, he->h_length );
+		}
+		else {
             DEBUG(('I',1,"cls_conn: unknown address: %s", addr));
             return -1;
         }
-    } else {
+	}
+	else {
 		sa.sin_addr.s_addr = htonl(( type & CLS_UDP ) ? INADDR_LOOPBACK : INADDR_ANY );
 	}
 
@@ -92,9 +106,8 @@
         }
 
         f = fcntl( rc, F_GETFL, 0);
-        if ( f >= 0 ) {
+		if ( f >= 0 )
             fcntl( rc, F_SETFL, f | O_NONBLOCK );
-        }
 
 		if ( bind( rc, (struct sockaddr *) &sa, sizeof( sa )) < 0 ) {
 			DEBUG(('I',1,"cls_conn: can't bind address (%s): %s",
@@ -127,18 +140,16 @@
 
 void cls_close(int sock)
 {
-    if ( sock >= 0 ) {
+	if ( sock >= 0 )
         close( sock );
     }
-}
 
 
 void cls_shutd(int sock)
 {
 #ifdef HAVE_SHUTDOWN
-    if ( sock >= 0 ) {
+	if ( sock >= 0 )
         shutdown( sock, SHUT_RDWR );
-    }
 #endif
 	cls_close( sock );
 }
@@ -154,12 +165,11 @@
         errno = EBADF;
         return -1;
     }
-    if ( !len ) {
+	if ( !len )
         return 0;
-    }
     b = xmalloc( len + 2 );
     STORE16( b, l );
-    memcpy( b + 2, buf, len );
+	memmove( b + 2, buf, len );
 	rc = sendto( sock, b, len + 2, 0, to, sizeof( struct sockaddr ));
 	xfree( b );
 	return rc;
@@ -191,36 +201,28 @@
         FD_SET( sock, &rfd );
         rc = select( sock + 1, &rfd, NULL, NULL, &tv );
         if ( rc < 1 ) {
-            if ( !rc ) {
+			if ( !rc )
                 errno = EAGAIN;
-            }
             return -1;
         }
     }
     rc = recv( sock, &l, 2, MSG_PEEK | MSG_WAITALL );
-    if ( rc <= 0 ) {
+	if ( rc <= 0 )
         return rc;
-    }
     if ( rc == 2 ) {
         l = I2H16( l );
-        if ( !l ) {
+		if ( !l )
             return 0;
-        }
-        if ( l > len ) {
+		if ( l > len )
             l = len;
-        }
         rc = recv( sock, buf, MIN( l + 2, len ), MSG_WAITALL );
-        if ( rc <= 0 ) {
+		if ( rc <= 0 )
             return rc;
-        }
         rc = MIN( rc - 2, FETCH16( buf ));
-        if ( rc < 1 ) {
+		if ( rc < 1 )
             return 0;
-        }
-        if ( rc >= len ) {
-            rc = len - 2;
-        }
-        memcpy( buf, buf + 2, rc );
+		if ( rc >= len ) rc = len - 2;
+		memmove( buf, buf + 2, rc );
 		return rc;
 	}
 	return 0;
diff -burw ./qico/src/clserv.h ./trunk/src/clserv.h
--- ./qico/src/clserv.h	2024-02-01 18:09:52.531991000 +0300
+++ ./trunk/src/clserv.h	2024-02-01 18:10:34.582614000 +0300
@@ -1,4 +1,4 @@
-/* $Id: clserv.h,v 1.3 2005/05/16 11:17:30 mitry Exp $
+/* $Id: clserv.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: clserv.h,v $
  * Revision 1.3  2005/05/16 11:17:30  mitry
diff -burw ./qico/src/config.c ./trunk/src/config.c
--- ./qico/src/config.c	2024-02-01 18:09:52.532142000 +0300
+++ ./trunk/src/config.c	2024-02-01 18:10:34.598579000 +0300
@@ -2,7 +2,7 @@
  * Config parser.
  **********************************************************/
 /*
- * $Id: config.c,v 1.10 2005/08/23 16:51:29 mitry Exp $
+ * $Id: config.c 32 2012-12-06 12:41:51Z semik $
  *
  * $Log: config.c,v $
  * Revision 1.10  2005/08/23 16:51:29  mitry
@@ -34,6 +34,9 @@
 
 #define IS_COMMENT( t ) ( *t == ';' || *t == '#' || ( *t== '/' && t[1] == '/' ))
 
+#define REQUIRED_PARAM (1)
+#define NONIF_PARAM (2)
+#define CONFIGURED_PARAM (8)
 
 static int getstr(char **to, const char *from)
 {
@@ -44,12 +47,10 @@
 
 static int getpath(char **to, const char *from)
 {
-    if ( strcspn( from, "*[]?<>|" ) != strlen( from )) {
+	if ( strcspn( from, "*[]?<>|" ) != strlen( from ))
         return 0;
-    }
-    if ( from[strlen( from ) - 1] == '/' ) {
+	if ( from[strlen( from ) - 1] == '/' )
         chop( (char *) from, 1 );
-    }
 	*to = xstrdup( from );
 	return 1;
 }
@@ -57,9 +58,8 @@
 
 static int getlong(int *to, const char *from)
 {
-    if ( strspn( from, "0123456789 \t" ) != strlen( from )) {
+	if ( strspn( from, "0123456789 \t" ) != strlen( from ))
         return 0;
-    }
 	*to = atol( from );
 	return 1;
 }
@@ -67,9 +67,8 @@
 
 static int getoct(int *to, const char *from)
 {
-    if ( strspn( from, "01234567 \t" ) != strlen( from )) {
+	if ( strspn( from, "01234567 \t" ) != strlen( from ))
         return 0;
-    }
 	*to = strtol( from, (char**) NULL, 8 );
 	return 1;
 }
@@ -79,9 +78,8 @@
 {
     FTNADDR_T(ta);
 
-    if ( !parseftnaddr( from, &ta, &DEFADDR, 0 )) {
+	if ( !parseftnaddr( from, &ta, &DEFADDR, 0 ))
         return 0;
-    }
 	if ( !DEFADDR.z ) {
 		DEFADDR.z = ta.z;
 		DEFADDR.n = ta.n;
@@ -96,17 +94,15 @@
     char		*p;
     FTNADDR_T	(ta);
 
-    if ( !parseftnaddr( from, &ta, &DEFADDR, 0 )) {
+	if ( !parseftnaddr( from, &ta, &DEFADDR, 0 ))
         return 0;
-    }
     if ( !DEFADDR.z ) {
         DEFADDR.z = ta.z;
         DEFADDR.n = ta.n;
     }
     p = strchr( from, ' ' );
-    if ( !p ) {
+	if ( !p )
         return 0;
-    }
 	p = skip_blanks( p );
 	faslist_add( to, p, &ta );
 	return 1;
@@ -165,13 +161,11 @@
     cfgitem_t *ci, *cn = NULL;
 
     for( ci = configtab[i].items; ci; ci = ci->next ) {
-        if ( ci->condition && flagexp( ci->condition, 0 ) == 1 ) {
+		if ( ci->condition && flagexp( ci->condition, 0 ) == 1 )
             return cci = ci->value.v_int;
-        }
-        if ( !ci->condition ) {
+		if ( !ci->condition )
             cn = ci;
         }
-    }
 	return cci = cn->value.v_int;
 }
 
@@ -181,13 +175,11 @@
     cfgitem_t *ci, *cn = NULL;
 
     for( ci = configtab[i].items; ci; ci = ci->next ) {
-        if ( ci->condition && flagexp( ci->condition, 0 )) {
+		if ( ci->condition && flagexp( ci->condition, 0 ))
             return ccs = ci->value.v_char;
-        }
-        if ( !ci->condition ) {
+		if ( !ci->condition )
             cn = ci;
         }
-    }
 	return ccs = cn->value.v_char;
 }
 
@@ -197,13 +189,11 @@
     cfgitem_t *ci, *cn = NULL;
 
     for ( ci = configtab[i].items; ci; ci = ci->next ) {
-        if ( ci->condition && flagexp( ci->condition, 0 )) {
+		if ( ci->condition && flagexp( ci->condition, 0 ))
             return ccsl = ci->value.v_sl;
-        }
-        if ( !ci->condition ) {
+		if ( !ci->condition )
             cn = ci;
         }
-    }
 	return ccsl = cn->value.v_sl;
 }
 
@@ -213,13 +203,11 @@
     cfgitem_t *ci, *cn = NULL;
 
     for ( ci = configtab[i].items; ci; ci = ci->next ) {
-        if ( ci->condition && flagexp( ci->condition, 0 )) {
+		if ( ci->condition && flagexp( ci->condition, 0 ))
             return ccfasl = ci->value.v_fasl;
-        }
-        if ( !ci->condition ) {
+		if ( !ci->condition )
             cn = ci;
         }
-    }
 	return ccfasl = cn->value.v_fasl;
 }
 
@@ -229,13 +217,11 @@
     cfgitem_t *ci, *cn = NULL;
 
     for ( ci = configtab[i].items; ci; ci = ci->next ) {
-        if ( ci->condition && flagexp( ci->condition, 0 )) {
+		if ( ci->condition && flagexp( ci->condition, 0 ))
             return ccal = ci->value.v_al;
-        }
-        if ( !ci->condition ) {
+		if ( !ci->condition )
             cn = ci;
         }
-    }
 	return ccal = cn->value.v_al;
 }
 
@@ -246,9 +232,8 @@
     slist_t		*cc;
     cfgitem_t	*ci;
 
-    while( configtab[i].keyword && strcasecmp( configtab[i].keyword, kw )) {
+	while( configtab[i].keyword && strcasecmp( configtab[i].keyword, kw ))
         i++;
-    }
 
 	DEBUG(('C',2,"parse: '%s', '%s' [%d] on %s:%d%s%s",
 		kw,arg,i,cfgname,line,curcond?" (c) if ":"",curcond?curcond->str:""));
@@ -258,7 +243,7 @@
         return 0;
     }
 
-    if ( curcond && ( configtab[i].flags & 2 )) {
+        if ( curcond && ( configtab[i].flags & NONIF_PARAM )) {
 		write_log( "%s:%d: keyword '%s' can't be defined inside if-expression",
 			cfgname, line, kw );
 		return 0;
@@ -269,28 +254,25 @@
 
         for(; a && b && a->str == b->str; a = a->next, b = b->next );
 
-        if ( !a && !b ) {
+		if ( !a && !b )
             break;
         }
-    }
 
     if ( !ci ) {
         ci = (cfgitem_t *) xcalloc( 1, sizeof( cfgitem_t ));
-        for( cc = curcond; cc; cc = cc->next ) {
+		for( cc = curcond; cc; cc = cc->next )
             slist_addl( &ci->condition, cc->str );
-        }
         ci->next = configtab[i].items;
         configtab[i].items = ci;
     }
 
     if ( setvalue( ci, arg, configtab[i]. type )) {
-        if ( !( configtab[i].flags & 8 )) {
-            if ( !curcond ) {
-                configtab[i].flags |= 8;
-            } else {
+		if ( !( configtab[i].flags & CONFIGURED_PARAM )) {
+			if ( !curcond )
+				configtab[i].flags |= CONFIGURED_PARAM;
+			else
                 configtab[i].flags |= 4;
             }
-        }
 	} else {
 		xfree( ci );
 		write_log( "%s:%d: can't parse '%s %s'", cfgname, line, kw, arg );
@@ -331,9 +313,9 @@
 
     c = p;
     while( *c ) {
-        if ( *c == '\\' && !XBLANK( c + 1 )) {
+		if ( *c == '\\' && !XBLANK( c + 1 ))
             xstrcpy( c, c + 1, strlen( c ));
-        } else if ( IS_COMMENT( c )) {
+		else if ( IS_COMMENT( c )) {
 			*c = 0;
 			break;
 		}
@@ -361,23 +343,20 @@
         return 0;
     }
 
-    if ( verbose_config ) {
+    if ( verbose_config )
         printf( "***** %s\n", cfgname );
-    }
 
     while(( xrc = xfgets( s, LARGE_STRING, f )) >= 0 ) {
         line++;
 
-        if ( xrc == 0 ) {
+        if ( xrc == 0 )
             continue;
-        }
 
 contl:
         p = s;
 
-        if ( verbose_config ) {
+        if ( verbose_config )
             printf( "** cfg line: %d: '%s', len = %-4d\n", line, p, strlen( s ));
-        }
 
         t = p + strlen( p ) - 1;
 
@@ -390,9 +369,8 @@
 
         if ( *p != '{' ) {
             if ( *p == '$' && isgraph( p[1] ))
-                if (( k = strchr( p, '=' ))) {
+                if (( k = strchr( p, '=' )))
                     *k = ' ';
-                }
             t = strchr( p, ' ' );
             /*
             if ( !t )
@@ -400,13 +378,11 @@
             if ( !t )
                 t = strchr( p, '\r' );
             */
-            if( !t ) {
+            if( !t )
                 t = strchr( p, 0 );
-            }
             *t++ = 0;
-        } else {
+        } else
             t = p + 1;
-        }
 
 contd:
         t = skip_blanks( t );
@@ -433,13 +409,11 @@
                                 ( en ? "env" : "cfg" ), k + 2, as->arg );
                     e = xstrdup( e );
                     xstrcpy( k, as->arg, LARGE_STRING - ( k - s ));
-                    if ( *e ) {
+                    if ( *e )
                         xstrcat( k, e, LARGE_STRING - ( k - s ));
-                    }
                     xfree( e );
-                    if ( verbose_config ) {
+                    if ( verbose_config )
                         printf( "** cfg full line: '%s %s'\n", p, t );
-                    }
                 } else {
                     write_log( "%s:%d: use of uninitialized define '$%s'", cfgname, line, k + 2);
                     rc = 0;
@@ -449,9 +423,9 @@
             }
         }
 
-        if ( *p== '$' && isgraph( p[1] )) { /* Found new define */
+        if ( *p== '$' && isgraph( p[1] ))  /* Found new define */
             aslist_add( &defs, p + 1, t );
-        } else if ( !strcasecmp( p, "include" )) {
+        else if ( !strcasecmp( p, "include" )) {
             if(!strncmp(cfgname,t,MAX_STRING)) {
                 write_log("%s:%d: <include> including itself -> infinity loop",cfgname,line);
                 rc=0;
@@ -463,39 +437,24 @@
             for(k=t; *k&&(*k!=':'||k[1]!=' '); k++);
             if(*k==':'&&k[1]==' ') {
                 *k++=0;
-                if(*(k-2)==' ') {
-                    *(k-2)=0;
-                }
-                while(*k==' ') {
-                    k++;
-                }
+                if(*(k-2)==' ')*(k-2)=0;
+                while(*k==' ')k++;
                 for(p=k; *p&&*p!=' '; p++);
                 *p++=0;
-                while(*p==' ') {
-                    p++;
-                }
+                while(*p==' ')p++;
                 if(!*p) {
                     write_log("%s:%d: inline <if>-expression witout arguments",cfgname,line);
-                    rc=0;
-                    k=NULL;
+                    rc=0;k=NULL;
                 }
-                if(*(p+strlen(p)-1)=='}') {
-                    *(p+strlen(p)-1)=0;
-                }
-            } else {
-                k=NULL;
-            }
+                if(*(p+strlen(p)-1)=='}')*(p+strlen(p)-1)=0;
+            } else k=NULL;
             cc=slist_add(&condlist,t);
             if(flagexp(cc,1)<0) {
                 write_log("%s:%d: can't parse expression '%s'",cfgname,line,t);
                 rc=0;
-            } else {
-                slist_addl(&curcond,cc->str);
-            }
+            } else slist_addl(&curcond,cc->str);
             if(k&&curcond) {
-                if(!parsekeyword(k,p,cfgname,line)) {
-                    rc=0;
-                }
+                if(!parsekeyword(k,p,cfgname,line))rc=0;
                 slist_dell(&curcond);
             }
         } else if(!strcasecmp(p,"else")) {
@@ -512,13 +471,9 @@
             if(!curcond) {
                 write_log("%s:%d: misplaced <endif> without <if>",cfgname,line);
                 rc=0;
-            } else {
-                slist_dell(&curcond);
+            } else slist_dell(&curcond);
+        } else if(!parsekeyword(p,t,cfgname,line))rc=0;
             }
-        } else if(!parsekeyword(p,t,cfgname,line)) {
-            rc=0;
-        }
-    }
 
     fclose( f );
     return rc;
@@ -535,39 +490,29 @@
     aslist_kill(&defs);
     if(curcond) {
         write_log("%s: not all <if>-expressions closed",cfgname);
-        while(curcond) {
-            slist_dell(&curcond);
-        }
+        while(curcond)slist_dell(&curcond);
         rc=0;
     }
-    if(!rc) {
-        return 0;
-    }
-    for(i=0; i<CFG_NNN; i++)
-        if(!(configtab[i].flags&8)) {
-            if(configtab[i].flags&1) {
+    if(!rc)return 0;
+    for(i=0;i<CFG_NNN;i++) {
+            if(!(configtab[i].flags & CONFIGURED_PARAM)) {
+            if(configtab[i].flags & REQUIRED_PARAM) {
                 write_log("required keyword '%s' not defined",configtab[i].keyword);
                 rc=0;
             }
             ci=xcalloc(1,sizeof(cfgitem_t));
-            if(configtab[i].def_val) {
+            if(configtab[i].def_val)
                 setvalue(ci,configtab[i].def_val,configtab[i].type);
-            } else {
-                memset(&ci->value,0,sizeof(ci->value));
-            }
-            ci->condition=NULL;
-            ci->next=NULL;
+            else memset(&ci->value,0,sizeof(ci->value));
+            ci->condition=NULL;ci->next=NULL;
             if(configtab[i].flags&12) {
                 cfgitem_t *cia=configtab[i].items;
                 for(; cia&&cia->next; cia=cia->next);
-                if(cia) {
-                    cia->next=ci;
+                if(cia)cia->next=ci;
             }
+            if(!configtab[i].items)configtab[i].items=ci;
             }
-            if(!configtab[i].items) {
-                configtab[i].items=ci;
             }
-        }
     if(rc) { /* read tables */
         recode_to_local(NULL);
         recode_to_remote(NULL);
@@ -584,9 +529,8 @@
     killconfig();
 
     if ( !readconfig( configname )) {
-        if ( client >= 0 ) {
+        if ( client >= 0 )
             sendrpkt( 1, client, "Bad config, terminated");
-        }
         write_log( "There were some errors parsing config, exiting" );
         exit( S_FAILURE );
     }
@@ -596,11 +540,6 @@
         exit( S_FAILURE );
     }
 
-    if (! cfgal(CFG_ADDRESS)) {
-        write_log("No addresses defined");
-        exit( S_FAILURE );
-    }
-
     if ( outbound_init( cfgs( CFG_ASOOUTBOUND ), cfgs( CFG_BSOOUTBOUND ),
         cfgs( CFG_QSTOUTBOUND ), cfgal( CFG_ADDRESS )->addr.z ) == 0 ) {
 
@@ -613,9 +552,8 @@
 #ifdef NEED_DEBUG
     parse_log_levels();
 
-    if ( facilities_levels['C'] >= 8 ) {
+    if ( facilities_levels['C'] >= 8 )
         dumpconfig();
-    }
 #endif
 
     IFPerl( perl_on_reload( 0 ));
@@ -655,7 +593,9 @@
             xfree(c);
         }
         configtab[i].items=NULL;
-        configtab[i].flags=0;
+//        fprintf(stderr,"%i '%s' 0x%x -> ", i, configtab[i].keyword, configtab[i].flags);
+        configtab[i].flags &= (REQUIRED_PARAM | NONIF_PARAM);
+//        fprintf(stderr,"0x%x\n",configtab[i].flags);
     }
 }
 
@@ -681,14 +621,12 @@
                 xstrcat( buf, "if (", LARGE_STRING );
                 for( sl = c->condition; sl; sl = sl->next ) {
                     xstrcat( buf, sl->str, LARGE_STRING );
-                    if ( sl->next ) {
+					if ( sl->next )
                         xstrcat( buf, ") and (", LARGE_STRING );
                     }
-                }
                 xstrcat( buf, "): ", LARGE_STRING );
-            } else {
+			} else
                 xstrcat( buf, "default: ", LARGE_STRING );
-            }
 			
 			switch( configtab[i].type ) {
 			case C_PATH:
@@ -705,9 +643,8 @@
                 snprintf( buf + strlen( buf ), LARGE_STRING, "%s", c->value.v_int ? "yes" : "no" );
                 break;
             case C_STRL:
-                for( sl = c->value.v_sl; sl; sl = sl->next ) {
+				for( sl = c->value.v_sl; sl; sl = sl->next )
                     snprintf( buf + strlen( buf ), LARGE_STRING, "'%s', ", sl->str );
-                }
 				xstrcat( buf, "%", LARGE_STRING );
 				break;
 			case C_ADRSTRL:
diff -burw ./qico/src/crc.c ./trunk/src/crc.c
--- ./qico/src/crc.c	2024-02-01 18:09:52.532287000 +0300
+++ ./trunk/src/crc.c	2024-02-01 18:10:34.601580000 +0300
@@ -2,7 +2,7 @@
  * CRC and crypt.
  **********************************************************/
 /*
- * $Id: crc.c,v 1.5 2005/05/06 20:26:57 mitry Exp $
+ * $Id: crc.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: crc.c,v $
  * Revision 1.5  2005/05/06 20:26:57  mitry
@@ -15,7 +15,8 @@
 
 
 /* CRC polynomial 0xedb88320 -- CCITT CRC32. */
-UINT32 crc32_tab[256] = {
+UINT32 crc32_tab[256] =
+{
   0x00000000,0x77073096,0xee0e612c,0x990951ba,0x076dc419,0x706af48f,0xe963a535,0x9e6495a3,
   0x0edb8832,0x79dcb8a4,0xe0d5e91e,0x97d2d988,0x09b64c2b,0x7eb17cbd,0xe7b82d07,0x90bf1d91,
   0x1db71064,0x6ab020f2,0xf3b97148,0x84be41de,0x1adad47d,0x6ddde4eb,0xf4d4b551,0x83d385c7,
@@ -52,7 +53,8 @@
 
 
 /* CRC polynomial 0x1021 -- CCITT upside-down CRC16. EMSI,ZModem,Janus. */
-UINT16 crc16usd_tab[256] = {
+UINT16 crc16usd_tab[256] =
+{
   0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
   0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
   0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
@@ -89,7 +91,8 @@
 
 
 /* CRC polynomial 0x8408 -- CCITT proper CRC16. Hydra. */
-UINT16 crc16prp_tab[256] = {
+UINT16 crc16prp_tab[256] =
+{
   0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,
   0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
   0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,
@@ -130,9 +133,8 @@
     register UINT8 *str = (UINT8 *) string;
     register UINT32 crc;
 
-    for ( crc = CRC32_INIT; *str; str++ ) {
+    for ( crc = CRC32_INIT; *str; str++ )
         crc = (UINT32) CRC32_UPDATE( *str, crc );
-    }
     return crc;
 }
 
@@ -142,9 +144,8 @@
     register UINT8 *data = (UINT8 *) datablock;
     register UINT32 crc;
 
-    for ( crc = CRC32_INIT; size--; data++ ) {
+    for ( crc = CRC32_INIT; size--; data++ )
         crc = (UINT32) CRC32_UPDATE( *data, crc );
-    }
     return crc;
 }
 
@@ -154,9 +155,8 @@
     register UINT8 *str = (UINT8 *) string;
     register UINT16 crc;
 
-    for ( crc = CRC16USD_INIT; *str; str++ ) {
+    for ( crc = CRC16USD_INIT; *str; str++ )
         crc = (UINT16) CRC16USD_UPDATE( *str, crc );
-    }
     return crc;
 }
 
@@ -166,9 +166,8 @@
     register UINT8 *data = (UINT8 *) datablock;
     register UINT16 crc;
 
-    for ( crc = CRC16USD_INIT; size--; data++ ) {
+    for ( crc = CRC16USD_INIT; size--; data++ )
         crc = (UINT16) CRC16USD_UPDATE( *data, crc );
-    }
     return crc;
 }
 
@@ -178,9 +177,8 @@
     register UINT8 *str = (UINT8 *) string;
     register UINT16 crc;
 
-    for ( crc = CRC16PRP_INIT; *str; str++ ) {
+    for ( crc = CRC16PRP_INIT; *str; str++ )
         crc = (UINT16) CRC16PRP_UPDATE( *str, crc );
-    }
     return crc;
 }
 
@@ -190,9 +188,8 @@
     register UINT8 *data = (UINT8 *) datablock;
     register UINT16 crc;
 
-    for ( crc = CRC16PRP_INIT; size--; data++ ) {
+    for ( crc = CRC16PRP_INIT; size--; data++ )
         crc = (UINT16) CRC16PRP_UPDATE( *data, crc );
-    }
     return crc;
 }
 
@@ -231,10 +228,9 @@
 
 void decrypt_buf(char *buf, size_t bufsize, unsigned long keys[])
 {
-    while( bufsize-- ) {
+	while( bufsize-- )
         update_keys( keys, *buf++ ^= decrypt_byte( keys ));
     }
-}
 
 
 void encrypt_buf(char *buf, size_t bufsize, unsigned long keys[])
@@ -258,24 +254,15 @@
     UINT8 *q = (UINT8 *) data;
     for(i=0; i<size;) {
         c=q[i++]*256;
-        if(i<size) {
-            c+=q[i];
-        }
-        i++;
-        c*=256;
-        if(i<size) {
-            c+=q[i];
-        }
+		if(i<size)c+=q[i];
+		i++;c*=256;
+		if(i<size)c+=q[i];
         p[0]=b64[(c&0x00fc0000)>>18];
         p[1]=b64[(c&0x0003f000)>>12];
         p[2]=b64[(c&0x00000fc0)>>6];
         p[3]=b64[(c&0x0000003f)];
-        if(++i>size) {
-            p[3]='=';
-        }
-        if(i>size+1) {
-            p[2]='=';
-        }
+		if(++i>size)p[3]='=';
+		if(i>size+1)p[2]='=';
 		p+=4;
 	}
 	return(p-s);
diff -burw ./qico/src/crc.h ./trunk/src/crc.h
--- ./qico/src/crc.h	2024-02-01 18:09:52.532349000 +0300
+++ ./trunk/src/crc.h	2024-02-01 18:10:34.581408000 +0300
@@ -2,7 +2,7 @@
  * operations with CRC
  **********************************************************/
 /*
- * $Id: crc.h,v 1.6 2005/05/06 20:26:57 mitry Exp $
+ * $Id: crc.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: crc.h,v $
  * Revision 1.6  2005/05/06 20:26:57  mitry
diff -burw ./qico/src/cvsdate.h ./trunk/src/cvsdate.h
--- ./qico/src/cvsdate.h	2024-02-01 18:09:52.532393000 +0300
+++ ./trunk/src/cvsdate.h	2024-02-01 18:10:34.598222000 +0300
@@ -1 +1 @@
-char cvsdate[]="2013-02-23 10:16";
+char cvsdate[]="2012-12-27 12:00";
diff -burw ./qico/src/daemon.c ./trunk/src/daemon.c
--- ./qico/src/daemon.c	2024-02-01 18:09:52.532820000 +0300
+++ ./trunk/src/daemon.c	2024-02-01 18:10:34.585223000 +0300
@@ -2,9 +2,15 @@
  * qico daemon
  **********************************************************/
 /*
- * $Id: daemon.c,v 1.18 2005/08/16 14:46:44 mitry Exp $
+ * $Id: daemon.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: daemon.c,v $
+ * Revision 1.20  2007/03/19 23:41:39  mitry
+ * Fixed longrescan
+ *
+ * Revision 1.19  2007/01/28 17:55:00  mitry
+ * Add support for INA flag and IBN/IFC optional port number.
+ *
  * Revision 1.18  2005/08/16 14:46:44  mitry
  * Changed DEBUG message
  *
@@ -71,7 +77,7 @@
 static cls_ln_t *ln = NULL;
 static volatile int t_dial = 0;
 static volatile int c_delay;
-static volatile int rnum;
+static volatile signed int rnum;
 static volatile int reread_config = 0;
 
 #ifdef HAVE_DNOTIFY
@@ -82,16 +88,14 @@
 static void stop_daemon(void)
 {
 #ifdef HAVE_DNOTIFY
-    if ( dnot > 0 ) {
+	if ( dnot > 0 )
         close( dnot );
-    }
 #endif
     outbound_done();
     nodelist_done();
 
-    if ( cfgs( CFG_PIDFILE ) && getpid() == islocked( ccs )) {
+	if ( cfgs( CFG_PIDFILE ) && getpid() == islocked( ccs ))
         lunlink( ccs );
-    }
 
 	IFPerl(perl_done(0));
 
@@ -119,10 +123,9 @@
 #endif
     if ( pid > 0 ) {
         rc = WEXITSTATUS( rc ) & S_MASK;
-        if ( rc == S_OK || rc == S_REDIAL ) {
+		if ( rc == S_OK || rc == S_REDIAL )
             do_rescan = 1;
         }
-    }
 #ifdef SYS5SIGNALS
 	signal( sig, sigchild );
 #endif
@@ -163,11 +166,8 @@
 static char *sts_str(int flags)
 {
     static char s[Q_MAXBIT+1];
-    char qchars[]=Q_CHARS;
-    int i;
-    for(i=0; i<Q_MAXBIT; i++) {
-        s[i]=(flags&(1<<i))?qchars[i]:'.';
-    }
+	char qchars[]=Q_CHARS;int i;
+	for(i=0;i<Q_MAXBIT;i++)s[i]=(flags&(1<<i))?qchars[i]:'.';
 	s[Q_MAXBIT]=0;
 	return s;
 }
@@ -177,9 +177,7 @@
     cls_cl_t *uis;
     for(uis=cl; uis; uis=uis->next)
         if(uis->type=='e'&&(!tosend||tosend==uis->sock))
-            if(xsend(uis->sock,buf,len)<0) {
-                DEBUG(('I',1,"can't send to client %d (fd=%d): %s",uis->id,uis->sock,strerror(errno)));
-            }
+		if(xsend(uis->sock,buf,len)<0)DEBUG(('I',1,"can't send to client %d (fd=%d): %s",uis->id,uis->sock,strerror(errno)));
 	return len;
 }
 
@@ -197,23 +195,14 @@
         if(buf[2]==QC_EMSID||buf[2]==QC_LIDLE) {
             for(lins=ln; lins&&lins->id!=FETCH16(buf); lins=lins->next);
             if(lins) {
-                if(rc>4&&buf[2]==QC_EMSID) {
-                    lins->emsi=xrealloc(lins->emsi,rc);
-                } else {
-                    xfree(lins->emsi);
-                }
+				if(rc>4&&buf[2]==QC_EMSID)lins->emsi=xrealloc(lins->emsi,rc);
+				    else xfree(lins->emsi);
                 DEBUG(('I',4,"got emsi (%d)",lins->emsi?rc:0));
-                if(lins->emsi) {
-                    memcpy(lins->emsi,buf,rc);
-                }
+				if(lins->emsi)memmove(lins->emsi,buf,rc);
                 lins->emsilen=rc;
-            } else {
-                DEBUG(('I',1,"got emsi from unknown line %d",FETCH16(buf)));
+			} else DEBUG(('I',1,"got emsi from unknown line %d",FETCH16(buf)));
             }
-        }
-        if(rc>2) {
-            daemon_xsend(chld,buf,rc);
-        }
+		if(rc>2)daemon_xsend(chld,buf,rc);
 		return;
 	}
 	for(uis=cl;uis&&uis->sock!=chld;uis=uis->next);
@@ -221,9 +210,7 @@
         DEBUG(('I',1,"got message from unknown client (fd=%d), skipped",chld));
         return;
     }
-    if(rc>0) {
-        buf[rc]=0;
-    }
+	if(rc>0)buf[rc]=0;
 	if(buf[2]==QR_STYPE) {
 		DEBUG(('I',1,"client %d: type '%c' (%s)",uis->id,buf[3],buf+20));
 		if(!strchr("euic",buf[3])) {
@@ -248,9 +235,7 @@
             qpmydata();
             qsendqueue();
             for(lins=ln; lins; lins=lins->next)
-                if(lins->emsi) {
-                    daemon_xsend(chld,lins->emsi,lins->emsilen);
-                }
+			    if(lins->emsi)daemon_xsend(chld,lins->emsi,lins->emsilen);
 			tosend=0;
 		}
 		return;
@@ -264,12 +249,8 @@
         DEBUG(('I',2,"client %d: msg for pid %d",uis->id,FETCH16(buf)));
         for(lins=ln; lins&&lins->id!=FETCH16(buf); lins=lins->next);
         if(lins) {
-            if(xsendto(lins_sock,buf,rc,lins->addr)<0) {
-                DEBUG(('I',1,"can't send to line %d: %s",lins->id,strerror(errno)));
-            }
-        } else {
-            DEBUG(('I',2,"line not found"));
-        }
+			if(xsendto(lins_sock,buf,rc,lins->addr)<0)DEBUG(('I',1,"can't send to line %d: %s",lins->id,strerror(errno)));
+		} else DEBUG(('I',2,"line not found"));
 		return;
 	}
 	if(buf[2]==QR_POLL||buf[2]==QR_REQ||buf[2]==QR_INFO||
@@ -299,8 +280,7 @@
     case QR_SCAN:
         DEBUG(('I',2,"client %d: request rescan",uis->id));
         sendrpkt(0,chld,"");
-        do_rescan=1;
-        rnum=0;
+		do_rescan=1;rnum=0;
 		break;
 	    case QR_RESTMR:
 		sendrpkt(0,chld,"");
@@ -308,8 +288,7 @@
         t_dial=0;
         break;
     case QR_HANGUP: {
-        FILE *f;
-        int pid;
+		FILE *f;int pid;
 		char fname[MAX_PATH];
 		DEBUG(('I',2,"client %d: request hangup line '%s'",uis->id,buf+3));
 		sendrpkt(0,chld,"");
@@ -317,19 +296,14 @@
         if((f=fopen(fname,"r"))) {
             fscanf(f,"%d",&pid);
             fclose(f);
-            if(kill(pid,SIGHUP)<0&&errno==ESRCH) {
-                lunlink(fname);
+			if(kill(pid,SIGHUP)<0&&errno==ESRCH)lunlink(fname);
             }
-        }
-    }
-    break;
+		} break;
     case QR_POLL:
         DEBUG(('I',2,"client %d: request poll addr %s",uis->id,buf+3));
         if(outbound_locknode(&fa,LCK_t)) {
             p=buf+strlen(buf+3)+4;
-            if(*p=='?') {
-                *p=*cfgs(CFG_POLLFLAVOR);
-            }
+			if(*p=='?')*p=*cfgs(CFG_POLLFLAVOR);
 			rc=outbound_flavor(*p);
 			if(rc==F_ERR) {
 				sendrpkt(1,chld,"unknown flavour %c",C0(*p));
@@ -368,33 +342,16 @@
     case QR_STS:
         DEBUG(('I',2,"client %d: request flags change addr %s",uis->id,buf+3));
         p=buf+strlen(buf+3)+4;
-        rc=1;
-        res=0;
-        set=0;
+		rc=1;res=0;set=0;
         while(*p&&rc) {
             switch(*p) {
-            case 'W':
-                set|=Q_WAITA;
-                break;
-            case 'I':
-                set|=Q_IMM;
-                break;
-            case 'U':
-                set|=Q_UNDIAL;
-                break;
-            case 'w':
-                res|=Q_ANYWAIT;
-                break;
-            case 'i':
-                res|=Q_IMM;
-                break;
-            case 'u':
-                res|=Q_UNDIAL;
-                break;
-            case 'h':
-                set|=Q_WAITA;
-                rc=2;
-                break;
+			case 'W': set|=Q_WAITA;break;
+			case 'I': set|=Q_IMM;break;
+			case 'U': set|=Q_UNDIAL;break;
+			case 'w': res|=Q_ANYWAIT;break;
+			case 'i': res|=Q_IMM;break;
+			case 'u': res|=Q_UNDIAL;break;
+			case 'h': set|=Q_WAITA;rc=2;break;
 			default:
 				sendrpkt(1,chld,"unknown status action: %c",*p);
 				write_log("unknown status action: %c",*p);
@@ -405,23 +362,12 @@
         if(rc) {
             sendrpkt(0,chld,"");
             outbound_getstatus(&fa,&sts);
-            sts.flags|=set;
-            sts.flags&=~res;
-            p++;
-            if(rc!=2) {
-                write_log("changing status of %s to [%s]",ftnaddrtoa(&fa),sts_str(sts.flags));
-            } else {
-                write_log("hold %s for %d min (new status: [%s])",ftnaddrtoa(&fa),FETCH16(p),sts_str(sts.flags));
-            }
-            if(set&Q_WAITA&&!(res&Q_ANYWAIT)) {
-                sts.htime=timer_set((rc==2?(FETCH16(p)):cfgi(CFG_WAITHRQ))*60);
-            }
-            if(set&Q_UNDIAL) {
-                sts.utime=timer_set(cfgi(CFG_CLEARUNDIAL)*60);
-            }
-            if(res&Q_UNDIAL) {
-                sts.try=0;
-            }
+			sts.flags|=set;sts.flags&=~res;p++;
+			if(rc!=2)write_log("changing status of %s to [%s]",ftnaddrtoa(&fa),sts_str(sts.flags));
+			    else write_log("hold %s for %d min (new status: [%s])",ftnaddrtoa(&fa),FETCH16(p),sts_str(sts.flags));
+			if(set&Q_WAITA&&!(res&Q_ANYWAIT))sts.htime=timer_set((rc==2?(FETCH16(p)):cfgi(CFG_WAITHRQ))*60);
+			if(set&Q_UNDIAL)sts.utime=timer_set(cfgi(CFG_CLEARUNDIAL)*60);
+			if(res&Q_UNDIAL)sts.try=0;
 			outbound_setstatus(&fa,&sts);
 			do_rescan=1;
 		}
@@ -431,24 +377,17 @@
         DEBUG(('I',2,"client %d: request filereq addr %s",uis->id,buf+3));
         if(outbound_locknode(&fa,LCK_t)) {
             sendrpkt(0,chld,"");
-            sl=NULL;
-            p=buf+strlen(buf+3)+4;
+			sl=NULL;p=buf+strlen(buf+3)+4;
             while((l=strlen(p))) {
                 if(*p=='"'&&p[l-1]=='"') {
-                    l--;
-                    p[l]=0;
-                    p++;
-                    if(l<2) {
-                        goto skiprq;
+					l--;p[l]=0;p++;
+					if(l<2)goto skiprq;
                     }
-                }
                 write_log("requested '%s' from %s",p,ftnaddrtoa(&fa));
-                if( cfgs(CFG_MAPOUT) && strchr( ccs, 'r' )) {
+				if( cfgs(CFG_MAPOUT) && strchr( ccs, 'r' ))
                     recode_to_remote( p );
-                }
                 slist_add(&sl,p);
-skiprq:
-                p+=l+1;
+skiprq:				p+=l+1;
 			}
 			outbound_request(&fa,sl);
 			slist_kill(&sl);
@@ -464,14 +403,11 @@
             sendrpkt(1,chld,"can't lock node %s",ftnaddrtoa(&fa));
             write_log("can't lock node %s",ftnaddrtoa(&fa));
         }
-    }
-    break;
+		} break;
     case QR_SEND:
         DEBUG(('I',2,"client %d: request send addr %s",uis->id,buf+3));
         p=buf+strlen(buf+3)+4;
-        if(*p=='?') {
-            *p=*cfgs(CFG_POLLFLAVOR);
-        }
+		if(*p=='?')*p=*cfgs(CFG_POLLFLAVOR);
 		rc=outbound_flavor(*p);
 		if(rc==F_ERR) {
 			sendrpkt(1,chld,"unknown flavour %c",C0(*p));
@@ -498,7 +434,8 @@
             write_log("can't lock node %s",ftnaddrtoa(&fa));
         }
         break;
-    case QR_INFO: {
+	    case QR_INFO:
+	    	{
 	    		ninfo_t *rn;
 			DEBUG(('I',2,"client %d: request nlinfo addr %s",uis->id,buf+3));
 			rc = nodelist_query( &fa, &rn );
@@ -566,17 +503,15 @@
     }
     cls_close( ssock );
 
-    if ( cfgs( CFG_ROOTDIR ) && *ccs ) {
+	if ( cfgs( CFG_ROOTDIR ) && *ccs )
         chdir(ccs);
-    }
 
     if ( detached && getppid() != 1 ) {
         signal( SIGTTOU, SIG_IGN );
         signal( SIGTTIN, SIG_IGN );
         signal( SIGTSTP, SIG_IGN );
-        if (( rc = fork()) > 0 ) {
+		if (( rc = fork()) > 0 )
             exit( S_OK );
-        }
 		if ( rc < 0 ) {
 			write_log( "can't spawn daemon" );
 			exit( S_FAILURE );
@@ -590,9 +525,8 @@
     signal( SIGPIPE, SIG_IGN );
 
     if ( cfgs( CFG_PIDFILE )) {
-        if ( islocked( ccs )) {
+		if ( islocked( ccs ))
             lunlink( ccs );
-        }
 		if ( !lockpid( ccs )) {
 			write_log( "can't create pid file" );
 			exit( S_FAILURE );
@@ -621,12 +555,10 @@
                         cfgs( CFG_QSTOUTBOUND ), cfgal( CFG_ADDRESS )->addr.z );
     if(!rc) {
         write_log("No outbound defined");
-        cls_shutd(lins_sock);
-        cls_shutd(uis_sock);
+		cls_shutd(lins_sock);cls_shutd(uis_sock);
         exit(S_FAILURE);
     }
-    to_dev_null();
-    setsid();
+	to_dev_null();setsid();
 	write_log("%s-%s/%s daemon started",progname,version,osname);
 	IFPerl(perl_init(cfgs(CFG_PERLFILE),1));
 #ifdef HAVE_DNOTIFY
@@ -640,9 +572,8 @@
             fcntl( dnot, F_SETSIG, SIGRTMIN );
             fcntl( dnot, F_NOTIFY, DN_MODIFY | DN_CREATE | DN_DELETE | DN_RENAME | DN_MULTISHOT );
         }
-    } else {
+	} else
         dnot = -1;
-    }
 #endif
 
 	t_rescan = cfgi( CFG_RESCANPERIOD );
@@ -663,14 +594,12 @@
 
         title( "Queue manager [%d]", rescanperiod - t_rescan );
         if ( t_rescan >= rescanperiod || do_rescan ) {
-            if ( rnum < 0 ) {
-                rnum = cfgi( CFG_LONGRESCAN ) - 1;
-            }
-            do_rescan = 0;
-            if ( !q_rescan( &current, rnum == 0 )) {
+			if ( !q_rescan( &current, (int)(!rnum)))
                 write_log("can't rescan outbound");
-            }
-            rnum = rnum + 1;
+			rnum = ( rnum < 1 ) ?
+				(cfgi( CFG_LONGRESCAN ) > 0 ? cci - 1 : 0) :
+				rnum - 1;
+			do_rescan = 0;
 			t_rescan = 0;
 		}
 
@@ -679,9 +608,7 @@
         if(t_dial>=c_delay) {
             c_delay=randper(cfgi(CFG_DIALDELAY),cfgi(CFG_DIALDELTA));
             t_dial=dable=0;
-            if(!q_queue) {
-                dable=1;
-            }
+			if(!q_queue)dable=1;
 			i=q_queue;
 			DEBUG(('Q',1,"dabl"));
 			while(!dable&&i) {
@@ -707,58 +634,50 @@
                         f&Q_UNDIAL||!havestatus(f,CFG_CALLONFLAVORS)||
                         needhold(f,w)||(MAILHOURS&&!current->canpoll)) {
                     current=current->next;
-                    if(!current) {
-                        current=q_queue;
-                    }
+					    if(!current)current=q_queue;
                     i=i->next;
                     continue;
                 }
                 DEBUG(('Q',1,"querynl"));
                 rc = nodelist_query( &current->addr, &rnode );
-                if ( rc != 1 && ( rc + NDL_EENTRYNOTFOUND )) {
+				if ( rc != 1 && ( rc + NDL_EENTRYNOTFOUND ))
                     write_log( ndl_errors[0 - rc] );
-                }
                 if(!rnode) {
                     rnode=xcalloc(1,sizeof(ninfo_t));
                     falist_add(&rnode->addrs,&current->addr);
                     rnode->name=xstrdup("Unknown");
                     rnode->phone=xstrdup("");
                 }
-                if(!(rnode->opt&(MO_BINKP|MO_IFC))) {
-                    xfree(rnode->host);
-                }
+				if(!(rnode->opt&(MO_BINKP|MO_IFC)))xfree(rnode->host);
                 DEBUG(('Q',1,"ndl: %s %s %s [%d]",ftnaddrtoa(&current->addr),rnode?(rnode->host?rnode->host:rnode->phone):"$",rnode->wtime?rnode->wtime:"$",rnode->hidnum));
-                if(!cfgi(CFG_TRANSLATESUBST)) {
-                    phonetrans(&rnode->phone,cfgsl(CFG_PHONETR));
-                }
+				if(!cfgi(CFG_TRANSLATESUBST))phonetrans(&rnode->phone,cfgsl(CFG_PHONETR));
                 if ( checktimegaps( cfgs( CFG_CANCALL ))
                         && find_dialable_subst( rnode, havestatus( f, CFG_IMMONFLAVORS ), psubsts )
                         && !outbound_addr_busy( &current->addr )) {
 
                     xfree(rnode->tty);
-                    if(rnode->host) {
+					if((rnode->opt&(MO_BINKP|MO_IFC)) && rnode->host) {
 						static struct stat s;
 						static char lckname[MAX_PATH];
+						char *newhost = NULL;
+
+						DEBUG(('Q',3,"host: '%s'",rnode->host));
                         snprintf(lckname,MAX_PATH,"%s.tcpip",cfgs(CFG_NODIAL));
-                        if(!stat(lckname,&s)) {
-                            goto nlkil;
-                        }
+						if(!stat(lckname,&s))goto nlkil;
                         is_ip=1;
-                        if(rnode->opt&MO_BINKP) {
-                            bink=1;
-                        }
+						if(rnode->opt&MO_BINKP)bink=1;
+						newhost = nodehostname( rnode, bink );
+						xfree( rnode->host );
+						rnode->host = xstrdup( newhost );
+						DEBUG(('Q',3,"host: '%s'",rnode->host));
                         xstrcpy(ip_id,"ipline",10);
                         rnode->tty=xstrdup(bink?"binkp":"tcpip");
                     } else {
                         port=tty_findport(cfgsl(CFG_PORT),cfgs(CFG_NODIAL));
-                        if(!port) {
-                            DEBUG(('Q',3,"nottyport"));
-                            goto nlkil;
-                        }
+						if(!port){DEBUG(('Q',3,"nottyport"));goto nlkil;}
                         rnode->tty=xstrdup(baseport(port));
                     }
-                    dable=1;
-                    current->flv|=Q_DIAL;
+					dable=1;current->flv|=Q_DIAL;
 					DEBUG(('Q',1,"forking %s",ftnaddrtoa(&current->addr)));
 					chld=fork();
 					if(!chld) {
@@ -766,27 +685,18 @@
 #ifdef HAVE_DNOTIFY
                         signal(SIGRTMIN,SIG_IGN);
 #endif
-                        if(!outbound_locknode(&current->addr,LCK_c)) {
-                            exit(S_BUSY);
-                        }
-                        if(!is_ip&&cfgi(CFG_TRANSLATESUBST)) {
-                            phonetrans(&rnode->phone,cfgsl(CFG_PHONETR));
-                        }
-                        log_done();
-                        ssock=uis_sock=lins_sock=-1;
-                        log_callback=NULL;
-                        xsend_cb=NULL;
+						if(!outbound_locknode(&current->addr,LCK_c))exit(S_BUSY);
+						if(!is_ip&&cfgi(CFG_TRANSLATESUBST))phonetrans(&rnode->phone,cfgsl(CFG_PHONETR));
+						log_done();ssock=uis_sock=lins_sock=-1;
+						log_callback=NULL;xsend_cb=NULL;
                         if(!log_init(cfgs(CFG_LOG),rnode->tty)) {
                             write_log("can't init log %s.%s",ccs,port);
                             exit(S_BUSY);
                         }
                         DEBUG(('I',4,"connecting to daemon"));
                         ssock=cls_conn(CLS_LINE,cfgs(CFG_SERVER),NULL);
-                        if(ssock<0) {
-                            write_log("can't connect to server: %s",strerror(errno));
-                        } else {
-                            log_callback=vlogs;
-                        }
+						if(ssock<0)write_log("can't connect to server: %s",strerror(errno));
+						    else log_callback=vlogs;
 						IFPerl(perl_on_reload(1));
 						if ( is_ip ) {
 							title("Connecting to %s at %s",ftnaddrtoa(&current->addr), rnode->host);
@@ -802,33 +712,21 @@
                             rc=do_call(&current->addr,rnode->phone,port);
                         }
                         IFPerl(perl_done(0));
-                        log_done();
-                        hld=0;
-                        if(!log_init(cfgs(CFG_MASTERLOG),NULL)) {
-                            write_log("can't init master log %s",ccs);
-                        }
+						log_done();hld=0;
+						if(!log_init(cfgs(CFG_MASTERLOG),NULL))write_log("can't init master log %s",ccs);
                         if(rc&S_ANYHOLD&&(rc&S_MASK)==S_OK) {
                             outbound_getstatus(&current->addr,&sts);
-                            if(rc&S_HOLDA) {
-                                sts.flags|=Q_WAITA;
-                            }
-                            if(rc&S_HOLDR) {
-                                sts.flags|=Q_WAITR;
-                            }
-                            if(rc&S_HOLDX) {
-                                sts.flags|=Q_WAITX;
-                            }
+							if(rc&S_HOLDA)sts.flags|=Q_WAITA;
+							if(rc&S_HOLDR)sts.flags|=Q_WAITR;
+							if(rc&S_HOLDX)sts.flags|=Q_WAITX;
                             hld=cfgi(CFG_WAITHRQ);
                             write_log("calls to %s delayed for %d min [%s]",ftnaddrtoa(&current->addr),hld,sts_str(sts.flags));
                             sts.htime=timer_set(hld*60);
                             outbound_setstatus(&current->addr,&sts);
                         }
-                        if(rc!=S_BUSY) {
-                            t_rescan=cfgi(CFG_RESCANPERIOD)-1;
-                        }
+						if(rc!=S_BUSY)t_rescan=cfgi(CFG_RESCANPERIOD)-1;
                         switch(rc&S_MASK) {
-                        case S_BUSY:
-                            break;
+							case S_BUSY: break;
 							case S_OK:
 								outbound_getstatus(&current->addr,&sts);
 								if (cfgi(CFG_HOLDONSUCCESS)) {
@@ -861,9 +759,7 @@
                             outbound_setstatus(&current->addr,&sts);
                             break;
                         case S_REDIAL:
-                            if(!(rc&S_ADDTRY)) {
-                                break;
-                            }
+								if(!(rc&S_ADDTRY))break;
 								outbound_getstatus(&current->addr,&sts);
 								if(++sts.try>=cfgi(CFG_MAX_FAILS)) {
 									sts.flags|=Q_UNDIAL;
@@ -886,30 +782,19 @@
                         cls_close(ssock);
                         _exit(rc);
                     }
-                    if(chld<0) {
-                        write_log("can't fork() caller");
-                    }
+					if(chld<0)write_log("can't fork() caller");
                     c_delay=randper(cfgi(CFG_DIALDELAY),cfgi(CFG_DIALDELTA));
-                } else {
-                    current->flv&=~Q_DIAL;
-                }
-nlkil:
-                is_ip=0;
-                bink=0;
+				} else current->flv&=~Q_DIAL;
+nlkil:				is_ip=0;bink=0;
                 DEBUG(('Q',1,"nlkill"));
                 nlkill(&rnode);
-                current=current->next;
-                if(!current) {
-                    current=q_queue;
-                }
+				current = ( current->next ? current->next : q_queue );
                 i=i->next;
             }
         }
         t=timer_start();
         while(do_rescan!=1&&timer_time(t)<1) {
-            if(timer_time(t)<0) {
-                t=timer_start();
-            }
+			if(timer_time(t)<0)t=timer_start();
 			FD_ZERO(&rfds);
 			FD_SET(lins_sock,&rfds);
 			FD_SET(uis_sock,&rfds);
@@ -918,8 +803,7 @@
                 rc=MAX(rc,uis->sock);
                 FD_SET(uis->sock,&rfds);
             }
-            tv.tv_sec=0;
-            tv.tv_usec=500000;
+			tv.tv_sec=0;tv.tv_usec=500000;
 			rc=select(rc+1,&rfds,NULL,NULL,&tv);
 			if(rc<0&&errno!=EINTR) {
 				DEBUG(('I',1,"select: error: %s",strerror(errno)));
@@ -928,19 +812,15 @@
             if(rc>0) {
                 if(FD_ISSET(lins_sock,&rfds)) {
                     socklen_t salen=sizeof(sa);
-                    /* nmap -sU >>> */		  if(recvfrom(lins_sock,buf,2,MSG_PEEK,&sa,&salen)<2) {
-                        DEBUG(('I',1,"recvfrom: error: %s",strerror(errno)));
-                    } else {
+/* nmap -sU >>> */		  if(recvfrom(lins_sock,buf,2,MSG_PEEK,&sa,&salen)<2)DEBUG(('I',1,"recvfrom: error: %s",strerror(errno)));
+				    else {
                         rc=xrecv(lins_sock,buf,MSG_BUFFER-1,1);
-                        if(rc<0) {
-                            DEBUG(('I',3,"xrecv_l: %s",strerror(errno)));
-                        }
+					if(rc<0)DEBUG(('I',3,"xrecv_l: %s",strerror(errno)));
                         if(rc>0) {
                             sa.sa_family=AF_INET;
                             for(lins=ln,lnt=NULL; lins&&(memcmp(lins->addr,&sa,salen)||FETCH16(buf)!=lins->id); lnt=lins,lins=lins->next);
                             if(!lins) {
-                                cls_ln_t *lt=NULL;
-                                lins=ln;
+							cls_ln_t *lt=NULL;lins=ln;
 							while(lins) {
 								if(kill(lins->id,0)<0) {
 									char bf[MAX_STRING];
@@ -951,12 +831,8 @@
                                         xstrcpy(bf+3,"ipline",8);
                                         daemon_xsend(ssock,bf,10);
                                         lins=lins->next;
-                                        if(lt) {
-                                            lt->next=lins;
-                                        }
-                                        if(lntt==ln) {
-                                            ln=lins;
-                                        }
+									if(lt)lt->next=lins;
+									if(lntt==ln)ln=lins;
 									xfree(lntt->addr);
 									xfree(lntt->emsi);
 									xfree(lntt);
@@ -969,23 +845,18 @@
                                 lins=xmalloc(sizeof(cls_ln_t));
                                 lins->id=FETCH16(buf);
                                 lins->addr=xmalloc(salen);
-                                memcpy(lins->addr,&sa,salen);
+							memmove(lins->addr,&sa,salen);
                                 lins->emsi=NULL;
                                 lins->emsilen=0;
                                 lins->next=NULL;
-                                if(ln) {
-                                    lnt->next=lins;
-                                } else {
-                                    ln=lins;
+							if(ln)lnt->next=lins;
+							    else ln=lins;
                                 }
-                            }
                             DEBUG(('I',9,"lines_cl: recv %d bytes from %d",rc,lins->id));
                         }
-                        if(rc>1) {
-                            daemon_evt(lins_sock,buf,rc,0);
+					if(rc>1)daemon_evt(lins_sock,buf,rc,0);
                         }
                     }
-                }
 				for(uis=cl,uit=NULL;uis;uit=uis,uis=uis?uis->next:NULL)
 					if(FD_ISSET(uis->sock,&rfds)) {
 						rc=xrecv(uis->sock,buf,MSG_BUFFER-1,1);
@@ -993,33 +864,19 @@
                             cls_cl_t *uitt=uis;
                             DEBUG(('I',1,"client %d: removed",uis->id));
                             cls_close(uis->sock);
-                            if(uis->id+1==curr_id) {
-                                curr_id--;
-                            }
+							if(uis->id+1==curr_id)curr_id--;
                             xfree(uis->auth);
                             uis=uis->next;
-                            if(uit) {
-                                uit->next=uis;
-                            }
-                            if(uitt==cl) {
-                                cl=uis;
-                            }
-                            if(!cl) {
-                                curr_id=1;
-                            }
+							if(uit)uit->next=uis;
+							if(uitt==cl)cl=uis;
+							if(!cl)curr_id=1;
                             xfree(uitt);
                             continue;
                         }
-                        if(rc<0&&errno!=EAGAIN) {
-                            DEBUG(('I',3,"xrecv_u %d: %s",uis->id,strerror(errno)));
+						if(rc<0&&errno!=EAGAIN)DEBUG(('I',3,"xrecv_u %d: %s",uis->id,strerror(errno)));
+						if(rc>0)DEBUG(('I',8,"client %d: recv %d bytes",uis->id,rc));
+						if(rc>1)daemon_evt(uis->sock,buf,rc,1);
                         }
-                        if(rc>0) {
-                            DEBUG(('I',8,"client %d: recv %d bytes",uis->id,rc));
-                        }
-                        if(rc>1) {
-                            daemon_evt(uis->sock,buf,rc,1);
-                        }
-                    }
 				if(FD_ISSET(uis_sock,&rfds)) {
 					for(uis=cl;uis&&uis->next;uis=uis->next);
 					uit=xmalloc(sizeof(cls_cl_t));
@@ -1028,34 +885,24 @@
                         DEBUG(('I',1,"client %d: accept err: %s",uit->id,strerror(errno)));
                         xfree(uit);
                     } else {
-                        if(curr_id<1) {
-                            curr_id=33;
-                        }
+						if(curr_id<1)curr_id=33;
                         uit->next=NULL;
                         uit->id=curr_id++;
                         uit->type='u';
                         uit->auth=NULL;
-                        if(cl) {
-                            uis->next=uit;
-                        } else {
-                            cl=uit;
-                        }
+						if(cl)uis->next=uit;
+						    else cl=uit;
                         DEBUG(('I',1,"new client %d: accepted (fd=%d)",uit->id,uit->sock));
                         if(cfgs(CFG_SERVERPWD)) {
                             uit->auth=(unsigned char*)malloc(10);
                             md5_cram_set(uit->auth);
                             xsend(uit->sock,(char*)uit->auth,10);
-                        } else {
-                            xsend(uit->sock,"qs-noauth",10);
+						} else xsend(uit->sock,"qs-noauth",10);
                         }
                     }
                 }
             }
-        }
-        t_dial++;
-        t_rescan++;
-        if(do_rescan) {
-            t_dial=0;
-        }
+		t_dial++;t_rescan++;
+		if(do_rescan)t_dial=0;
 	}
 }
diff -burw ./qico/src/defs.h ./trunk/src/defs.h
--- ./qico/src/defs.h	2024-02-01 18:09:52.532880000 +0300
+++ ./trunk/src/defs.h	2024-02-01 18:10:34.589837000 +0300
@@ -1,6 +1,6 @@
 /**********************************************************
  * common definitions
- * $Id: defs.h,v 1.5 2005/05/16 20:33:46 mitry Exp $
+ * $Id: defs.h 18 2010-08-23 15:50:49Z semik $
  **********************************************************/
 #ifndef __DEFS_H__
 #define __DEFS_H__
@@ -51,5 +51,29 @@
 #define DM_NODELIST	2
 #define DM_CONFIG	3
 #define DM_CALL		12
+
+
+/* qcc */
+#define CLN_IPLINE	"ipline"
+#define CLN_IPLINE_LEN	7
+#define CLN_MASTER	"master"
+#define CLN_MASTER_LEN	7
+
+#define QPR_RECV	0
+#define QPR_SEND	1
+
+#ifdef HAVE_ATTR_PACKED
+#define PPACK		__attribute__ ((__packed__))
+#else
+#define PPACK
+#endif
+
+
+#ifdef MAXPATHLEN
+#  define MAX_PATH MAXPATHLEN
+#else
+#  define MAX_PATH 1024
+#endif
+
 
 #endif
Only in ./qico/src: des.c
Only in ./qico/src: des.h
diff -burw ./qico/src/emsi.c ./trunk/src/emsi.c
--- ./qico/src/emsi.c	2024-02-01 18:09:52.562457000 +0300
+++ ./trunk/src/emsi.c	2024-02-01 18:10:34.588059000 +0300
@@ -2,7 +2,7 @@
  * EMSI management.
  **********************************************************/
 /*
- * $Id: emsi.c,v 1.24 2005/08/12 15:36:19 mitry Exp $
+ * $Id: emsi.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: emsi.c,v $
  * Revision 1.24  2005/08/12 15:36:19  mitry
@@ -97,13 +97,11 @@
 };
 
 static int iccodes[2][14] = {
-    {
-        P_ZMODEM, P_ZEDZAP, P_DIRZAP,
+	{ P_ZMODEM, P_ZEDZAP, P_DIRZAP,
 #ifdef HYDRA8K16K
         P_HYDRA4, P_HYDRA8, P_HYDRA16,
 #endif
-        P_HYDRA, P_JANUS, P_NCP, O_NRQ, O_FNC, O_EII, O_XMA, P_NONE
-    },
+	P_HYDRA, P_JANUS, P_NCP, O_NRQ, O_FNC, O_EII, O_XMA, P_NONE },
 	{ O_RH1, O_PUA, O_PUP, O_NPU, O_HAT, O_HXT, O_HRQ, P_NONE }
 };
 
@@ -132,9 +130,8 @@
     for( j = 0; j < 2; j++ ) {
         q = pcod[j].code;
         while(( p = strsep( &q, "," ))) {
-            if ( ! *p ) {
+			if ( ! *p )
                 break;
-            }
 
 			DEBUG(('E', 4, "emsi %s flag: '%s'", pcod[j].err, p));
 
@@ -144,11 +141,10 @@
             } else if ( !j && !strcmp( p, "CHT" )) {
                 chat_need = 1;
                 continue;
-            } else {
+			} else
                 DEBUG(('E',3, "unknown emsi %s flag: '%s'", pcod[j].err, p));
             }
         }
-    }
 
 	DEBUG(('E',5,"emsi_parsecod returns: 0x%x", o));
 	return o;
@@ -159,22 +155,19 @@
 {
     char *p = *b, *t;
 
-    if ( *p != kc[0] ) {
+	if ( *p != kc[0] )
         return NULL;
-    }
 
     t = ++p;
 
     while( *t && *t != kc[1] ) {
-        if ( t[1] && t[1] == kc[1] && t[2] && t[2] == kc[1] ) {
+		if ( t[1] && t[1] == kc[1] && t[2] && t[2] == kc[1] )
             t += 2;
-        }
         t++;
     }
 
-    if ( !*t ) {
+	if ( !*t )
         return NULL;
-    }
 
 	if ( *t == kc[1] ) {
 		*t++ = 0;
@@ -191,12 +184,11 @@
     char *d = s, *x = s, t;
 
     while(( t = *s )) {
-        if ( t == '}' || t == ']' ) {
+		if ( t == '}' || t == ']' )
             t = *++s;
-        }
-        if( t != '\\' ) {
+		if( t != '\\' )
             *d = C0( t );
-        } else {
+		else {
 			*d = hexdcd( s[1], s[2] );
 			s += 2;
 		}
@@ -253,15 +245,15 @@
         return 0;
     }
 
-    sscanf( str + 10, "%04zX", &l );
+	sscanf( str + 10, "%04X", (unsigned *) &l );
     if ( l != ( l1 = strlen( str ) - 18 )) {
-        write_log( "Bad EMSI_DAT length: %zu, should be: %zu!", l, l1 );
+		write_log( "Bad EMSI_DAT length: %u, should be: %u!", l, l1 );
         return 0; /* Bad EMSI length */
     }
 
     DEBUG(('E',5,"EMSI_DAT length (%d) is OK!", l ));
 
-    sscanf( str + strlen( str ) - 4, "%04zX", &l);
+	sscanf( str + strlen( str ) - 4, "%04X", &l);
 	if ( l != ( l1 = crc16usd( (UINT8 *) str + 2, strlen( str ) - 6 ))) {
 		write_log( "Bad EMSI_DAT CRC: %04X, should be: %04X!", l, l1 );
 		return 0; /* Bad EMSI CRC */
@@ -282,16 +274,14 @@
     falist_kill( &dat->addrs );
 
     while(( s = strsep( &p, " " )))
-        if ( parseftnaddr( s, &fa, NULL, 0 ) && !falist_find( dat->addrs, &fa )) {
+		if ( parseftnaddr( s, &fa, NULL, 0 ) && !falist_find( dat->addrs, &fa ))
             falist_add( &dat->addrs, &fa );
-        }
 
     EMSI_TOK( &t, p ) /* Password */
-    if ( *p ) {
+	if ( *p )
         restrcpy( &dat->pwd, p );
-    } else {
+	else
         xfree( dat->pwd );
-    }
 
 	EMSI_TOK( &t, p ) /* Link codes */
 	lcod = p;
@@ -320,9 +310,8 @@
     DEBUG(('E',1,"emsi codes %s/%s", lcod, ccod));
     dat->options |= emsi_parsecod( lcod, ccod );
 
-    if ( chat_need == 1 && chatmy != 0 ) {
+	if ( chat_need == 1 && chatmy != 0 )
         dat->opt |= MO_CHAT;
-    }
 
 	xfree( dat->wtime );
 
@@ -356,9 +345,8 @@
             /* Baud rate */
             EMSI_TOKI( &p, s )
             DEBUG(('E',5,"Baud rate  s: '%s', p: '%s'", s, p));
-            if ( s ) {
+			if ( s )
                 sscanf( s, "%d", &dat->speed );
-            }
 
 			/* Flags */
 			EMSI_TOKI( &p, s )
@@ -380,23 +368,19 @@
             DEBUG(('E',5,"MOH#  p: '%s', t: '%s'", p, t));
             EMSI_TOKI( &p, s )
             DEBUG(('E',5,"MOH#  s: '%s', p: '%s'", s, p));
-            if ( sscanf( s, "%x", (unsigned*)&dat->holded ) != 1 ) {
+			if ( sscanf( s, "%x", (unsigned*)&dat->holded ) != 1 )
                 dat->holded = 0;
-            }
 
         } else if ( !strcmp( p, "TRX#" )) {
             EMSI_TOKN( &t, p )
             DEBUG(('E',5,"TRX#  p: '%s', t: '%s'", p, t));
             EMSI_TOKI( &p, s )
             DEBUG(('E',5,"TRX#  s: '%s', p: '%s'", s, p));
-            if ( sscanf( s, "%lx", (unsigned long*)&dat->time) !=1 ) {
+			if ( sscanf( s, "%lx", (unsigned long*)&dat->time) !=1 )
                 dat->time = 0;
-            }
 
-        } else {
-            p = emsi_tok( &t, "{}" );
+		} else p = emsi_tok( &t, "{}" );
         }
-    }
 	return 1;
 }
 
@@ -427,9 +411,8 @@
 
     EMSI_CAT( "}{" );
 
-    if ( showpwd && ( p = findpwd( remaddr ))) {
+	if ( showpwd && ( p = findpwd( remaddr )))
         EMSI_CAT( p );
-    }
 
 	EMSI_CAT( "}{8N1" );
     
@@ -444,34 +427,28 @@
                                  )) {
         EMSI_CAT( ",RH1" );
         lopt |= O_RH1;
-    } else {
+	} else
         lopt &= (~O_RH1);
-    }
 
     emsi_lo = lopt;
 
-    if ( lopt & O_PUA ) {
+	if ( lopt & O_PUA )
         EMSI_CAT( ",PUA" );
-    }
 
-    if ( lopt & O_PUP ) {
+	if ( lopt & O_PUP )
         EMSI_CAT( ",PUP" );
-    }
 
     /* Should be presented only by answering system. Calling system should
        set NRQ
     */
-    if ( lopt & O_HRQ ) {
+	if ( lopt & O_HRQ )
         EMSI_CAT( ",HRQ" );
-    }
 
-    if ( lopt & O_HXT ) {
+	if ( lopt & O_HXT )
         EMSI_CAT( ",HXT" );
-    }
 
-    if ( lopt & O_HAT ) {
+	if ( lopt & O_HAT )
         EMSI_CAT( ",HAT" );
-    }
 
 	EMSI_CAT( "}{" );
 
@@ -531,14 +508,12 @@
             }
         }
 
-        if ( lopt & O_NRQ ) {
+		if ( lopt & O_NRQ )
             EMSI_CAT( "NRQ," );
         }
-    }
 
-    if ( !c ) {
+	if ( !c )
         EMSI_CAT( "NCP," );
-    }
 
 	EMSI_CAT( "ARC,XMA}{FE" );
 
@@ -584,8 +559,8 @@
     EMSI_CAT( "}" );
 
     /* Calculate emsi length */
-    snprintf( tmp, TMP_LEN, "%04zX", strlen( emsi_dat ) - 14 );
-    memcpy( emsi_dat + 10, tmp, 4 );
+	snprintf( tmp, TMP_LEN, "%04X", strlen( emsi_dat ) - 14 );
+	memmove( emsi_dat + 10, tmp, 4 );
 
 	/* EMSI crc16 */
 	snprintf( tmp, TMP_LEN, "%04X", crc16usds( (UINT8 *) emsi_dat + 2 ));
@@ -643,9 +618,8 @@
             qsleep( 500 );
         } while ( !HASDATA( 1 ) && !timer_expired( t1 ));
 
-        if ( timer_expired( t1 )) {
+		if ( timer_expired( t1 ))
             return TIMEOUT;
-        }
 
 		/* t1 = timer_set( cci ); */
 		t2 = timer_set( EMSI_RESEND_TO );
@@ -655,13 +629,11 @@
             DEBUG(('E',9,"EI: getchar '%c' %d (%d, %d)",
                    C0( ch ), ch, timer_rest( t1 ), timer_rest( t2 )));
 
-            if ( NOTTO( ch ) && ( ch != TIMEOUT )) {
+			if ( NOTTO( ch ) && ( ch != TIMEOUT ))
                 return ch;
-            }
 
-            if( timer_expired( t1 )) {
+			if( timer_expired( t1 ))
                 return TIMEOUT;
-            }
 
 			if ( timer_expired( t2 ) && CARRIER()) {
 				if ( do_prevent && tries == 0 ) {
@@ -670,9 +642,8 @@
                     DEBUG(('E',1,"EI: Sending preventive EMSI_INQ..."));
                     PUTSTRCR( emsiinq );
                 } else {
-                    if ( ++tries > 10 ) {
+					if ( ++tries > 10 )
                         return TIMEOUT;
-                    }
 					sline( "Sending EMSI_INQ (Try %d of %d)...", tries, 10 );
 					DEBUG(('E',1,"EI: Sending EMSI_INQ (Try %d of %d)...",tries,10));
 					PUTSTR( emsiinq );
@@ -682,9 +653,8 @@
                 continue;
             }
 
-            if ( ch == TIMEOUT ) {
+			if ( ch == TIMEOUT )
                 continue;
-            }
 
 			ch &= 0x7f;
 
@@ -694,9 +664,8 @@
 
                 if ( strstr( emsi_dat, emsireq )) {
                     DEBUG(('E',1,"EI: Got EMSI_REQ (%d)",gotreq));
-                    if ( gotreq++ ) {
+					if ( gotreq++ )
                         return OK;
-                    }
 
 					sline( "Received EMSI_REQ, sending EMSI_INQ..." );
 					DEBUG(('E',1,"EI: Sending EMSI_INQ.."));
@@ -705,17 +674,15 @@
                     emsi_dat[79] = '\0';
                     if ( showintro && *emsi_dat
                             && !strstr( emsi_dat, EMSI_BEG )
-                            && !strstr( emsi_dat, EMSI_ARGUS1 )) {
+						&& !strstr( emsi_dat, EMSI_ARGUS1 ))
                         write_log( "intro: %s", emsi_dat );
                     }
-                }
                 memset( emsi_dat, 0, EMSI_BUF );
                 continue;
             }
 
-            if ( ch > 31 ) {
+			if ( ch > 31 )
                 *p++ = ch;
-            }
 
 			if (( p - emsi_dat ) >= EMSI_BUF ) {
 				p = emsi_dat;
@@ -723,9 +690,8 @@
             }
         }
 
-        if ( !CARRIER()) {
+		if ( !CARRIER())
             return RCDO;
-        }
 
 		return OK;
 	}
@@ -741,13 +707,11 @@
         DEBUG(('E',9,"EI: getchar '%c' %d (%d, %d)",
                C0( ch ), ch, timer_rest( t1 ), timer_rest( t2 )));
 
-        if ( NOTTO( ch ) && ( ch != TIMEOUT)) {
+		if ( NOTTO( ch ) && ( ch != TIMEOUT))
             return ch;
-        }
 
-        if ( timer_expired( t1 )) {
+		if ( timer_expired( t1 ))
             return TIMEOUT;
-        }
 
 		if (( ch == TIMEOUT ) && timer_expired( t2 )) {
 			if ( !got ) {
@@ -761,17 +725,15 @@
 
         ch &= 0x7f;
 
-        if ( !got && ch == '*' ) {
+		if ( !got && ch == '*' )
             got = 1;
-        }
 
         if ( got && ( ch == '\r' || ch == '\n' )) {
             *p = '\0';
             got = 0;
 
-            if ( p == emsi_dat ) {
+                        if ( p == emsi_dat )
                 continue;
-            }
 
 			DEBUG(('E',2,"EI: Got '%s'",emsi_dat));
 			p = emsi_dat;
@@ -781,9 +743,8 @@
                 return OK;
             }
         } else {
-            if ( got && ch > 31 ) {
+			if ( got && ch > 31 )
                 *p++ = ch;
-            }
 
 			if (( p - emsi_dat ) >= EMSI_BUF ) {
 				got = 0;
@@ -848,9 +809,8 @@
             sline( "Sending EMSI_NAK..." );
             DEBUG(('E',1,"Sending EMSI_NAK (%d)...",tries));
             PUTSTRCR( emsinak );
-        } else {
+		} else        
             goto step4;
-        }
 
 step3:
 		/* Step 3
@@ -889,9 +849,8 @@
             ch = GETCHAR( MAX( 1, MIN( timer_rest( t1 ), timer_rest( t2 ))));
             DEBUG(('E',9,"getchar '%c' %d (%d, %d)", C0( ch ), ch, timer_rest( t1 ), timer_rest( t2 )));
 
-            if ( NOTTO( ch ) && ( ch != TIMEOUT )) {
+			if ( NOTTO( ch ) && ( ch != TIMEOUT ))
                 return ch;
-            }
 
 			if ( timer_expired( t2 )) {
 				sline( "Timeout receiving EMSI_DAT" );
@@ -899,21 +858,18 @@
                 return TIMEOUT;
             }
 
-            if ( timer_expired( t1 )) {
+			if ( timer_expired( t1 ))
                 break;    /* goto step2; */
-            }
 
-            if ( ch == TIMEOUT ) {
+			if ( ch == TIMEOUT )
                 continue;
-            }
 
             if ( !got ) {
-                if ( ch == '*' ) {
+				if ( ch == '*' )
                     got = 1;
-                } else {
+				else
                     continue;
                 }
-            }
 
 			if ( ch == '\r' || ch == '\n' ) {
 				if ( !strncmp( emsi_dat, emsihbt, EMSI_SEQ_LEN )) {
@@ -968,7 +924,7 @@
                     rew = strstr( emsi_dat + 1, EMSI_BEG );
                     if ( rew && rew != emsi_dat ) {
                         DEBUG(('E',1,"got EMSI_DAT at offset %d", p - rew));
-                        memcpy( emsi_dat, rew, p - rew );
+						memmove( emsi_dat, rew, p - rew );
 						p -= rew - emsi_dat;
 					} else {
 						p = emsi_dat;
@@ -976,11 +932,10 @@
                     memset( p, 0, EMSI_BUF - (p - emsi_dat));
                 }
 
-                if ( ch >= 32 && ch <= 255 ) {
+				if ( ch >= 32 && ch <= 255 )
                     *p++ = ch;
                 }
             }
-        }
 	} while( !timer_expired( t2 ));
 
 	return TIMEOUT;
@@ -1021,9 +976,8 @@
 
     memset( inbuf, 0, TMP_LEN );
 
-    if ( ++tries > 6 ) {
+	if ( ++tries > 6 )
         return TIMEOUT;
-    }
 
 	sline( "Sending EMSI_DAT" );
 	DEBUG(('E',1,"Sending EMSI_DAT (%d)",tries));
@@ -1059,21 +1013,17 @@
         ch = GETCHAR( MAX( 1, MIN( timer_rest( t1 ), timer_rest( t2 ))));
         DEBUG(('E',9,"getchar '%c' %d (%d, %d)", C0( ch ), ch, timer_rest( t1 ), timer_rest( t2 )));
 
-        if ( NOTTO( ch ) && ( ch != TIMEOUT )) {
+		if ( NOTTO( ch ) && ( ch != TIMEOUT ))
             return ch;
-        }
 
-        if ( timer_expired( t2 )) {
+		if ( timer_expired( t2 ))
             goto step2;
-        }
 
-        if ( timer_expired( t1 )) {
+		if ( timer_expired( t1 ))
             return TIMEOUT;
-        }
 
-        if ( ch == TIMEOUT ) {
+		if ( ch == TIMEOUT )
             continue;
-        }
 
 		ch &= 0x7f;
 
@@ -1081,9 +1031,8 @@
             *p = '\0';
             p = inbuf;
 
-            if ( *p == '\0' ) {
+			if ( *p == '\0' )
                 continue;
-            }
 
 			DEBUG(('E',2,"Got string '%s' (%d)",inbuf,strlen(inbuf)));
 
Only in ./qico/src: flagexp.c
Only in ./qico/src: flagexp.h
diff -burw ./qico/src/flagexp.y ./trunk/src/flagexp.y
--- ./qico/src/flagexp.y	2024-02-01 18:09:52.563114000 +0300
+++ ./trunk/src/flagexp.y	2024-02-01 18:10:34.586850000 +0300
@@ -2,7 +2,7 @@
  * expression parser
  **********************************************************/
 /*
- * $Id: flagexp.y,v 1.3 2005/05/06 20:31:58 mitry Exp $
+ * $Id: flagexp.y 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: flagexp.y,v $
  * Revision 1.3  2005/05/06 20:31:58  mitry
Only in ./qico/src: flaglex.c
diff -burw ./qico/src/flaglex.l ./trunk/src/flaglex.l
--- ./qico/src/flaglex.l	2024-02-01 18:09:52.564983000 +0300
+++ ./trunk/src/flaglex.l	2024-02-01 18:10:34.582297000 +0300
@@ -1,6 +1,6 @@
 /**********************************************************
  * lexical parser
- * $Id: flaglex.l,v 1.5 2005/05/11 13:22:40 mitry Exp $
+ * $Id: flaglex.l 18 2010-08-23 15:50:49Z semik $
  **********************************************************/
 %option noyywrap case-insensitive never-interactive nounput
 %{
@@ -239,6 +239,6 @@
 		DEBUG(('Y',1,"chkdate: %d > %d",d1,d2));
 		return 0;
 	}
-	DEBUG(('Y',3,"chkdate: %d",now->tm_yday>=d1 && now->tm_yday<=d2));
-	return now->tm_yday>=d1 && now->tm_yday<=d2;
+	DEBUG(('Y',3,"chkdate: %d",now->tm_mday>=d1 && now->tm_mday<=d2));
+	return now->tm_mday>=d1 && now->tm_mday<=d2;
 }
diff -burw ./qico/src/freq.c ./trunk/src/freq.c
--- ./qico/src/freq.c	2024-02-01 18:09:52.565084000 +0300
+++ ./trunk/src/freq.c	2024-02-01 18:10:34.606136000 +0300
@@ -2,7 +2,7 @@
  * File request support
  ***************************************************************************/
 /*
- * $Id: freq.c,v 1.7 2005/05/17 18:17:42 mitry Exp $
+ * $Id: freq.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: freq.c,v $
  * Revision 1.7  2005/05/17 18:17:42  mitry
@@ -50,9 +50,8 @@
     }
 
     while( reqs ) {
-        if ( cfgs( CFG_MAPIN ) && strchr( ccs, 'r' )) {
+        if ( cfgs( CFG_MAPIN ) && strchr( ccs, 'r' ))
             recode_to_local( reqs->str );
-        }
         DEBUG(('R',1,"requested '%s'", reqs->str));
         fprintf( f, "%s\n", reqs->str );
         reqs = reqs->next;
@@ -61,35 +60,22 @@
     if(!wz) {
         falist_t *ra;
         snprintf(sfn,MAX_PATH,"/tmp/qsrif.%04lx",tpid);
-        if(!(r=fopen(sfn,"wt"))) {
-            write_log("can't open '%s' for writing: %s",sfn,strerror(errno));
-            return 0;
-        }
+        if(!(r=fopen(sfn,"wt"))){write_log("can't open '%s' for writing: %s",sfn,strerror(errno));return 0;}
         fprintf(r,"SessionType %s\n",bink?"OTHER":"EMSI");
         fprintf(r,"Sysop %s\n",rnode->sysop);
-        for(ra=rnode->addrs; ra; ra=ra->next) {
-            fprintf(r,"AKA %s\n",ftnaddrtoa(&ra->addr));
-        }
-        if(!is_ip) {
-            fprintf(r,"Baud %d\n",rnode->realspeed);
-        }
+        for(ra=rnode->addrs;ra;ra=ra->next)fprintf(r,"AKA %s\n",ftnaddrtoa(&ra->addr));
+        if(!is_ip)fprintf(r,"Baud %d\n",rnode->realspeed);
         fprintf(r,"Time -1\n");
         fprintf(r,"RemoteStatus %sTED\n",sprt);
         fprintf(r,"SystemStatus %sTED\n",slst);
         fprintf(r,"RequestList /tmp/qreq.%04lx\n",tpid);
         fprintf(r,"ResponseList /tmp/qfls.%04lx\n",tpid);
         fprintf(r,"Location %s\n",rnode->place);
-        if(rnode->phone&&*rnode->phone) {
-            fprintf(r,"Phone %s\n",rnode->phone);
-        }
-        if(rnode->options&O_PWD) {
-            fprintf(r,"Password %s\n",rnode->pwd);
-        }
+        if(rnode->phone&&*rnode->phone)fprintf(r,"Phone %s\n",rnode->phone);
+        if(rnode->options&O_PWD)fprintf(r,"Password %s\n",rnode->pwd);
         fprintf(r,"Mailer %s\n",rnode->mailer);
         fprintf(r,"Site %s\n",rnode->name);
-        if(!is_ip&&(ss=getenv("CALLER_ID"))&&strcasecmp(ss,"none")&&strlen(ss)>3) {
-            fprintf(r,"CallerID %s\n",ss);
-        }
+        if(!is_ip&&(ss=getenv("CALLER_ID"))&&strcasecmp(ss,"none")&&strlen(ss)>3)fprintf(r,"CallerID %s\n",ss);
         fprintf(r,"OurAKA %s\n",ftnaddrtoa(ma));
         fprintf(r,"TRANX %08lu\n",time(NULL));
         fclose(r);
@@ -97,8 +83,7 @@
     } else snprintf(s,MAX_PATH,"%s -wazoo -%c -s%d %s /tmp/qreq.%04lx /tmp/qfls.%04lx /tmp/qrep.%04lx",
                         cfgs(CFG_EXTRP),priv,rnode->realspeed,ftnaddrtoa(&rnode->addrs->addr),tpid,tpid,tpid);
     write_log("exec '%s' returned rc=%d",s,execsh(s));
-    lunlink(fn);
-    lunlink(sfn);
+    lunlink(fn);lunlink(sfn);
     snprintf(fn,MAX_PATH,"/tmp/qfls.%04lx",tpid);
     if(!(f=fopen(fn,"rt"))) {
         snprintf(fn,MAX_PATH,"/tmp/qrep.%04lx",tpid);
@@ -109,58 +94,34 @@
         return 0;
     }
     while(fgets(s,MAX_PATH-1,f)) {
-        if(*s=='\n'||*s=='\r'||*s==' '||!*s) {
-            continue;
-        }
-        ss=s;
-        kil=0;
-        got=1;
-        if(*s=='='||*s=='-') {
-            ss++;
-            kil=1;
-        } else if(*s=='+') {
-            ss++;
-        }
+        if(*s=='\n'||*s=='\r'||*s==' '||!*s)continue;
+        ss=s;kil=0;got=1;
+        if(*s=='='||*s=='-'){ss++;kil=1;}
+            else if(*s=='+')ss++;
         p=ss+strlen(ss)-1;
-        while(*p=='\r'||*p=='\n') {
-            *p--=0;
-        }
+        while(*p=='\r'||*p=='\n')*p--=0;
         p=strrchr(ss,' ');
-        if(p) {
-            *p++=0;
-        } else {
-            p=ss;
-        }
+        if(p)*p++=0;else p=ss;
         DEBUG(('R',1,"sending '%s' as '%s'%s",ss,qbasename((p!=ss)?p:ss),kil?" and kill":""));
         addflist(&fl,xstrdup(ss),xstrdup(qbasename((p!=ss)?p:ss)),kil?'^':' ',0,NULL,0);
     }
-    fclose(f);
-    lunlink(fn);
+    fclose(f);lunlink(fn);
     snprintf(fn,MAX_PATH,"/tmp/qrep.%04lx",tpid);
-    if(!(f=fopen(fn,"rt"))&&wz) {
-        write_log("can't open '%s' for reading",fn);
-    }
+    if(!(f=fopen(fn,"rt"))&&wz)write_log("can't open '%s' for reading",fn);
     snprintf(fn,MAX_PATH,"/tmp/qpkt.%04lx%02x",tpid,++freq_pktcount);
     g=openpktmsg(ma,&rnode->addrs->addr,cfgs(CFG_FREQFROM),rnode->sysop,cfgs(CFG_FREQSUBJ),NULL,fn,1);
     if(!g) {
         write_log("can't open '%s' for writing: %s",fn,strerror(errno));
-        if(f) {
-            fclose(f);
-        }
+        if(f)fclose(f);
         freq_pktcount--;
     }
     if(f&&g) {
         while(fgets(s,MAX_PATH-1,f)) {
             p=s+strlen(s)-1;
-            while(*p=='\r'||*p=='\n') {
-                *p--=0;
+            while(*p=='\r'||*p=='\n')*p--=0;
+            if(cfgi(CFG_RECODEPKTS))recode_to_remote(s);
+            fputs(s,g);fputc('\r',g);
             }
-            if(cfgi(CFG_RECODEPKTS)) {
-                recode_to_remote(s);
-            }
-            fputs(s,g);
-            fputc('\r',g);
-        }
         fclose(f);
         closeqpkt(g,ma);
         snprintf(s,MAX_PATH,"/tmp/qpkt.%04lx%02x",tpid,freq_pktcount);
@@ -179,15 +140,10 @@
     char s[MAX_PATH],*p;
     slist_t *reqs=NULL;
     f=fopen(fn,"rt");
-    if(!f) {
-        write_log("can't open '%s' for reading: %s",fn,strerror(errno));
-        return 0;
-    }
+    if(!f){write_log("can't open '%s' for reading: %s",fn,strerror(errno));return 0;}
     while(fgets(s,MAX_PATH-1,f)) {
         p=s+strlen(s)-1;
-        while(*p=='\r'||*p=='\n') {
-            *p--=0;
-        }
+        while(*p=='\r'||*p=='\n')*p--=0;
         slist_add(&reqs,s);
     }
     fclose(f);
@@ -205,9 +161,8 @@
  */
 int is_freq_available( void )
 {
-    if ( !cfgs( CFG_EXTRP ) && !cfgs( CFG_SRIFRP )) {
+    if ( !cfgs( CFG_EXTRP ) && !cfgs( CFG_SRIFRP ))
         return FR_NOTHANDLED;
-    }
 
     return (( cfgs( CFG_EXTRP ) || cfgs( CFG_SRIFRP ))
             && checktimegaps( cfgs( CFG_FREQTIME )));
diff -burw ./qico/src/ftn.c ./trunk/src/ftn.c
--- ./qico/src/ftn.c	2024-02-01 18:09:52.565238000 +0300
+++ ./trunk/src/ftn.c	2024-02-01 18:10:34.588367000 +0300
@@ -2,9 +2,21 @@
  * ftn tools
  **********************************************************/
 /*
- * $Id: ftn.c,v 1.10 2005/08/18 16:21:25 mitry Exp $
+ * $Id: ftn.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: ftn.c,v $
+ * Revision 1.14  2007/01/28 17:55:00  mitry
+ * Add support for INA flag and IBN/IFC optional port number.
+ *
+ * Revision 1.13  2006/04/14 18:45:25  mitry
+ * Added locked flag.
+ *
+ * Revision 1.12  2005/11/27 01:41:11  mitry
+ * Recode From and To fields to local charset in showpkt().
+ *
+ * Revision 1.11  2005/10/31 17:21:10  mitry
+ * Fixed showpkt which didn't handle national characters in `to' and `from' pkt fields.
+ *
  * Revision 1.10  2005/08/18 16:21:25  mitry
  * Added debug messages
  *
@@ -31,31 +43,29 @@
 #include "crc.h"
 
 /* domain name to translate ftn address to inet host. */
-#define FTNDOMAIN "binkp.net"
+#define FTNDOMAIN "fidonet.net"
 
 
 void addr_cpy(ftnaddr_t *a, const ftnaddr_t *b)
 {
-    if ( !a || !b ) {
+	if ( !a || !b )
         return;
-    }
     a->z = b->z;
     a->n = b->n;
     a->f = b->f;
     a->p = b->p;
-    if ( b->d && *b->d ) {
+	a->locked = b->locked;
+	if ( b->d && *b->d )
         a->d = xstrdup( b->d );
-    } else {
+	else
         a->d = NULL;
     }
-}
 
 
 int addr_cmp(const ftnaddr_t *a, const ftnaddr_t *b)
 {
-    if ( !a || !b ) {
+	if ( !a || !b )
         return 0;
-    }
 
 	return ( a->z == b->z && a->n == b->n 
 		&& a->f == b->f && a->p == b->p ) ? 1 : 0;
@@ -67,54 +77,31 @@
     const char	*p = s,	*pn;
     int		n = -1, wn = 0, pq = 1;
 
-    if(!s||!*s) {
-        return 0;
-    }
+	if(!s||!*s)return 0;
     if(b) {
         addr_cpy(a,b);
         a->p=wc?-1:0;
-    } else {
-        a->z=a->n=a->f=a->p=wc?-1:0,a->d=NULL;
-    }
+	} else a->z=a->n=a->f=a->p=wc?-1:0,a->d=NULL;
     for(pn=p; *p&&pq; p++) {
-        if(isdigit((int)*p)) {
-            wn=1;
-        } else if(wc&&*p=='*') {
-            wn=2;
-        } else switch(*p) {
+		if(isdigit((int)*p))wn=1;
+		else if(wc&&*p=='*')wn=2;
+		else switch(*p) {
             case ':':
-                if(!wn||n>0) {
-                    return 0;
-                }
+				if(!wn||n>0)return 0;
                 a->z=(wn<2)?atoi(pn):-1;
-                pn=p+1;
-                wn=0;
-                n=1;
+				pn=p+1;wn=0;n=1;
                 break;
             case '/':
-                if(!wn||n>1) {
-                    return 0;
-                }
+				if(!wn||n>1)return 0;
                 a->n=(wn<2)?atoi(pn):-1;
-                n=2;
-                pn=p+1;
-                wn=0;
+				n=2;pn=p+1;wn=0;
                 break;
             case '.':
-                if(n>2) {
-                    return 0;
-                }
-                if(wn) {
-                    a->f=(wn<2)?atoi(pn):-1;
-                }
-                n=3;
-                pn=p+1;
-                if(!wn&&n<0) {
-                    break;
-                }
-                if(!wn) {
-                    return 0;
-                }
+				if(n>2)return 0;
+				if(wn)a->f=(wn<2)?atoi(pn):-1;
+				n=3;pn=p+1;
+				if(!wn&&n<0)break;
+				if(!wn)return 0;
 				wn=0;
 				break;
 			case '@':
@@ -122,34 +109,25 @@
                     xfree(a->d);
                     a->d=xstrdup(p+1);
                 }
-            case '\n':
-            case '\r':
-            case ' ':
-            case '\t':
+			case '\n': case '\r':
+			case ' ': case '\t':
             case '\0':
                 pq=0;
                 break;
-            default:
-                return 0;
+			default:return 0;
             }
     }
     switch(n) {
     case 2:
-        if(!wn) {
-            return 0;
-        }
+		if(!wn)return 0;
         a->f=(wn<2)?atoi(pn):-1;
         break;
     case 3:
-        if(!wn) {
-            return 0;
-        }
+		if(!wn)return 0;
         a->p=(wn<2)?atoi(pn):-1;
         break;
     case -1:
-        if(!wn) {
-            return 0;
-        }
+		if(!wn)return 0;
 		a->f=(wn<2)?atoi(pn):-1;
 		break;
 	    default:
@@ -172,12 +150,10 @@
                 m=2;
                 if(i->addr.f==a->f) {
                     m=3;
-                    if(i->addr.p==a->p) {
-                        m=4;
+					if(i->addr.p==a->p)m=4;
                     }
                 }
             }
-        }
 		if(m>bm) {
 			bm=m;
 			best=&i->addr;
@@ -189,11 +165,8 @@
 char *ftnaddrtoa(const ftnaddr_t *a)
 {
     static char s[30];
-    if(a->p) {
-        snprintf(s,30,"%d:%d/%d.%d",a->z,a->n,a->f,a->p);
-    } else {
-        snprintf(s,30,"%d:%d/%d",a->z,a->n,a->f);
-    }
+	if(a->p)snprintf(s,30,"%d:%d/%d.%d",a->z,a->n,a->f,a->p);
+	    else snprintf(s,30,"%d:%d/%d",a->z,a->n,a->f);
 	return s;
 }
 
@@ -201,43 +174,49 @@
 {
     char *d=cfgs(CFG_DOMAIN);
     static char s[64];
-    if(!*d) {
-        d="fidonet.org";
-    }
-    if(*d=='@') {
-        d++;
-    }
-    if(a->p) {
-        snprintf(s,64,"%d:%d/%d.%d@%s",a->z,a->n,a->f,a->p,a->d?a->d:d);
-    } else {
-        snprintf(s,64,"%d:%d/%d@%s",a->z,a->n,a->f,a->d?a->d:d);
-    }
+	if(!*d)d="fidonet.org";
+	if(*d=='@')d++;
+	if(a->p)snprintf(s,64,"%d:%d/%d.%d@%s",a->z,a->n,a->f,a->p,a->d?a->d:d);
+	    else snprintf(s,64,"%d:%d/%d@%s",a->z,a->n,a->f,a->d?a->d:d);
     return s;
 }
 
 char *ftnaddrtoia(const ftnaddr_t *a)
 {
     static char s[64];
-    if(a->p) {
-        snprintf(s,64,"p%d.f%d.n%d.z%d." FTNDOMAIN,a->p,a->f,a->n,a->z);
-    } else {
-        snprintf(s,64,"f%d.n%d.z%d." FTNDOMAIN,a->f,a->n,a->z);
-    }
+	if(a->p)snprintf(s,64,"p%d.f%d.n%d.z%d." FTNDOMAIN,a->p,a->f,a->n,a->z);
+	    else snprintf(s,64,"f%d.n%d.z%d." FTNDOMAIN,a->f,a->n,a->z);
 	return s;
 }
 
+char *nodehostname(const ninfo_t *node, int isbinkp)
+{
+	static char	newhost[MAXHOSTNAMELEN + 10];
+	int		iport = 0;
+
+	xstrcpy( newhost, node->host, MAXHOSTNAMELEN + 10 );
+
+	iport = isbinkp ? node->bp_port : node->ifc_port;
+
+	if ( iport )
+	{
+		snprintf( newhost + strlen( newhost ), 9,
+			":%d", iport );
+	}
+
+	return newhost;
+}
+
 char *strip8(char *s)
 {
     register int	t, i = 0;
     static char	buf[MAX_STRING + 5];
 
-    if ( !s ) {
+	if ( !s )
         return NULL;
-    }
 
-    if ( *s ) {
+	if ( *s )
         recode_to_remote( s );
-    }
 
 	while( *s && i < MAX_STRING) {
 		t = *s;
@@ -246,9 +225,9 @@
                 buf[i++] = t;
                 buf[i] = t;
             }
-        } else if ( isprint( t )) {
+		} else if ( isprint( t ))
             buf[i] = t;
-        } else {
+		else {
 			buf[i++] = '\\';
 			buf[i++] = hexdigitsupper[(t >> 4) & 0x0f];
 			buf[i] = hexdigitsupper[t & 0x0f];
@@ -265,9 +244,7 @@
 int has_addr(const ftnaddr_t *a, falist_t *l)
 {
     while(l) {
-        if(addr_cmp(a,&l->addr)) {
-            return 1;
-        }
+		if(addr_cmp(a,&l->addr))return 1;
 		l=l->next;
 	}
 	return 0;
@@ -275,53 +252,50 @@
 
 int showpkt(const char *fn)
 {
+	int		i, n = 1, a;
+	char		from[36], to[36];
     FILE *f;
-    int i,n=1;
     pkthdr_t ph;
     pktmhdr_t mh;
-    char from[36],to[36],a;
+
     f=fopen(fn,"r");
     if(!f) {
-        write_log("can't open '%s' for reading: %s",fn,strerror(errno));
+		write_log( "can't open '%s' for reading: %s",
+			fn, strerror( errno ));
         return 0;
     }
-    if(fread(&ph,sizeof(ph),1,f)!=1) {
+
+	if ( fread( &ph, sizeof( ph ), 1, f ) != 1 )
         write_log("packet read error");
-    } else if(I2H16(ph.phType)!=2) {
+	else if ( I2H16( ph.phType ) != 2 )
         write_log("packet isn't 2+ format");
-    } else {
+	else {
         while(fread(&mh,sizeof(mh),1,f)==1) {
             i=0;
-            while(fgetc(f)>0&&i<30) {
+			while( fgetc( f ) > 0 && i < 30 )
                 i++;
-            }
-            i=0;
-            if(i>=30) {
+			if ( i >= 30 )
                 break;
-            }
-            while((a=fgetc(f))>0&&i<36) {
+			i = 0;
+			while(( a = fgetc( f )) > 0 && i < 36 )
                 to[i++]=a;
-            }
-            if(i>=36) {
+			if ( i >= 36 )
                 break;
-            }
-            to[i]=0;
+			to[i] = '\0';
             i=0;
-            while((a=fgetc(f))>0&&i<36) {
+			while(( a = fgetc( f )) > 0 && i < 36 )
                 from[i++]=a;
-            }
-            if(i>=32) {
+			if ( i >= 36 )
                 break;
-            }
-            from[i]=0;
+			from[i] = '\0';
             i=0;
-            while(fgetc(f)>0&&i<72) {
+			while( fgetc( f ) > 0 && i < 72 )
                 i++;
-            }
-            if(i>=72) {
+			if ( i >= 72 )
                 break;
-            }
 			while( fgetc( f ) > 0 );
+			recode_to_local( from );
+			recode_to_local( to );
 			write_log( "*msg: %d from: \"%s\", to: \"%s\"", n++, from, to );
 		}
 	}
@@ -337,9 +311,7 @@
     pktmhdr_t mh;
     time_t tim=time(NULL);
     struct tm *t=localtime(&tim);
-    if(!(f=fopen(fn,"w"))) {
-        return NULL;
-    }
+	if(!(f=fopen(fn,"w")))return NULL;
 	memset(&ph,0,sizeof(ph));
 	memset(&mh,0,sizeof(mh));
 	ph.phONode=H2I16(fa->f);
@@ -360,9 +332,7 @@
     ph.phPCodeHi=1;
     ph.phPRevMinor=2;
     ph.phCaps=H2I16(1);
-    if(pwd) {
-        memcpy(ph.phPass,pwd,MAX(strlen(pwd),8));
-    }
+	if(pwd)memmove(ph.phPass,pwd,MAX(strlen(pwd),8));
 	ph.phQOZone=H2I16(fa->z);
 	ph.phQDZone=H2I16(ta->z);
 	ph.phOZone=H2I16(fa->z);
@@ -389,12 +359,8 @@
     fwrite(from,strlen(from)+1,1,f);
     fwrite(subj,strlen(subj)+1,1,f);
     fprintf(f,"\001INTL %d:%d/%d %d:%d/%d\r",ta->z,ta->n,ta->f,fa->z,fa->n,fa->f);
-    if(fa->p) {
-        fprintf(f,"\001FMPT %d\r",fa->p);
-    }
-    if(ta->p) {
-        fprintf(f,"\001TOPT %d\r",ta->p);
-    }
+	if(fa->p)fprintf(f,"\001FMPT %d\r",fa->p);
+	if(ta->p)fprintf(f,"\001TOPT %d\r",ta->p);
 	fprintf(f,"\001MSGID: %s %08lx\r",ftnaddrtoa(fa),sequencer());
 	fprintf(f,"\001PID: %s %s/%s\r",progname,version,osname);
 	return f;
@@ -402,9 +368,7 @@
 
 void closepkt(FILE *f, const ftnaddr_t *fa, const char *tear, char *orig)
 {
-    if(cfgi(CFG_RECODEPKTS)) {
-        recode_to_remote(orig);
-    }
+	if(cfgi(CFG_RECODEPKTS))recode_to_remote(orig);
 	fprintf(f,"--- %s\r * Origin: %s (%s)\r%c%c%c",tear,orig,ftnaddrtoa(fa),0,0,0);
 	fclose(f);
 }
@@ -425,36 +389,29 @@
     register int	i;
     char		*p, low;
 
-    if ( !fn ) {
+	if ( !fn )
         return IS_ERR;
-    }
 
     p = strrchr( fn, '.' );
-    if ( !p ) {
+	if ( !p )
         return IS_FILE;
-    }
 
-    if ( strlen( ++p ) != 3 ) {
+	if ( strlen( ++p ) != 3 )
         return IS_FILE;
-    }
 
-    if ( strcasecmp( p + 1, "lo" ) == 0 ) {
+	if ( strcasecmp( p + 1, "lo" ) == 0 )
         return IS_FLO;
-    }
 
     for( i = 0; i < 9; i++ )
         if ( !strncasecmp( p, ext[i], strlen( ext[i] )))
             switch( i ) {
-            case 7:
-                return IS_PKT;
-            case 8:
-                return IS_REQ;
+			case 7: return IS_PKT;
+			case 8: return IS_REQ;
             default:
                 low = tolower( p[2] );
                 if (( low >= '0' && low <= '9' )
-                        || ( low >= 'a' && low <= 'z' )) {
+					|| ( low >= 'a' && low <= 'z' ))
                     return IS_ARC;
-                }
 				break;
 			}
 	return IS_FILE;
@@ -465,9 +422,8 @@
 {
     size_t flen;
 
-    if ( !fn || ( flen = strlen( fn )) < 4 ) {
+	if ( !fn || ( flen = strlen( fn )) < 4 )
         return 0;
-    }
 
 	return ( strncasecmp( fn + flen - 4, ".tic", 4 ) == 0 );
 }
@@ -493,15 +449,9 @@
 int needhold(int status, int what)
 {
     status &= Q_ANYWAIT;
-    if ( status & Q_WAITA ) {
-        return 1;
-    }
-    if (( status & Q_WAITR ) && !( what & (~T_REQ))) {
-        return 1;
-    }
-    if (( status & Q_WAITX ) && !( what & (~T_ARCMAIL))) {
-        return 1;
-    }
+	if ( status & Q_WAITA ) return 1;
+	if (( status & Q_WAITR ) && !( what & (~T_REQ))) return 1;
+	if (( status & Q_WAITX ) && !( what & (~T_ARCMAIL)))return 1;
 	return 0;
 }
 
@@ -509,38 +459,25 @@
 int xfnmatch(char *pat, const char *name, int flags)
 {
     int type,rc=0,q=0;
-    if(!name||!pat) {
-        return FNM_NOMATCH;
-    }
+	if(!name||!pat)return FNM_NOMATCH;
     type=whattype(name);
-    if(*pat=='!') {
-        pat++;
-        rc=1;
-    }
+	if(*pat=='!'){pat++;rc=1;}
     if(*pat=='%') {
         switch(pat[1]) {
         case 'F':
-            if(type==IS_FILE) {
-                q=1;
-            }
+			if(type==IS_FILE)q=1;
             break;
         case 'N':
-            if(type==IS_PKT) {
-                q=1;
-            }
+			if(type==IS_PKT)q=1;
             break;
         case 'E':
-            if(type==IS_ARC) {
-                q=1;
-            }
+			if(type==IS_ARC)q=1;
             break;
         default:
             write_log("error: mask '%s': unknown macro '%c'",pat-rc,pat[1]);
             return FNM_NOMATCH;
         }
-    } else {
-        q=!fnmatch(pat,name,flags);
-    }
+	} else q=!fnmatch(pat,name,flags);
 	DEBUG(('S',4,"xfnm: '%s', pat='%s'. type=%d, q=%d, rc=%d",name,pat,type,q,rc));
 	return((rc^q)?0:FNM_NOMATCH);
 }
@@ -551,8 +488,7 @@
     faslist_t *cf;
 
     for( cf = cfgfasl( CFG_PASSWORD ); cf; cf = cf->next )
-        if ( addr_cmp( &cf->addr, a )) {
+		if ( addr_cmp( &cf->addr, a ))
             return cf->str;
-        }
 	return NULL;
 }
diff -burw ./qico/src/ftn.h ./trunk/src/ftn.h
--- ./qico/src/ftn.h	2024-02-01 18:09:52.565339000 +0300
+++ ./trunk/src/ftn.h	2024-02-01 18:10:34.602457000 +0300
@@ -1,7 +1,13 @@
 /*
- * $Id: ftn.h,v 1.11 2005/08/16 15:17:22 mitry Exp $
+ * $Id: ftn.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: ftn.h,v $
+ * Revision 1.13  2007/01/28 17:55:00  mitry
+ * Add support for INA flag and IBN/IFC optional port number.
+ *
+ * Revision 1.12  2006/04/14 18:45:25  mitry
+ * Added locked flag.
+ *
  * Revision 1.11  2005/08/16 15:17:22  mitry
  * Removed unused ninfo_t.haswtime field
  *
@@ -68,10 +74,11 @@
 
 typedef struct {
 	int	z, n, f, p;
+	int	locked;
     char *d;
 } ftnaddr_t;
 
-#define FTNADDR_T(a) ftnaddr_t (a)={0,0,0,0,NULL}
+#define FTNADDR_T(a)	ftnaddr_t (a)={0,0,0,0,0,NULL}
 
 #include "slists.h"
 
@@ -79,6 +86,7 @@
 	falist_t	*addrs;
 	char		*name,*place,*sysop,*phone,*wtime,*flags,*pwd,*mailer,*host,*tty;
 	int		options,speed,realspeed,netmail,files,type,hidnum,holded,opt;
+	int		ifc_port, bp_port;
 	time_t		time,starttime;
 } ninfo_t;
 
@@ -167,6 +175,7 @@
 char	*ftnaddrtoa(const ftnaddr_t *);
 char	*ftnaddrtoda(const ftnaddr_t *);
 char	*ftnaddrtoia(const ftnaddr_t *);
+char	*nodehostname(const ninfo_t *, int);
 char	*strip8(char *);
 int	has_addr(const ftnaddr_t *, falist_t *);
 int	showpkt(const char *);
@@ -186,8 +195,8 @@
 void	outbound_done(void);
 int	outbound_rescan(qeach_t, int);
 int	outbound_addr_busy(const ftnaddr_t *);
-int	outbound_locknode(const ftnaddr_t *, int);
-int	outbound_unlocknode(const ftnaddr_t *, int);
+int	outbound_locknode(ftnaddr_t *, int);
+int	outbound_unlocknode(ftnaddr_t *, int);
 int	outbound_flavor(char fl);
 int	outbound_attach(const ftnaddr_t *, int, slist_t *);
 int	outbound_request(const ftnaddr_t *, slist_t *);
diff -burw ./qico/src/getsid.c ./trunk/src/getsid.c
--- ./qico/src/getsid.c	2024-02-01 18:09:52.565392000 +0300
+++ ./trunk/src/getsid.c	2024-02-01 18:10:34.602168000 +0300
@@ -1,6 +1,3 @@
-/* $Id: getsid.c,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $ */
+/* $Id: getsid.c 18 2010-08-23 15:50:49Z semik $ */
 #include "headers.h"
-pid_t getsid(pid_t pid)
-{
-    return pid;
-}
+pid_t getsid(pid_t pid) { return pid; }
diff -burw ./qico/src/globals.c ./trunk/src/globals.c
--- ./qico/src/globals.c	2024-02-01 18:09:52.565451000 +0300
+++ ./trunk/src/globals.c	2024-02-01 18:10:34.590380000 +0300
@@ -2,9 +2,12 @@
  * global variables
  **********************************************************/
 /*
- * $Id: globals.c,v 1.10 2005/03/31 19:28:16 mitry Exp $
+ * $Id: globals.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: globals.c,v $
+ * Revision 1.11  2006/07/22 13:13:00  mitry
+ * Use file times in GMT on some protocols.
+ *
  * Revision 1.10  2005/03/31 19:28:16  mitry
  * Removed unused variable 'calling'
  *
@@ -19,6 +22,7 @@
 char *connstr=NULL;
 char *devnull="/dev/null";
 char ip_id[10];
+char *syslog_name=NULL;
 char *log_name=NULL;
 char *log_tty=NULL;
 char *tty_port=NULL;
@@ -53,3 +57,6 @@
 slist_t *ccsl;
 subst_t *psubsts;
 unsigned long totalf,totalm,totaln;
+
+int ftime_is_gmt = 0;
+
diff -burw ./qico/src/globals.h ./trunk/src/globals.h
--- ./qico/src/globals.h	2024-02-01 18:09:52.565509000 +0300
+++ ./trunk/src/globals.h	2024-02-01 18:10:34.607232000 +0300
@@ -1,6 +1,9 @@
-/* $Id: globals.h,v 1.6 2005/03/31 19:28:16 mitry Exp $
+/* $Id: globals.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: globals.h,v $
+ * Revision 1.7  2006/07/22 13:13:01  mitry
+ * Use file times in GMT on some protocols.
+ *
  * Revision 1.6  2005/03/31 19:28:16  mitry
  * Removed unused variable 'calling'
  *
@@ -16,6 +19,7 @@
 extern char *connstr;
 extern char *devnull;
 extern char ip_id[10];
+extern char *syslog_name;
 extern char *log_name;
 extern char *log_tty;
 extern char *tty_port;
@@ -48,6 +52,7 @@
 extern slist_t *ccsl;
 extern subst_t *psubsts;
 extern unsigned long totalf,totalm,totaln;
+extern int ftime_is_gmt;
 
 #endif
 #endif
diff -burw ./qico/src/have.h ./trunk/src/have.h
--- ./qico/src/have.h	2024-02-01 18:09:52.565569000 +0300
+++ ./trunk/src/have.h	2024-02-01 18:10:34.593590000 +0300
@@ -1,6 +1,6 @@
 /******************************************************************
  * System includes.
- * $Id: have.h,v 1.1 2005/02/07 12:32:00 mitry Exp $
+ * $Id: have.h 18 2010-08-23 15:50:49Z semik $
  ******************************************************************/
 
 #ifdef HAVE_SYS_TYPES_H
diff -burw ./qico/src/headers.h ./trunk/src/headers.h
--- ./qico/src/headers.h	2024-02-01 18:09:52.565655000 +0300
+++ ./trunk/src/headers.h	2024-02-01 18:10:34.605850000 +0300
@@ -2,7 +2,7 @@
  * All common headers are included here
  **********************************************************/
 /*
- * $Id: headers.h,v 1.7 2005/05/16 20:33:14 mitry Exp $
+ * $Id: headers.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: headers.h,v $
  * Revision 1.7  2005/05/16 20:33:14  mitry
diff -burw ./qico/src/hydra.c ./trunk/src/hydra.c
--- ./qico/src/hydra.c	2024-02-01 18:09:52.566430000 +0300
+++ ./trunk/src/hydra.c	2024-02-01 18:10:34.591885000 +0300
@@ -5,9 +5,15 @@
                   COPYRIGHT (C) 1991-1993; ALL RIGHTS RESERVED
 =============================================================================*/
 /*
- * $Id: hydra.c,v 1.29 2005/06/10 20:56:25 mitry Exp $
+ * $Id: hydra.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: hydra.c,v $
+ * Revision 1.31  2005/11/27 01:32:39  mitry
+ * Fixed hydra_send() if file to be sent is disappeared.
+ *
+ * Revision 1.30  2005/09/06 20:42:04  mitry
+ * Added macros to qpreset() calls
+ *
  * Revision 1.29  2005/06/10 20:56:25  mitry
  * Changed exit from hydra_send()
  *
@@ -262,8 +268,7 @@
 
 /*---------------------------------------------------------------------------*/
 static void hydra_msgdev(byte *data, word len)
-{
-    /* text is already NUL terminated by calling func hydra_devrecv() */
+{       /* text is already NUL terminated by calling func hydra_devrecv() */
     len = len;
     write_log( "HydraMsg: %s",data );
 }/*hydra_msgdev()*/
@@ -299,20 +304,18 @@
 /*---------------------------------------------------------------------------*/
 boolean hydra_devfree(void)
 {
-    if ( devtxstate || !( txoptions & HOPT_DEVICE ) || txState >= HTX_END ) {
+    if ( devtxstate || !( txoptions & HOPT_DEVICE ) || txState >= HTX_END )
         return (false);    /* busy or not allowed       */
-    } else {
+    else
         return (true);    /* allowed to send a new pkt */
-    }
 }/*hydra_devfree()*/
 
 
 /*---------------------------------------------------------------------------*/
 boolean hydra_devsend(char *dev, byte *data, word len)
 {
-    if ( !dev || !data || !len || !hydra_devfree() ) {
+    if ( !dev || !data || !len || !hydra_devfree() )
         return (false);
-    }
 
 #ifndef HYDRA8K16K
     strncpy( devtxdev, dev, H_FLAGLEN );
@@ -337,9 +340,8 @@
     devtxstate   = HTD_DATA;
 
     /* special for chat, only prolong life if our side keeps typing! */
-    if ( chattimer > 1L && !strcmp( devtxdev, "CON" ) && txState == HTX_REND ) {
+    if ( chattimer > 1L && !strcmp( devtxdev, "CON" ) && txState == HTX_REND )
         braindead = h_timer_set( H_BRAINDEAD );
-    }
 
     return (true);
 }/*hydra_devsend()*/
@@ -378,9 +380,9 @@
     if ( i < 0 || i >= h_packets_len ) {
         snprintf( err, ERR_LEN, "'%c' (Unknown)", c );
     } else {
-        if ( verboseLog ) {
+        if ( verboseLog )
             r = h_packets[ i ];
-        } else {
+        else {
             snprintf( err, ERR_LEN, "'%c'", c );
         }
     }
@@ -398,9 +400,9 @@
     if ( i < 0 || i >= h_formats_len ) {
         snprintf( err, ERR_LEN, "'%c' (Unknown)", c );
     } else {
-        if ( verboseLog ) {
+        if ( verboseLog )
             r = h_formats[ i ];
-        } else {
+        else {
             snprintf( err, ERR_LEN, "'%c'", c );
         }
     }
@@ -416,9 +418,8 @@
 
     if ( c < 0 || c >= h_tx_states_len ) {
         snprintf( err, ERR_LEN, "'%d' (Unknown)", c );
-    } else {
+    } else
         r = h_tx_states[ c ];
-    }
     return r;
 }
 
@@ -431,9 +432,8 @@
 
     if ( c < 0 || c >= h_rx_states_len ) {
         snprintf( err, ERR_LEN, "'%d' (Unknown)", c );
-    } else {
+    } else
         r = h_rx_states[ c ];
-    }
     return r;
 }
 
@@ -446,9 +446,8 @@
 
     if ( c < 0 || c >= h_dpkttx_states_len ) {
         snprintf( err, ERR_LEN, "'%d' (Unknown)", c );
-    } else {
+    } else
         r = h_dpkttx_states[ c ];
-    }
     return r;
 }
 
@@ -553,9 +552,8 @@
     p = buf;
     for( i = 0; flags[i].val; i++ ) {
         if ( val & flags[i].val ) {
-            if ( p > buf ) {
+            if ( p > buf )
                 *p++ = ',';
-            }
             strcpy( p, flags[i].str );
             p += H_FLAGLEN;
         }
@@ -591,40 +589,23 @@
 /*---------------------------------------------------------------------------*/
 static int hydra_adjust_blklen(int i)
 {
-    if      ( i <=  64 ) {
-        i =   64;
-    } else if ( i <= 128 ) {
-        i =  128;
-    } else if ( i <= 256 ) {
-        i =  256;
-    } else if ( i <= 512 ) {
-        i =  512;
-    }
+    if      ( i <=  64 )  i =   64;
+    else if ( i <= 128 )  i =  128;
+    else if ( i <= 256 )  i =  256;
+    else if ( i <= 512 )  i =  512;
 
 #ifndef HYDRA8K16K
-    else {
-        i = 1024;
-    }
+    else                  i = 1024;
 #else
-    else if ( i <= 1024 ) {
-        i = 1024;
-    } else if ( i <= 2048 ) {
-        i = 2048;
-    } else if ( i <= 4096 ) {
-        i = 4096;
-    } else {
-        i = 8192;
-    }
+    else if ( i <= 1024 ) i = 1024;
+    else if ( i <= 2048 ) i = 2048;
+    else if ( i <= 4096 ) i = 4096;
+    else                  i = 8192;
 
-    if      ( hydra_modifier == 8 && i > 8192 ) {
-        i = 8192;
-    } else if ( hydra_modifier == 4 && i > 4096 )	{
-        i = 4096;
-    } else if ( hydra_modifier == 2 && i > 2048 )	{
-        i = 2048;
-    } else if ( hydra_modifier == 1 && i > 1024 ) {
-        i = 1024;
-    }
+    if      ( hydra_modifier == 8 && i > 8192 ) i = 8192;
+    else if ( hydra_modifier == 4 && i > 4096 )	i = 4096;
+    else if ( hydra_modifier == 2 && i > 2048 )	i = 2048;
+    else if ( hydra_modifier == 1 && i > 1024 ) i = 1024;
 #endif
     
     return i;
@@ -638,9 +619,8 @@
     register byte n;
 
     n = c;
-    if (txoptions & HOPT_HIGHCTL) {
+    if (txoptions & HOPT_HIGHCTL)
         n &= 0x7f;
-    }
 
     if (n == H_DLE ||
         ((txoptions & HOPT_XONXOFF) && (n == XON || n == XOFF)) ||
@@ -663,17 +643,14 @@
     int to = timeOut;
     tnow = h_timer_get();
 
-    if ( h_timer_running( braindead ) && !h_timer_expired_agl( braindead, tnow )) {
+    if ( h_timer_running( braindead ) && !h_timer_expired_agl( braindead, tnow ))
         to = MIN( to, timer_rest( braindead ));
-    }
 
-    if ( h_timer_running( txtimer ) && !h_timer_expired_agl( txtimer, tnow )) {
+    if ( h_timer_running( txtimer ) && !h_timer_expired_agl( txtimer, tnow ))
         to = MIN( to, timer_rest( txtimer ));
-    }
 
-    if ( h_timer_running( devtxtimer ) && !h_timer_expired_agl( devtxtimer, tnow )) {
+    if ( h_timer_running( devtxtimer ) && !h_timer_expired_agl( devtxtimer, tnow ))
         to = MIN( to, timer_rest( devtxtimer ));
-    }
 
     return MAX( 1, to );
 }
@@ -753,18 +730,12 @@
 
     case HPKT_FINFOACK:
         if ( rxfd ) {
-            if (rxPos > 0L) {
-                s1 = "Resume";
-            } else {
-                s1 = "BoF";
+                 if (rxPos > 0L)    s1 = "Resume";
+                 else               s1 = "BoF";
             }
-        } else if (rxPos == -1L) {
-            s1 = "Have";
-        } else if (rxPos == -2L) {
-            s1 = "Skip";
-        } else {
-            s1 = "EoB";
-        }
+             else if (rxPos == -1L) s1 = "Have";
+             else if (rxPos == -2L) s1 = "Skip";
+             else                   s1 = "EoB";
              sprintf( buf1, "FINFOACK (pos=%ld %s  rxstate=%s)"/*  rxfd=%d)"*/,
                  rxPos,s1, hydra_rx_state_str( rxState ) /* ,rxfd */);
              break;
@@ -829,13 +800,11 @@
     /* xfree( s2 );
     xfree( s1 ); */
 
-    if ( buflen > 8 ) {
+    if ( buflen > 8 )
         DEBUG(('H',3,"  -> %s", buf1));
-    }
 
-    if ( buf2[0] ) {
+    if ( buf2[0] )
         DEBUG(('H',3,"  -> %s", buf2));
-    }
     DEBUG(('H',4,"now: %08x, rxtimer: %08x, txtimer: %08x, braindead: %d",
         tnow, rxtimer, txtimer, tnow - braindead));
 }
@@ -868,22 +837,20 @@
     default:
         /* COULD do smart format selection depending on data and options! */
         if (txoptions & HOPT_HIGHBIT) {
-            if ((txoptions & HOPT_CTLCHRS) && (txoptions & HOPT_CANUUE)) {
+                if ((txoptions & HOPT_CTLCHRS) && (txoptions & HOPT_CANUUE))
                 format = HCHR_UUEPKT;
-            } else if (txoptions & HOPT_CANASC) {
+                else if (txoptions & HOPT_CANASC)
                 format = HCHR_ASCPKT;
-            } else {
+                else
                 format = HCHR_HEXPKT;
             }
-        } else {
+             else
             format = HCHR_BINPKT;
-        }
         break;
     }
 
-    if (format != HCHR_HEXPKT && (txoptions & HOPT_CRC32)) {
+    if (format != HCHR_HEXPKT && (txoptions & HOPT_CRC32))
         crc32 = true;
-    }
 
     if (crc32) {
         dword crc = (~(crc32block(txbufin,len)));
@@ -920,22 +887,23 @@
                 *out++ = '\\';
                 *out++ = hexdigitslower[((*in) >> 4) & 0x0f];
                 *out++ = hexdigitslower[(*in) & 0x0f];
-            } else if (*in < 32 || *in == 127) {
+                 }
+                 else if (*in < 32 || *in == 127) {
                 *out++ = H_DLE;
                 *out++ = (*in) ^ 0x40;
-            } else if (*in == '\\') {
+                 }
+                 else if (*in == '\\') {
                 *out++ = '\\';
                 *out++ = '\\';
-            } else {
+                 }
+                 else
                 *out++ = *in;
             }
-        }
         break;
 
     case HCHR_BINPKT:
-        for (; len > 0; len--) {
+             for (; len > 0; len--)
             out = put_binbyte(out,*in++);
-        }
              break;
 
         case HCHR_ASCPKT:
@@ -948,9 +916,8 @@
                 n = c = 0;
             }
         }
-        if (n > 0) {
+             if (n > 0)
             out = put_binbyte(out,c & 0x7f);
-        }
              break;
 
         case HCHR_UUEPKT:
@@ -963,10 +930,9 @@
         if (len > 0) {
             *out++ = h_uuenc(in[0] >> 2);
             *out++ = h_uuenc(((in[0] << 4) & 0x30) | ((in[1] >> 4) & 0x0f));
-            if (len == 2) {
+                if (len == 2)
                 *out++ = h_uuenc((in[1] << 2) & 0x3c);
             }
-        }
              break;
     }
 
@@ -994,8 +960,7 @@
             PUTCHAR(0);
             break;
 
-        default:
-            PUTCHAR(*in);
+            default:  PUTCHAR(*in);
                       break;
         }
     }
@@ -1006,7 +971,7 @@
     hytxb.pqueue = xrealloc( hytxb.pqueue, sizeof( HYPKT ) * ( hytxb.npkts + 1 ));
     hytxb.pqueue[hytxb.npkts].len = (out - txBuf);
     hytxb.pqueue[hytxb.npkts].pkt = (byte *) xmalloc( hytxb.pqueue[hytxb.npkts].len );
-    memcpy( hytxb.pqueue[hytxb.npkts].pkt, txBuf, hytxb.pqueue[hytxb.npkts].len );
+    memmove( hytxb.pqueue[hytxb.npkts].pkt, txBuf, hytxb.pqueue[hytxb.npkts].len );
     hytxb.npkts++;
     hytxb.prefix_done = false;
 
@@ -1024,11 +989,10 @@
         if ( hytxb.npkts ) {			/* there are unsent packets */
             for( i = 0; i < hytxb.npkts; i++ ) {
                 if ( hytxb.pqueue[i].pkt ) {
-                    if ( hytxb.pqueue[i].len + hytxb.tx_left > hytxb.tx_size ) {
+                    if ( hytxb.pqueue[i].len + hytxb.tx_left > hytxb.tx_size )
                         break;
-                    }
 
-                    memcpy( (void *) (hytxb.tx_buf + hytxb.tx_left),
+                    memmove( (void *) (hytxb.tx_buf + hytxb.tx_left),
                         hytxb.pqueue[i].pkt, hytxb.pqueue[i].len );
                     hytxb.tx_left += hytxb.pqueue[i].len;
                     xfree( hytxb.pqueue[i].pkt );
@@ -1043,14 +1007,12 @@
         }
     }
 
-    if ( hytxb.tx_left == 0 ) {
+    if ( hytxb.tx_left == 0 )
         return 1;
-    }
 
     if (( rc = tty_write( hytxb.tx_buf + hytxb.tx_ptr, hytxb.tx_left )) < 0 ) {
-        if ( rc != TTY_TIMEOUT ) {
+        if ( rc != TTY_TIMEOUT )
             return rc;
-        }
     } else {
         hytxb.tx_left -= rc;
         hytxb.tx_ptr += rc;
@@ -1166,13 +1128,11 @@
            buflen < 9 ?  " " : "",
            crcType, crcDebug, s1, s2, rxpktlen));
 
-    if ( buflen > 8 ) {
+    if ( buflen > 8 )
         DEBUG(('H',3,"  <- %s", buf1));
-    }
 
-    if ( buf2[0] ) {
+    if ( buf2[0] )
         DEBUG(('H',3,"  <- %s", buf2));
-    }
 
     DEBUG(('H',4,"now: %08x, rxtimer: %08x, txtimer: %08x, braindead: %d",
         tnow, rxtimer, txtimer, tnow - braindead));
@@ -1193,46 +1153,39 @@
     int crcType;
 #endif
 
-    if (( i = hydra_check_timers()) != H_NOPKT ) {
+    if (( i = hydra_check_timers()) != H_NOPKT )
         return i;
-    }
 
-    if ( !canread ) {
+    if ( !canread )
         return H_NOPKT;
-    }
 
     p = rxBufPtr;
 
     while(( c = GETCHAR( 0 )) >= 0 ) {
 
-        if ( rxoptions & HOPT_HIGHBIT ) {
+        if ( rxoptions & HOPT_HIGHBIT )
             c &= 0x7f;
-        }
 
         n = c;
 
-        if ( rxoptions & HOPT_HIGHCTL ) {
+        if ( rxoptions & HOPT_HIGHCTL )
             n &= 0x7f;
-        }
 
         if ( n != H_DLE &&
                 ((( rxoptions & HOPT_XONXOFF ) && ( n == XON || n == XOFF )) ||
-                 (( rxoptions & HOPT_CTLCHRS ) && ( n < 32 || n == 127 )))) {
+             (( rxoptions & HOPT_CTLCHRS ) && ( n < 32 || n == 127 ))))
             continue;
-        }
 
         if ( rxdle || c == H_DLE ) {
             switch (c) {
             case H_DLE:
-                if ( ++rxdle >= 5 ) {
+                    if ( ++rxdle >= 5 )
                     return ( H_CANCEL );
-                }
                 break;
 
             case HCHR_PKTEND:
-                if ( p == NULL ) {
+                    if ( p == NULL )
                     break;
-                }
 
                     rxBufPtr = p;
 
@@ -1246,24 +1199,19 @@
                         if ( *p == '\\' && *++p != '\\' ) {
                             i = *p;
                             n = *++p;
-                            if (( i -= '0' ) > 9 ) {
-                                i -= ( 'a' - ':' );
-                            }
-                            if (( n -= '0' ) > 9 ) {
-                                n -= ( 'a' - ':' );
-                            }
+                                    if (( i -= '0' ) > 9 ) i -= ( 'a' - ':' );
+                                    if (( n -= '0' ) > 9 ) n -= ( 'a' - ':' );
                             if (( i & ~0x0f ) || ( n & ~0x0f )) {
                                 c = H_NOPKT; 	/*AGL:17aug93*/
                                 break;
                             }
                             *q++ = ( i << 4 ) | n;
-                        } else {
+                                }
+                                else
                             *q++ = *p;
                         }
-                    }
-                    if ( p > rxBufPtr ) {
+                            if ( p > rxBufPtr )
                         c = H_NOPKT;
-                    }
                             break;
 
                         case HCHR_ASCPKT:
@@ -1318,9 +1266,8 @@
 
                 rxBufPtr = NULL;
 
-                if (c == H_NOPKT) {
+                    if (c == H_NOPKT)
                     break;
-                }
 
                     rxpktlen = (word) (q - rxBuf);
 
@@ -1337,7 +1284,8 @@
 #endif
                     n = h_crc32test( crc );
                     rxpktlen -= (word) (LONGx1);  /* remove CRC-32 */
-                } else {
+                    }
+                    else {
                        if (rxpktlen < 3) {
                           c = H_NOPKT;
                           break;
@@ -1378,9 +1326,9 @@
 
             default:
                 if (p) {
-                    if (p < rxBufMax) {
+                        if (p < rxBufMax)
                         *p++ = (byte) (c ^ 0x40);
-                    } else {
+                        else {
                            DEBUG(('H',2,"rxpkt Pkt too long - discarded"));
                            p = NULL;
                         }
@@ -1388,19 +1336,19 @@
                 rxdle = 0;
                 break;
             }
-        } else if (p) {
-            if (p < rxBufMax) {
+        }
+        else if (p) {
+           if (p < rxBufMax)
                 *p++ = (byte) c;
-            } else {
+           else {
                 DEBUG(('H',2,"rxpkt Pkt too long - discarded"));
                 p = NULL;
             }
         }
     }
 
-    if ( c != TTY_TIMEOUT && NOTTO( c )) {
+    if ( c != TTY_TIMEOUT && NOTTO( c ))
         return H_CARRIER;
-    }
 
     rxBufPtr = p;
 
@@ -1455,48 +1403,42 @@
 
     batchesdone = 0;
 
-    if (originator) {
+    if (originator)
         hdxlink = false;
-    } else {
+    else
         hdxlink = cfgi( CFG_HYDRAHDX ) == 1;
-    }
 
     verboseLog = cfgi( CFG_HYDRALOGVERBOSE );
 
     hoCAN = HCAN_OPTIONS;
-    if ( cfgi( CFG_HYDRACRC16 ) == 1 ) {
+    if ( cfgi( CFG_HYDRACRC16 ) == 1 )
         hoCAN &= ~HOPT_CRC32;
-    }
 
     options = (want_options & hoCAN) & ~HUNN_OPTIONS;
 
     DEBUG(('H',5,"Want CRC%d", (cfgi( CFG_HYDRACRC16 ) ? 16 : 32)));
 
     timeOut = (word) (40960L / effbaud);
-    if      (timeOut < H_MINTIMER) {
-        timeOut = H_MINTIMER;
-    } else if (timeOut > H_MAXTIMER) {
-        timeOut = H_MAXTIMER;
-    }
+    if      (timeOut < H_MINTIMER) timeOut = H_MINTIMER;
+    else if (timeOut > H_MAXTIMER) timeOut = H_MAXTIMER;
 
     DEBUG(('H',5,"effbaud: %d", effbaud));
     DEBUG(('H',5,"Timeout: %d", timeOut));
 
 #ifndef HYDRA8K16K
 
-    if ( effbaud >= 2400UL) {				/*AGL:09mar94*/
+    if ( effbaud >= 2400UL)					/*AGL:09mar94*/
         txMaxBlkLen = H_MAXBLKLEN;    /*AGL:09mar94*/
-    } else {							/*AGL:09mar94*/
+    else {							/*AGL:09mar94*/
         txMaxBlkLen = (word) ((effbaud / 300) * 128);		/*AGL:09mar94*/
-        if ( txMaxBlkLen < 256 ) {
-            txMaxBlkLen = 256;    /*AGL:09mar94*/
-        }
+        if ( txMaxBlkLen < 256 ) txMaxBlkLen = 256;		/*AGL:09mar94*/
     }								/*AGL:09mar94*/
 
     if (is_ip /* || arqlink */) {				/*AGL:14jan95*/
         rxBlkLen = txBlkLen = txMaxBlkLen;
         txgoodneeded = 0;
-    } else {
+    }
+    else {
         rxBlkLen = txBlkLen = (word) ((effbaud < 2400UL) ? 256 : 512);
         txgoodneeded = txMaxBlkLen;				/*AGL:23feb93*/
     }
@@ -1508,10 +1450,8 @@
             txMaxBlkLen = H_MAXBLKLEN( 1 );
         } else {
             txMaxBlkLen = (word) ((effbaud / 300) * 128);
-            if ( txMaxBlkLen < 256 ) {
-                txMaxBlkLen = 256;
+            if ( txMaxBlkLen < 256 ) txMaxBlkLen = 256;
             }
-        }
 
         if (is_ip /* || arqlink */) {				/*AGL:14jan95*/
            rxBlkLen = txBlkLen = txMaxBlkLen;
@@ -1559,12 +1499,11 @@
 {
     int i;
 
-    qpreset( 0 );
-    qpreset( 1 );
+    qpreset( QPR_RECV );
+    qpreset( QPR_SEND );
     for( i = 0; i < hytxb.npkts; i++ )
-        if ( hytxb.pqueue[i].pkt ) {
+        if ( hytxb.pqueue[i].pkt )
             xfree( hytxb.pqueue[i].pkt );
-        }
     xfree( hytxb.pqueue );
     xfree( hytxb.tx_buf );
     xfree( rxBuf );
@@ -1585,6 +1524,15 @@
 
     DEBUG(('H',1,"hydra_batch: %s, %s", txpathname, txalias));
 
+    /*-------------------------------------------------------------------*/
+	if ( txpathname ) {
+		if ( !( txfd = txopen( txpathname, txalias )))
+			return XFER_SKIP;
+
+		txStart  = 0L;
+		txsyncid = 0L;
+	}
+
     rxstatus = 0;
 
     /*-------------------------------------------------------------------*/
@@ -1604,30 +1552,14 @@
         devtxstate = HTD_DONE;
 
         braindead  = h_timer_set(H_BRAINDEAD);
-    } else {
-        txState = HTX_FINFO;
     }
+    else
+        txState = HTX_FINFO;
 
     txtimer   = h_timer_reset();
     txretries = 0;
 
     /*-------------------------------------------------------------------*/
-    if ( txpathname ) {
-        if ( !( txfd = txopen( txpathname, txalias ))) {
-            return XFER_SKIP;
-        }
-
-        txStart  = 0L;
-        txsyncid = 0L;
-    }
-    /*
-    else {
-        txfd = NULL;
-        xstrcpy( txfname, "", 2 );
-    }
-    */
-
-    /*-------------------------------------------------------------------*/
     do {
         /*----------------------------------------------------------------*/
         switch (devtxstate) {
@@ -1642,7 +1574,7 @@
                 xstrcpy( p, devtxdev, 1020 );
 #endif
                 p += H_FLAGLEN + 1;
-                memcpy(p,devtxbuf,devtxlen);
+                    memmove(p,devtxbuf,devtxlen);
                     txpkt((word) ((LONGx1) + H_FLAGLEN + 1 + devtxlen), HPKT_DEVDATA);
                     devtxtimer = h_timer_set((!rxState && txState == HTX_REND) ?
                          timeOut >> 1 : 
@@ -1714,10 +1646,11 @@
                     strcpy( (char *) txbufin + i, sendf.fname );
                     i += strlen( sendf.fname ) + 1;
                 }
-            } else {
+                 }
+                 else {
                 if (!txretries) {
                     DEBUG(('H',1,"HSend: End of batch"));
-                    qpreset(1);
+                         qpreset( QPR_SEND );
                      }
                      *txbufin = '\0';
                      i = 1;
@@ -1729,13 +1662,12 @@
 
         /*---------------------------------------------------------*/
         case HTX_XDATA:
-            if ( hytxb.npkts ) {
+                 if ( hytxb.npkts )
                 break;
-            }
 
-            if (txPos < 0L) {
+                 if (txPos < 0L)
                 i = -1;    /* Skip */
-            } else {
+                 else {
                      hydra_putlong( txbufin, (dword) txPos );
                      if ((i = fread( txbufin + 4, 1, txBlkLen, txfd )) < 0) {
                          DEBUG(('H',1,"HSend: File read error"));
@@ -1765,9 +1697,8 @@
                     txState = HTX_DATAACK;
                 }
 
-                if (!txStart) {
+                     if (!txStart)
                     txStart = time(NULL);
-                }
                      hydra_status(true);
                      break;
                  }
@@ -1818,9 +1749,8 @@
 
         rd = rd || tty_hasinbuf();
 
-        if ( wd && !tty_gothup ) {
+        if ( wd && !tty_gothup )
             hydra_txpkt();
-        }
 
         pkttype = rxpkt( rd );
 
@@ -1837,18 +1767,10 @@
         case H_SYSABORT:
         case H_BRAINTIME:
             switch (pkttype) {
-            case H_CARRIER:
-                p = "Carrier lost";
-                break;
-            case H_CANCEL:
-                p = "Aborted by other side";
-                break;
-            case H_SYSABORT:
-                p = "Aborted by operator";
-                break;
-            case H_BRAINTIME:
-                p = "Other end died";
-                break;
+                     case H_CARRIER:   p = "Carrier lost";          break;
+                     case H_CANCEL:    p = "Aborted by other side"; break;
+                     case H_SYSABORT:  p = "Aborted by operator";   break;
+                     case H_BRAINTIME: p = "Other end died";        break;
                  }
                  write_log( "Hydra: %s",p );
                  txState = HTX_DONE;
@@ -1876,24 +1798,12 @@
             txtimer = h_timer_reset();
 
             switch (txState) {
-            case HTX_SWAIT:
-                txState = HTX_START;
-                break;
-            case HTX_INITACK:
-                txState = HTX_INIT;
-                break;
-            case HTX_FINFOACK:
-                txState = HTX_FINFO;
-                break;
-            case HTX_DATAACK:
-                txState = HTX_XDATA;
-                break;
-            case HTX_EOFACK:
-                txState = HTX_EOF;
-                break;
-            case HTX_ENDACK:
-                txState = HTX_END;
-                break;
+                     case HTX_SWAIT:    txState = HTX_START; break;
+                     case HTX_INITACK:  txState = HTX_INIT;  break;
+                     case HTX_FINFOACK: txState = HTX_FINFO; break;
+                     case HTX_DATAACK:  txState = HTX_XDATA; break;
+                     case HTX_EOFACK:   txState = HTX_EOF;   break;
+                     case HTX_ENDACK:   txState = HTX_END;   break;
                  }
                  break;
 
@@ -1958,21 +1868,17 @@
                 DEBUG(('H',5,"hydra_rxwindow: %ld", hydra_rxwindow));
                 DEBUG(('H',5,"hydra_txwindow: %ld", hydra_txwindow));
 
-                if ( rxwindow < 0L ) {
+                     if ( rxwindow < 0L )
                     rxwindow = 0L;
-                }
 
-                if ( hydra_rxwindow && ( !rxwindow || hydra_rxwindow < rxwindow )) {
+                     if ( hydra_rxwindow && ( !rxwindow || hydra_rxwindow < rxwindow ))
                     rxwindow = hydra_rxwindow;
-                }
 
-                if ( txwindow < 0L) {
+                     if ( txwindow < 0L)
                     txwindow = 0L;
-                }
 
-                if ( hydra_txwindow && ( !txwindow || hydra_txwindow < txwindow )) {
+                     if ( hydra_txwindow && ( !txwindow || hydra_txwindow < txwindow ))
                     txwindow = hydra_txwindow;
-                }
 
                      DEBUG(('H',5,"rxwindow: %ld", rxwindow));
                      DEBUG(('H',5,"txwindow: %ld", txwindow));
@@ -1992,10 +1898,9 @@
 
                     if (( q = strchr( p, ',' )) != NULL ) {
                         *q = ' ';
-                        if (( q = strchr( q + 1, ' ' )) != NULL ) {
+                             if (( q = strchr( q + 1, ' ' )) != NULL )
                             *q = '/';
                         }
-                    }
 
                          DEBUG(('H',1,"Hydra: Remote App.Info='%s'", p));
 
@@ -2004,10 +1909,9 @@
                     if ( txwindow || rxwindow )
                         write_log("Hydra: Using link options '%s', Window [%ld/%ld]",
                                   rxBuf, txwindow, rxwindow);
-                    else {
+                         else
                         write_log("Hydra: Using link options '%s'", rxBuf);
                     }
-                }
 
                      chattimer = (rxoptions & HOPT_DEVICE) ? 0L : 1L;
 
@@ -2034,20 +1938,20 @@
                 braindead = h_timer_set(H_BRAINDEAD);
                 if ( !rxBuf[0] ) {
                     DEBUG(('H',1,"HRecv: End of batch"));
-                    qpreset( 0 );
+                         qpreset( QPR_RECV );
                     rxPos = 0L;
                     rxState = HRX_DONE;
                     batchesdone++;
-                } else {
+                     }
+                     else {
                     dword count;
 
                     rxfsize = rxftime = 0L;
                     sscanf((char *) rxBuf, "%08lx%08lx", &rxftime, (dword *) &rxfsize);
                     sscanf((char *) rxBuf + 32, "%08lx", &count);
 
-                    if ( !recvf.allf && (int) count) {
+                         if ( !recvf.allf && (int) count)
                         recvf.allf = (int) count;
-                    }
 
                          p = (char *) rxBuf + 40;
 
@@ -2084,9 +1988,9 @@
 
                     qpfrecv();
                 }
-            } else if (rxState == HRX_DONE) {
-                rxPos = (!rxBuf[0]) ? 0L : H_SUSPEND /* -2L */;
                  }
+                 else if (rxState == HRX_DONE)
+                     rxPos = (!rxBuf[0]) ? 0L : H_SUSPEND /* -2L */;
 
                  hydra_putlong( txbufin, (dword) rxPos );
                  txpkt((word) LONGx1, HPKT_FINFOACK);
@@ -2100,7 +2004,8 @@
                 if ( !txfd ) {
                     txtimer = h_timer_set(H_IDLE);
                     txState = HTX_REND;
-                } else {
+                     }
+                     else {
                          txtimer = h_timer_reset();
                          txPos = hydra_getlong( rxBuf );
 
@@ -2187,9 +2092,8 @@
                             res = XFER_ABORT;
                             break;
                         }
-                        if ( rxretries == 1 || rxretries == 4 ) {
+                             if ( rxretries == 1 || rxretries == 4 )
                             rxsyncid++;
-                        }
 
                              rxBlkLen >>= 1;
                              i = hydra_adjust_blklen( rxBlkLen );
@@ -2300,10 +2204,8 @@
                         res = XFER_ABORT;
                         break;
                     }
-                    if (txretries != 4) {
-                        break;    /*AGL:14may93*/
+                         if (txretries != 4) break; 	/*AGL:14may93*/
                     }
-                }
 
                      txtimer = h_timer_reset();
                      txPos = hydra_getlong( rxBuf );
@@ -2332,17 +2234,15 @@
 #ifdef NEED_DEBUG
                 oBlkLen = txBlkLen;
 #endif
-                if (txBlkLen > (word) txsid ) {
+                     if (txBlkLen > (word) txsid )
                     txBlkLen = (word) txsid;
-                } else {
+                     else
                     txBlkLen >>= 1;
-                }
                 txBlkLen = hydra_adjust_blklen( txBlkLen );
                 txgoodbytes = 0;
                 txgoodneeded += (word) (txMaxBlkLen << 1);		/*AGL:23feb93*/
-                if (txgoodneeded > txMaxBlkLen << 3) {	/*AGL:23feb93*/
+                     if (txgoodneeded > txMaxBlkLen << 3)		/*AGL:23feb93*/
                     txgoodneeded = (word) (txMaxBlkLen << 3);    /*AGL:23feb93*/
-                }
 
                      hydra_status(true);
                      sline("HSend: Resending from offset %ld (newblklen=%u)",txPos,txBlkLen);
@@ -2358,10 +2258,9 @@
                     break;
                 }
 
-                if (txState != HTX_XWAIT) {
+                     if (txState != HTX_XWAIT)
                     txState = HTX_XDATA;
                 }
-            }
                  break;
 
             /*---------------------------------------------------*/
@@ -2392,9 +2291,8 @@
                             break;
                         }
 
-                        if (rxretries == 1 || rxretries == 4) { /*AGL:14may93*/
+                             if (rxretries == 1 || rxretries == 4)  /*AGL:14may93*/
                             rxsyncid++;
-                        }
 
                              rxBlkLen >>= 1;
                              i = hydra_adjust_blklen( rxBlkLen );
@@ -2417,9 +2315,8 @@
                 }/*skip/badeof/eof*/
             }/*rxState==HRX_DATA*/
 
-            if (rxState == HRX_FINFO) {
+                 if (rxState == HRX_FINFO)
                 txpkt((word) 0, HPKT_EOFACK );
-            }
                  break;
 
             /*---------------------------------------------------*/
@@ -2430,10 +2327,9 @@
                     txfsize = txPos;
                     txclose( &txfd, FOP_OK );
                     return (XFER_OK);
-                } else {
+                     } else
                     return (txPos == H_SUSPEND ? XFER_SUSPEND : XFER_SKIP);
                 }
-            }
                  break;
 
             /*---------------------------------------------------*/
@@ -2443,9 +2339,9 @@
                 txtimer = h_timer_reset();
                 txretries = 0;
                 txState = HTX_XDATA;
-            } else if (txState >= HTX_FINFO && txState < HTX_REND) {
-                braindead = h_timer_set(H_BRAINDEAD);
                  }
+                 else if (txState >= HTX_FINFO && txState < HTX_REND)
+                     braindead = h_timer_set(H_BRAINDEAD);
                  break;
 
             /*---------------------------------------------------*/
@@ -2544,9 +2440,8 @@
                 if (chattimer > 0L) break;
                 if (chattimer == 0L) chattimer = -3L;
                 */
-                if ( chattimer > 1L ) {
+                     if ( chattimer > 1L )
                     break;
-                }
                      chattimer = 0L;
 
                      txtimer = h_timer_reset();
@@ -2560,12 +2455,10 @@
         /* }/+while(txState&&pkttype) */
     } while (txState);
 
-    if ( txfd ) {
+    if ( txfd )
         txclose( &txfd, ( res == XFER_OK ) ? FOP_OK : FOP_ERROR );
-    }
-    if ( rxfd ) {
+    if ( rxfd )
         rxclose( &rxfd, ( res == XFER_OK ) ? FOP_OK : FOP_ERROR );
-    }
 
 
 	if ( res == XFER_ABORT ) {
@@ -2576,13 +2469,12 @@
             tnow = timer_set( 2 );
 
             while( !timer_expired( tnow ))
-                if ( GETCHAR( 1 ) == H_DLE && ( tty_gothup != HUP_LINE )) {
+				if ( GETCHAR( 1 ) == H_DLE && ( tty_gothup != HUP_LINE ))
                     tnow = timer_set( 2 );
-                }
 
-            if ( tty_gothup != HUP_LINE ) {
+			if ( tty_gothup != HUP_LINE )
                 BUFFLUSH( 5 );
-            } else {
+			else {
 				PURGEALL();
 			}
 		} else {
diff -burw ./qico/src/hydra.h ./trunk/src/hydra.h
--- ./qico/src/hydra.h	2024-02-01 18:09:52.566539000 +0300
+++ ./trunk/src/hydra.h	2024-02-01 18:10:34.601884000 +0300
@@ -5,7 +5,7 @@
                   COPYRIGHT (C) 1991-1993; ALL RIGHTS RESERVED
 =============================================================================*/
 /*
- * $Id: hydra.h,v 1.12 2005/05/16 11:20:13 mitry Exp $
+ * $Id: hydra.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: hydra.h,v $
  * Revision 1.12  2005/05/16 11:20:13  mitry
diff -burw ./qico/src/janus.c ./trunk/src/janus.c
--- ./qico/src/janus.c	2024-02-01 18:09:52.566803000 +0300
+++ ./trunk/src/janus.c	2024-02-01 18:10:34.603489000 +0300
@@ -10,9 +10,12 @@
  * - crc32 support
  ******************************************************************/
 /*
- * $Id: janus.c,v 1.7 2005/04/04 19:43:56 mitry Exp $
+ * $Id: janus.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: janus.c,v $
+ * Revision 1.8  2005/09/06 20:42:04  mitry
+ * Added macros to qpreset() calls
+ *
  * Revision 1.7  2005/04/04 19:43:56  mitry
  * Added timeout arg to BUFFLUSH() - tty_bufflush()
  *
@@ -66,18 +69,12 @@
     /*-------------------------------------------------------------------------*/
     last_rpostime=
         xmit_retry   = 0L;
-    if (effbaud < 300) {
-        effbaud = 300;
-    }
+	if (effbaud < 300) effbaud = 300;
     timeout = 40960/effbaud;
-    if (timeout < 10) {
-        timeout = 10;
-    }
+	if (timeout < 10) timeout = 10;
     brain_dead=timer_set(120);
     txmaxblklen     = effbaud/300 * 128;
-    if (txmaxblklen > BUFMAX) {
-        txmaxblklen = BUFMAX;
-    }
+	if (txmaxblklen > BUFMAX) txmaxblklen = BUFMAX;
 	txblklen     = txmaxblklen;
 	goodblks     = 0;
 	goodneeded   = 3;
@@ -162,9 +159,7 @@
             if (txpos >= sendf.ftot || blklen < txblklen) {
                 xmit_retry=timer_set(timeout);
                 txstate  = XRCVEOFACK;
-            } else {
-                brain_dead=timer_set(120);
-            }
+			} else brain_dead=timer_set(120);
 
 			if (txblklen < txmaxblklen && ++goodblks > goodneeded) {
 				txblklen <<= 1;
@@ -206,18 +201,12 @@
                     unsigned int ln = FETCH32(rxbuf);
                     if (pkttype == BADPKT || ln != rxpos) {
                         if (pkttype == BLKPKT) {
-                            if (ln < last_blkpos) {
-                                rpos_count = 0;
-                            }
+							if (ln < last_blkpos) rpos_count = 0;
                             last_blkpos = ln;
                         }
                         if (timer_expired(rpos_retry)) {
-                            if (rpos_count > 5) {
-                                rpos_count = 0;
-                            }
-                            if (++rpos_count == 1) {
-                                time(&rpos_sttime);
-                            }
+							if (rpos_count > 5) rpos_count = 0;
+							if (++rpos_count == 1) time(&rpos_sttime);
 							sline("Bad packet at %ld", rxpos);
 							STORE32(rxbuf, rxpos);
 							STORE32(rxbuf+4, rpos_sttime);
@@ -244,9 +233,7 @@
                         }
                     }
                 }
-                if (rxstate == RRCVFNAME) {
-                    sendpkt(NULL,0,EOFACKPKT);
-                }
+				if (rxstate == RRCVFNAME) sendpkt(NULL,0,EOFACKPKT);
 				break;
 
 				/*-------------------------------------------------------------------*/
@@ -277,7 +264,7 @@
                             break;
                         } else {
                             rxstate=RDONE;
-                            qpreset(0);
+							qpreset( QPR_RECV );
 						}
 					} else {
 						sscanf(p, "%u %lo %*o",
@@ -301,9 +288,7 @@
                 STORE32(txbuf, rxpos);
                 txbuf[4]=caps&0xff;
                 sendpkt((byte *)txbuf,5,FNACKPKT);
-                if (!(txstate || rxstate)) {
-                    goto breakout;
-                }
+				if (!(txstate || rxstate)) goto breakout;
 				break;
 
 				/*-------------------------------------------------------------------*/
@@ -324,20 +309,18 @@
                             txstate = XSENDBLK;
                         } else {
                             txclose(&txfd, FOP_SKIP);
-                            qpreset(1);
+							qpreset( QPR_SEND );
                             flexecute(l);
                             l=l->next;
                             getfname(&l);
                             txstate = XSENDFNAME;
                         }
                     } else {
-                        qpreset(1);
+						qpreset( QPR_SEND );
                         txstate = XDONE;
                     }
                 }
-                if (!(txstate || rxstate)) {
-                    goto breakout;
-                }
+				if (!(txstate || rxstate)) goto breakout;
 				break;
 
 
@@ -375,9 +358,7 @@
                             l = fl;
                             txstate = XSENDFNAME;
                             getfname(&l);
-                            if(!txfd) {
-                                txstate = XSENDFREQNAK;
-                            }
+							if(!txfd) txstate = XSENDFREQNAK;
 						} else {
 							txstate = XSENDFREQNAK;
 						}
@@ -421,9 +402,7 @@
                             goto giveup;
                         }
                         sline("Resending from %ld", txpos);
-                        if (txblklen >= 128) {
-                            txblklen >>= 1;
-                        }
+						if (txblklen >= 128) txblklen >>= 1;
 						goodblks = 0;
 						goodneeded = goodneeded<<1 | 1;
 						txstate = XSENDBLK;
@@ -453,8 +432,8 @@
                     rxclose(&rxfd, FOP_ERROR);
                     rc=1;
                 }
-                qpreset(0);
-                qpreset(1);
+			  qpreset( QPR_RECV );
+			  qpreset( QPR_SEND );
 			  goto breakout;
 
 			}  /*  switch (pkttype)  */
@@ -468,9 +447,7 @@
 breakout:
     endbatch();
     while(l) {
-        if(!l->sendas) {
-            flexecute(l);
-        }
+		if(!l->sendas) flexecute(l);
 		l=l->next;
 	}
 	xfree(txbuf);
@@ -533,7 +510,8 @@
     DEBUG(('J',1,"sendpkt32 %d bytes, type:%c", len, type));
 
     crc32 = CRC32_INIT;
-    while (--len >= 0) {
+	while (--len >= 0)
+	{
 		txbyte(*buf);
 		crc32=CRC32_UPDATE(*buf++,crc32);
 	}
@@ -613,18 +591,15 @@
     /* If not accumulating packet yet, find start of next packet               */
     /*-------------------------------------------------------------------------*/
     if (!(p=rxbufptr)) {
-        do {
-            c=rcvbyte(1);
-        } while (c >= 0 || c == PKTEND);
+		do c=rcvbyte(1);
+		while (c >= 0 || c == PKTEND);
 
         switch (c) {
         case PKTSTRT:
-            p = rxbuf;
-            is32=0;
+			p = rxbuf;is32=0;
             break;
         case PKTSTRT32:
-            p = rxbuf;
-            is32=1;
+			p = rxbuf;is32=1;
 			break;
 		case ERROR:
 		case RCDO:
@@ -637,9 +612,7 @@
     /*-------------------------------------------------------------------------*/
     /* Accumulate packet data until we empty buffer or find packet delimiter   */
     /*-------------------------------------------------------------------------*/
-    while((c=rcvbyte(1))>=0 && p<rxbufmax) {
-        *p++=c;
-    }
+	while((c=rcvbyte(1))>=0 && p<rxbufmax) *p++=c;
 
 	/*-------------------------------------------------------------------------*/
 	/* Handle whichever end-of-packet condition occurred                       */
@@ -651,9 +624,7 @@
     case PKTEND:
         pktcrc=0;
         for (i=is32?4:2; i; --i) {
-            if ((c=rcvbyte(timeout)) < 0) {
-                break;
-            }
+			if ((c=rcvbyte(timeout)) < 0) break;
 			pktcrc=(pktcrc<<8)|c;
 		}
 		clccrc=(is32?crc32block((byte *)rxbuf, p-rxbuf):crc16usd((byte *)rxbuf, p-rxbuf));
@@ -721,17 +692,14 @@
     /* Wait for the other end to acknowledge that it's halting                 */
     /*-------------------------------------------------------------------------*/
     while (!done) {
-        if (timer_expired(brain_dead)) {
-            break;
-        }
+		if (timer_expired(brain_dead)) break;
 
         switch (rcvpkt()) {
         case NOPKT:
         case BADPKT:
             if (timer_expired(timeval)) {
-                if (++timeouts > 2) {
-                    ++done;
-                } else {
+				if (++timeouts > 2) ++done;
+				else {
 					sendpkt(NULL,0,HALTPKT);
 					timeval=timer_set(timeout);
 				}
@@ -754,9 +722,7 @@
     /*-------------------------------------------------------------------------*/
     /* Announce quite insistently that we're done now                          */
     /*-------------------------------------------------------------------------*/
-    for (done=0; done<10; ++done) {
-        sendpkt(NULL,0,HALTACKPKT);
-    }
+	for (done=0; done<10; ++done) sendpkt(NULL,0,HALTACKPKT);
 
 }
 
@@ -773,9 +739,7 @@
 
     while(fgets(s,MAX_PATH-1,f)) {
         p=s+strlen(s)-1;
-        while(*p=='\r' || *p=='\n') {
-            *p--=0;
-        }
+		while(*p=='\r' || *p=='\n') *p--=0;
 		slist_add(&l, s);
 	}
 	fclose(f);
@@ -793,11 +757,8 @@
         }
         *l=(*l)->next;
     }
-    if(txfd) {
-        snprintf((char *)txbuf,1024,"%s%c%lu %lo %o%c%c",(*l)->sendas,0,(long)sendf.ftot,sendf.mtime,0644,0,OUR_JCAPS);
-    } else {
-        snprintf((char *)txbuf,1024,"%c%c%c",0,0,OUR_JCAPS);
-    }
+	if(txfd) snprintf((char *)txbuf,1024,"%s%c%lu %lo %o%c%c",(*l)->sendas,0,(long)sendf.ftot,sendf.mtime,0644,0,OUR_JCAPS);
+	else snprintf((char *)txbuf,1024,"%c%c%c",0,0,OUR_JCAPS);
 }
 
 static void preparereqs(flist_t *l)
diff -burw ./qico/src/janus.h ./trunk/src/janus.h
--- ./qico/src/janus.h	2024-02-01 18:09:52.566875000 +0300
+++ ./trunk/src/janus.h	2024-02-01 18:10:34.583185000 +0300
@@ -1,6 +1,6 @@
 /******************************************************************
  * Janus protocol defines
- * $Id: janus.h,v 1.2 2005/03/31 19:40:38 mitry Exp $
+ * $Id: janus.h 18 2010-08-23 15:50:49Z semik $
  ******************************************************************/
 #ifndef __JANUS_H__
 #define __JANUS_H__
diff -burw ./qico/src/log.c ./trunk/src/log.c
--- ./qico/src/log.c	2024-02-01 18:09:52.567049000 +0300
+++ ./trunk/src/log.c	2024-02-01 18:10:34.592195000 +0300
@@ -2,7 +2,7 @@
  * work with log file
  **********************************************************/
 /*
- * $Id: log.c,v 1.10 2005/08/23 16:50:43 mitry Exp $
+ * $Id: log.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: log.c,v $
  * Revision 1.10  2005/08/23 16:50:43  mitry
@@ -42,7 +42,8 @@
 } SLNCODE;
 
 #ifndef HAVE_SYSLOG_FAC_NAMES
-static SLNCODE facilitynames[] = {
+static SLNCODE facilitynames[] =
+{
 	{ "auth",	LOG_AUTH },
         { "cron",	LOG_CRON },
         { "daemon",	LOG_DAEMON },
@@ -66,7 +67,8 @@
 #endif
 
 #ifndef HAVE_SYSLOG_PRI_NAMES
-static SLNCODE prioritynames[] = {
+static SLNCODE prioritynames[] =
+{
 	{ "alert",	LOG_ALERT },
 	{ "crit",	LOG_CRIT },
 	{ "debug",	LOG_DEBUG },
@@ -110,9 +112,8 @@
     int i = 0;
 
     while( names[i].c_name ) {
-        if ( !strcasecmp( f, names[i].c_name )) {
+		if ( !strcasecmp( f, names[i].c_name ))
             return names[i].c_val;
-        }
 		i++;
 	}
 	return -1;
@@ -122,13 +123,12 @@
 int log_init(const char *logname, const char *ttyname)
 {
     FILE	*log_f;
-    char	*n, fac[30], *prio;
+	char	fac[30], *prio, *ln;
     int	fc;
     size_t	len;
 
-    if ( logname == NULL ) {
+	if ( logname == NULL )
         return 0;
-    }
 
 	log_tty = ttyname ? xstrdup( ttyname ) : NULL;
 
@@ -143,40 +143,38 @@
 		return 0;
 	}
 
+
     if ( ttyname ) {
         len = strlen( progname ) + 2 + strlen( ttyname );
-        n = malloc( len );
-        if ( !n ) {
+		syslog_name = malloc( len );
+		if ( !syslog_name ) {
             fprintf( stderr, "can't malloc() %d bytes of memory\n", len );
             abort();
             exit(1);
         }
-        xstrcpy( n, progname, len );
-        xstrcat( n, ".", len );
-        xstrcat( n, ttyname, len );
-    } else {
-        n = xstrdup( progname );
-    }
+		xstrcpy( syslog_name, progname, len );
+		xstrcat( syslog_name, ".", len );
+		xstrcat( syslog_name, ttyname, len );
+	} else
+		syslog_name = xstrdup( progname );
 
-    prio = strchr( logname + 1, ':' );
+	ln = xstrdup( logname + 1 );
+	prio = strchr( ln, ':' );
     if ( prio ) {
-        prio++;
-        xstrcpy( fac, logname + 1, 30 );
-        if (( syslog_priority = parsefacorprio( prio, (SLNCODE *) prioritynames )) < 0 ) {
+		*prio++ = '\0';
+		xstrcpy( fac, ln, 30 );
+		if (( syslog_priority = parsefacorprio( prio, (SLNCODE *) prioritynames )) < 0 )
             syslog_priority = LOG_INFO;
-        }
-    } else {
-        xstrcpy( fac, logname + 1, 30);
-    }
+	} else
+		xstrcpy( fac, ln, 30);
 
-    if (( fc = parsefacorprio( fac, (SLNCODE *) facilitynames )) < 0 ) {
+	if (( fc = parsefacorprio( fac, (SLNCODE *) facilitynames )) < 0 )
         return 0;
-    }
 
     log_type = LT_SYSLOG;
     log_name = NULL;
-    openlog( n, LOG_PID, fc );
-    xfree( n );
+	openlog( syslog_name, LOG_PID, fc );
+	xfree( ln );
 	return 1;
 }
 
@@ -193,7 +191,7 @@
     IFPerl( perl_on_log( newstr ));
 
     gettimeofday( &tv, NULL );
-    memcpy( &t, localtime( &tv.tv_sec ), sizeof(struct tm));
+	memmove( &t, localtime( &tv.tv_sec ), sizeof(struct tm));
 
 #ifdef NEED_DEBUG
 	if ( facilities_levels['G'] >= 1 )
@@ -209,9 +207,8 @@
                   t.tm_min, t.tm_sec, SS( log_tty ), (long) getpid(),
                   newstr );
 
-    if ( log_callback && dbg ) {
+	if ( log_callback && dbg )
         log_callback( timedstr );
-    }
 
 	switch( log_type ) {
 	case LT_STDERR:
@@ -259,10 +256,9 @@
     lvrun = levels;
     while(( w = strsep( &lvrun, ",;" ))) {
         c = *w++;
-        if ( *w ) {
+		if ( *w )
             facilities_levels[c] = atoi( w );
         }
-    }
 	xfree( levels );
 }
 
@@ -275,9 +271,8 @@
     str[0] = '\0';
 
 #ifndef __GNUC__
-    if ( facilities_levels[facility] < level ) {
+	if ( facilities_levels[facility] < level )
         return;
-    }
 #endif
 	snprintf( str, 16, "DBG_%c%02d: ", facility, level );
 
@@ -293,8 +288,10 @@
 
 void log_done(void)
 {
-    if ( log_type == LT_SYSLOG ) {
+	if ( log_type == LT_SYSLOG )
+	{
 		closelog();
+		xfree( syslog_name );
 	}
 	xfree( log_name );
 	xfree( log_tty );
@@ -312,38 +309,33 @@
     write_log( "Chat opened%s", side ? " by remote side" : "" );
 
     adr = &cfgal( CFG_ADDRESS )->addr;
-    if ( cfgs( CFG_RUNONCHAT ) && side ) {
+	if ( cfgs( CFG_RUNONCHAT ) && side )
         execnowait( "/bin/sh", "-c", ccs, ftnaddrtoa( adr ));
-    }
 
     if ( cfgi( CFG_CHATLOGNETMAIL )) {
         snprintf( pktname, MAX_PATH - 1, "%s/tmp/%08lx.pkt",
                   cfgs( CFG_INBOUND ), sequencer());
         cpkt = openpktmsg( adr, adr, "qico chat-log poster",
                            xstrdup( cfgs( CFG_SYSOP )), "chat log", NULL, pktname, 137 );
-        if ( !cpkt ) {
+		if ( !cpkt )
             write_log( "can't open '%s' for writing", pktname );
         }
-    }
 
     if ( cfgs( CFG_CHATTOEMAIL )) {
         snprintf( str, MAX_PATH, "/tmp/qlemail.%04lx", (long) getpid());
         lemail = fopen( str, "wt" );
-        if ( !lemail ) {
+		if ( !lemail )
             write_log( "can't create temporary email-log file" );
         }
-    }
 
-    if ( cfgs( CFG_CHATLOG )) {
+	if ( cfgs( CFG_CHATLOG ))
         chatlog = fopen( ccs, "at" );
-    }
 
-    if ( ccs && !chatlog ) {
+	if ( ccs && !chatlog )
         write_log( "can't open chat log %s", ccs );
-    }
 
     tt = time( NULL );
-    memcpy( &t, localtime( &tt ), sizeof(struct tm));
+	memmove( &t, localtime( &tt ), sizeof(struct tm));
 
 	snprintf( str, MAX_STRING, "[Chat with: %s (%u:%u/%u.%u) opened by %s at ",
 		remname, ra->z, ra->n, ra->f, ra->p, side ? "remote" : "me" );
@@ -355,14 +347,12 @@
         fclose( chatlog );
     }
 
-    if ( lemail ) {
+	if ( lemail )
         fwrite( str, strlen( str ), 1, lemail );
-    }
 
     if ( cpkt ) {
-        if ( cfgi( CFG_RECODEPKTS )) {
+		if ( cfgi( CFG_RECODEPKTS ))
             recode_to_remote( str );
-        }
 		strtr( str, '\n', '\r' );
 		fwrite( str, strlen( str ), 1, cpkt );
 		runtoss = 1;
@@ -381,20 +371,18 @@
     char	quot[2] = {0}, *tmp, *cbuf = side ? rchat : mchat, tm;
     FILE	*chatlog = NULL;
 
-    if ( side ) {
+	if ( side )
         *quot = '>';
-    } else {
+	else
         *quot = ' ';
-    }
 
     if ( text && *text ) {
         xstrcpy( cbuf + ( side ? rcpos : mcpos ), text,
                  CHATLOG_BUF - ( side ? rcpos : mcpos ) - 1 );
-        if ( side ) {
+		if ( side )
             rcpos += strlen( text );
-        } else {
+		else
             mcpos += strlen( text );
-        }
 
 		while(( side ? rcpos : mcpos ) && ( tmp = strchr( cbuf, '\n' ))) {
 			long i = 0, n = 0, m = 0;
@@ -407,9 +395,8 @@
                         n = 0;
                         m--;
                     }
-                } else {
+				} else
                     cbuf[n++] = cbuf[i++];
-                }
 
 			if ( n && cfgs( CFG_CHATLOG )) {
 				chatlog = fopen(ccs,"at");
@@ -425,34 +412,29 @@
 
             if ( n && cpkt ) {
                 for( i = 0; i < n; i++ ) {
-                    if ( cbuf[i] == '\n' ) {
+					if ( cbuf[i] == '\n' )
                         cbuf[i] = '\r';
-                    }
-                    if ( cbuf[i] == 7 ) {
+					if ( cbuf[i] == 7 )
                         cbuf[i] = '*';
                     }
-                }
 
                 tm = cbuf[i];
                 cbuf[i] = 0;
-                if ( cfgi( CFG_RECODEPKTS )) {
+				if ( cfgi( CFG_RECODEPKTS ))
                     recode_to_remote( cbuf );
-                }
                 cbuf[i] = tm;
                 fwrite( quot, 1, 1, cpkt );
                 fwrite( cbuf, 1, n, cpkt );
             }
-            if ( cbuf[n] ) {
+			if ( cbuf[n] )
                 xstrcpy( cbuf, cbuf + n, CHATLOG_BUF - 6 );
-            }
-            if ( side ) {
+			if ( side )
                 rcpos -= n + m;
-            } else {
+			else
                 mcpos -= n + m;
             }
         }
     }
-}
 
 
 void chatlog_done(void)
@@ -462,16 +444,13 @@
     time_t		tt;
     struct tm	*t;
 
-    if ( rcpos ) {
+	if ( rcpos )
         chatlog_write( "\n", 1 );
-    }
-    if ( mcpos ) {
+	if ( mcpos )
         chatlog_write( "\n", 0 );
-    }
 
-    if ( cfgs( CFG_CHATLOG )) {
+	if ( cfgs( CFG_CHATLOG ))
         chatlog = fopen( ccs, "at" );
-    }
 
 	tt = time( NULL );
 	t = localtime( &tt );
@@ -482,22 +461,19 @@
         fclose( chatlog );
     }
 
-    if ( lemail ) {
+	if ( lemail )
         fwrite( str, strlen( str ), 1, lemail );
-    }
     if ( cpkt ) {
-        if ( cfgi( CFG_RECODEPKTS )) {
+		if ( cfgi( CFG_RECODEPKTS ))
             recode_to_remote( str );
-        }
         strtr( str, '\n', '\r' );
         fwrite( str, strlen( str ) - 1, 1, cpkt );
         closeqpkt( cpkt, adr );
         snprintf( str, MAX_STRING - 1, "%s/%s", cfgs( CFG_INBOUND ), qbasename( pktname ));
-        if ( rename( pktname, str )) {
+		if ( rename( pktname, str ))
             write_log( "can't rename %s to %s: %s", pktname, str, strerror( errno ));
-        } else {
+		else
             chmod( str, cfgi( CFG_DEFPERM ));
-        }
 	}
 
 	if ( lemail ) {
diff -burw ./qico/src/ls_zglue.c ./trunk/src/ls_zglue.c
--- ./qico/src/ls_zglue.c	2024-02-01 18:09:52.567142000 +0300
+++ ./trunk/src/ls_zglue.c	2024-02-01 18:10:34.587142000 +0300
@@ -3,7 +3,7 @@
    Support CRC16, CRC32, variable header, ZedZap (big blocks) and DirZap.
    Global variables, common functions.
 
-   $Id: ls_zglue.c,v 1.3 2005/03/28 17:02:52 mitry Exp $
+   $Id: ls_zglue.c 18 2010-08-23 15:50:49Z semik $
 */
 #include "headers.h"
 #include "ls_zmodem.h"
@@ -25,9 +25,8 @@
         f.filesleft = *filesleft;
         f.bytesleft = *totalleft;
         rc = ls_zsendfile(&f,ls_SerialNum++);
-        (*totalleft)-=sendf.ftot;
-        (*filesleft)--;
-        DEBUG(('Z',2,"zmodem_sendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+		(*totalleft)-=sendf.ftot;(*filesleft)--;
+		DEBUG(('Z',1,"zmodem_sendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
 		switch(rc) {
 		case LSZ_OK:
 			txclose(&txfd,FOP_OK);
@@ -50,11 +49,10 @@
 }
 
 /* Init sending -- wrapper */
-int zmodem_sendinit(int canzap)
-{
+int zmodem_sendinit(int canzap) {
     int rc;
     int opts = LSZ_OPTCRC32|LSZ_OPTSKIPGUARD;
-    DEBUG(('Z',2,"zmodem_sendinit: %s",canzap==2?"DirZap":canzap?"ZedZap":"ZModem"));
+	DEBUG(('Z',1,"zmodem_sendinit: %s",canzap==2?"DirZap":canzap?"ZedZap":"ZModem"));
 	switch(canzap) {
 	case 2:
 		opts |= LSZ_OPTDIRZAP;
@@ -65,12 +63,10 @@
     case 0:
         break;
     default:
-        DEBUG(('Z',3,"zmodem_sendinit: strange canzap: %d",canzap));
+		DEBUG(('Z',1,"zmodem_sendinit: strange canzap: %d",canzap));
         break;
     }
-    if((rc=ls_zinitsender(opts,effbaud,cfgi(CFG_ZTXWIN),NULL))<0) {
-        return rc;
-    }
+	if((rc=ls_zinitsender(opts,effbaud,cfgi(CFG_ZTXWIN),NULL))<0) return rc;
 	write_log("zmodem link options: %d/%d, %s%s%s%s",ls_MaxBlockSize,ls_txWinSize,
 				(ls_Protocol&LSZ_OPTCRC32)?"CRC32":"CRC16",
 				(ls_rxCould&LSZ_RXCANDUPLEX)?",DUPLEX":"",
@@ -82,19 +78,18 @@
 /* Done sending */
 int zmodem_senddone()
 {
-    DEBUG(('Z',2,"zmodem_senddone"));
+	DEBUG(('Z',1,"zmodem_senddone"));
     xfree(txbuf);
     return ls_zdonesender();
 }
 
-int zmodem_receive(char *c, int canzap)
-{
+int zmodem_receive(char *c, int canzap) {
     ZFILEINFO f;
     int rc;
     int frame = ZRINIT;
     int opts = LSZ_OPTCRC32|LSZ_OPTSKIPGUARD;
 
-    DEBUG(('Z',2,"zmodem_receive"));
+	DEBUG(('Z',1,"zmodem_receive"));
 	switch(canzap & 0x00FF) {
 	case 2:
 		opts |= LSZ_OPTDIRZAP;
@@ -105,26 +100,24 @@
     case 0:
         break;
     default:
-        DEBUG(('Z',3,"zmodem_receive: strange canzap: %d",canzap));
+		DEBUG(('Z',1,"zmodem_receive: strange canzap: %d",canzap));
         break;
     }
-    if(canzap & 0x0100) {
-        opts |=	LSZ_OPTFIRSTBATCH;
-    }
+	if(canzap & 0x0100) opts |=	LSZ_OPTFIRSTBATCH;
 
     switch((rc=ls_zinitreceiver(opts,effbaud,cfgi(CFG_ZRXWIN),&f))) {
     case ZFIN:
-        DEBUG(('Z',3,"zmodem_receive: ZFIN after INIT, empty batch"));
+		DEBUG(('Z',2,"zmodem_receive: ZFIN after INIT, empty batch"));
         ls_zdonereceiver();
         return LSZ_OK;
     case ZFILE:
-        DEBUG(('Z',3,"zmodem_receive: ZFILE after INIT"));
+		DEBUG(('Z',2,"zmodem_receive: ZFILE after INIT"));
         break;
     default:
         /*
-        DEBUG(('Z',3,"zmodem_receive: something strange after init: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+		DEBUG(('Z',1,"zmodem_receive: something strange after init: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                       */
-        DEBUG(('Z',3,"zmodem_receive: something strange after init: rc=%ld",rc));
+		DEBUG(('Z',1,"zmodem_receive: something strange after init: rc=%ld",rc));
 		ls_zabort();
 		ls_zdonereceiver();
 		return LSZ_ERROR;
@@ -137,7 +130,7 @@
     while(1) {
         switch(rc) {
         case ZFIN:
-            DEBUG(('Z',3,"zmodem_receive: ZFIN"));
+			DEBUG(('Z',2,"zmodem_receive: ZFIN"));
 			ls_zdonereceiver();
 			return LSZ_OK;
 		case ZFILE:
@@ -147,34 +140,34 @@
             } else {
                 switch(rxopen(f.name,f.mtime,f.size,&rxfd)) {
                 case FOP_SKIP:
-                    DEBUG(('Z',3,"zmodem_receive: SKIP %s",f.name));
+					DEBUG(('Z',2,"zmodem_receive: SKIP %s",f.name));
                     frame = ZSKIP;
                     break;
                 case FOP_SUSPEND:
-                    DEBUG(('Z',3,"zmodem_receive: SUSPEND %s",f.name));
+					DEBUG(('Z',2,"zmodem_receive: SUSPEND %s",f.name));
                     frame = ZFERR;
                     break;
                 case FOP_CONT:
                 case FOP_OK:
-                    DEBUG(('Z',1,"zmodem_receive: OK %s from %d",f.name,recvf.soff));
+					DEBUG(('Z',2,"zmodem_receive: OK %s from %d",f.name,recvf.soff));
                     frame = ZRINIT;
                     switch((rc=ls_zrecvfile(recvf.soff))) {
                     case ZFERR:
-                        DEBUG(('Z',3,"zmodem_receive: ZFERR"));
+						DEBUG(('Z',2,"zmodem_receive: ZFERR"));
                         rxclose(&rxfd,FOP_SUSPEND);
                         frame = ZFERR;
                         break;
                     case ZSKIP:
-                        DEBUG(('Z',3,"zmodem_receive: ZSKIP"));
+						DEBUG(('Z',2,"zmodem_receive: ZSKIP"));
                         rxclose(&rxfd,FOP_SKIP);
                         frame = ZSKIP;
                         break;
                     case LSZ_OK:
-                        DEBUG(('Z',3,"zmodem_receive: OK"));
+						DEBUG(('Z',2,"zmodem_receive: OK"));
                         rxclose(&rxfd,FOP_OK);
                         break;
                     default:
-                        DEBUG(('Z',3,"zmodem_receive: OTHER %d",rc));
+						DEBUG(('Z',1,"zmodem_receive: OTHER %d",rc));
 						rxclose(&rxfd,FOP_ERROR);
 						return LSZ_ERROR;
 					}
@@ -183,15 +176,15 @@
             }
             break;
         case ZABORT:
-            DEBUG(('Z',3,"zmodem_receive: ABORT"));
+			DEBUG(('Z',1,"zmodem_receive: ABORT"));
             ls_zabort();
             ls_zdonereceiver();
             return LSZ_ERROR;
         default:
             /*
-            DEBUG(('Z',3,"zmodem_receive: something strange: %d, %s ",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"zmodem_receive: something strange: %d, %s ",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"zmodem_receive: something strange: rc=%ld",rc));
+			DEBUG(('Z',1,"zmodem_receive: something strange: rc=%ld",rc));
 			ls_zabort();
 			ls_zdonereceiver();
 			return LSZ_ERROR;
diff -burw ./qico/src/ls_zmodem.c ./trunk/src/ls_zmodem.c
--- ./qico/src/ls_zmodem.c	2024-02-01 18:09:52.567351000 +0300
+++ ./trunk/src/ls_zmodem.c	2024-02-01 18:10:34.594475000 +0300
@@ -4,7 +4,7 @@
    Global variables, common functions.
 */
 /*
- * $Id: ls_zmodem.c,v 1.6 2005/05/16 20:31:07 mitry Exp $
+ * $Id: ls_zmodem.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: ls_zmodem.c,v $
  * Revision 1.6  2005/05/16 20:31:07  mitry
@@ -110,17 +110,12 @@
                   (ls_Protocol & LSZ_OPTRLE)?"RLE":"Plain");
         return LSZ_ERROR;
     }
-    DEBUG(('Z',2,"ls_zsendbhdr: %c, %s, len: %d",type,LSZ_FRAMETYPES[frametype+LSZ_FTOFFSET],len));
+	DEBUG(('Z',1,"ls_zsendbhdr: %c, %s, len: %d",type,LSZ_FRAMETYPES[frametype+LSZ_FTOFFSET],len));
 
     /* Send *<DLE> and packet type */
-    BUFCHAR(ZPAD);
-    BUFCHAR(ZDLE);
-    BUFCHAR(type);
-    if (ls_Protocol & LSZ_OPTVHDR) {
-        ls_sendchar(len);    /* Send length of header, if needed */
-    } else {
-        len = 4;
-    }
+	BUFCHAR(ZPAD);BUFCHAR(ZDLE);BUFCHAR(type);
+	if (ls_Protocol & LSZ_OPTVHDR) ls_sendchar(len);			/* Send length of header, if needed */
+	else len = 4;
 
 	ls_sendchar(frametype);							/* Send type of frame */
 	crc = LSZ_UPDATE_CRC(frametype,crc);
@@ -134,10 +129,7 @@
     DEBUG(('Z',2,"ls_zsendbhdr: CRC%d is %08x",(ls_Protocol&LSZ_OPTCRC32)?32:16,crc));
     if (ls_Protocol & LSZ_OPTCRC32) {
         crc = LTOI(crc);
-        for (n=0; n<4; n++) {
-            ls_sendchar(crc & 0xff);
-            crc >>= 8;
-        }
+		for (n=0;n<4;n++) { ls_sendchar(crc & 0xff); crc >>= 8; }
 	} else {
 		crc = STOI(crc & 0xffff);
 		ls_sendchar(crc >> 8);
@@ -153,11 +145,9 @@
     long crc = LSZ_INIT_CRC16;
     int n;
 
-    DEBUG(('Z',2,"ls_zsendhhdr: %s, len: %d",LSZ_FRAMETYPES[frametype+LSZ_FTOFFSET],len));
+	DEBUG(('Z',1,"ls_zsendhhdr: %s, len: %d",LSZ_FRAMETYPES[frametype+LSZ_FTOFFSET],len));
     /* Send **<DLE> */
-    BUFCHAR(ZPAD);
-    BUFCHAR(ZPAD);
-    BUFCHAR(ZDLE);
+	BUFCHAR(ZPAD); BUFCHAR(ZPAD); BUFCHAR(ZDLE);
 	/* Send header type */
 	if (ls_Protocol & LSZ_OPTVHDR) {
 		BUFCHAR(ZVHEX);
@@ -182,9 +172,7 @@
     ls_sendhex(crc & 0xff);
     BUFCHAR(CR);
     BUFCHAR(LF|(char)0x80);
-    if(frametype != ZACK && frametype != ZFIN) {
-        BUFCHAR(XON);
-    }
+	if(frametype != ZACK && frametype != ZFIN) BUFCHAR(XON);
 	/* Clean buffer, do real send */
 	return BUFFLUSH(ls_HeaderTimeout);
 }
@@ -207,8 +195,7 @@
         rhBYTE,
         rhCRC,
         rhCR,
-        rhLF,
-        rhXON
+		rhLF
 	} state = rhInit;
 	static enum rhREADMODE {
 		rm8BIT,
@@ -228,10 +215,10 @@
     int c = -1;
     int rc;
 
-    DEBUG(('Z',2,"ls_zrecvhdr: timeout %d",timeout));
+	DEBUG(('Z',1,"ls_zrecvhdr: timeout %d",timeout));
 
     if(rhInit == state) {
-        DEBUG(('Z',3,"ls_zrecvhdr: init state"));
+		DEBUG(('Z',2,"ls_zrecvhdr: init state"));
 		frametype = LSZ_ERROR;
 		crc = 0;
 		crcl = 2;
@@ -245,78 +232,37 @@
 
     while((rc = HASDATAT( &timeout ))) {
         switch(readmode) {
-        case rm8BIT:
-            c = ls_readcanned(&timeout);
-            break;
-        case rm7BIT:
-            c = ls_read7bit(&timeout);
-            break;
-        case rmZDLE:
-            c = ls_readzdle(&timeout);
-            break;
-        case rmHEX:
-            c = ls_readhex(&timeout);
-            break;
+		case rm8BIT: c = ls_readcanned(&timeout); break;
+		case rm7BIT: c = ls_read7bit(&timeout);   break;
+		case rmZDLE: c = ls_readzdle(&timeout);   break;
+		case rmHEX:  c = ls_readhex(&timeout);    break;
         }
-        if(c < 0) {
-            return c;    /* Here is error */
-        }
+		if(c < 0) return c;								/* Here is error */
         c &= 0xff;										/* Strip high bits */
 
         switch(state) {
         case rhInit:
-            if(ZPAD == c) {
-                state = rhZPAD;
-            } else {
-                ls_Garbage++;
-            }
+			if(ZPAD == c) { state = rhZPAD; }
+			else { ls_Garbage++; }
             break;
         case rhZPAD:
-            DEBUG(('Z',3,"ls_zrecvhdr: rhZPAD, garbage counter: %d",ls_Garbage));
+			DEBUG(('Z',2,"ls_zrecvhdr: rhZPAD, garbage counter: %d",ls_Garbage));
             switch(c) {
-            case ZPAD:
-                break;
-            case ZDLE:
-                state = rhZDLE;
-                break;
-            default:
-                ls_Garbage++;
-                state = rhInit;
-                break;
+			case ZPAD: break;
+			case ZDLE: state = rhZDLE; break;
+			default: ls_Garbage++; state = rhInit; break;
             }
             break;
         case rhZDLE:
-            DEBUG(('Z',3,"ls_zrecvhdr: rhZDLE, got: %02x (%c)",(unsigned char)c,(unsigned char)c));
+			DEBUG(('Z',2,"ls_zrecvhdr: rhZDLE, got: %02x (%c)",(unsigned char)c,(unsigned char)c));
             switch(c) {
-            case ZBIN:
-                state = rhZBIN;
-                readmode = rmZDLE;
-                break;
-            case ZHEX:
-                state = rhZHEX;
-                readmode = rmHEX;
-                break;
-            case ZBIN32:
-                state = rhZBIN32;
-                readmode = rmZDLE;
-                break;
-            case ZVBIN:
-                state = rhZVBIN;
-                readmode = rmZDLE;
-                break;
-            case ZVHEX:
-                state = rhZVHEX;
-                readmode = rmHEX;
-                break;
-            case ZVBIN32:
-                state = rhZVBIN32;
-                readmode = rmZDLE;
-                break;
-            default:
-                ls_Garbage++;
-                state = rhInit;
-                readmode = rm7BIT;
-                break;
+			case ZBIN: state = rhZBIN; readmode = rmZDLE; break;
+			case ZHEX: state = rhZHEX; readmode = rmHEX; break;
+			case ZBIN32: state = rhZBIN32; readmode = rmZDLE; break;
+			case ZVBIN: state = rhZVBIN; readmode = rmZDLE; break;
+			case ZVHEX: state = rhZVHEX; readmode = rmHEX; break;
+			case ZVBIN32: state = rhZVBIN32; readmode = rmZDLE; break;
+			default: ls_Garbage++; state = rhInit; readmode = rm7BIT; break;
 			}
 			break;
 		case rhZVBIN32:
@@ -325,11 +271,11 @@
         case rhZVBIN:
         case rhZVHEX:
             if(c > LSZ_MAXHLEN) {
-                DEBUG(('Z',3,"ls_zrecvhdr: Header TOO long: %d bytes (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
+				DEBUG(('Z',1,"ls_zrecvhdr: Header TOO long: %d bytes (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
                 state = rhInit;
                 return LSZ_BADCRC;
             }
-            DEBUG(('Z',3,"ls_zrecvhdr: Any rhZV: %d bytes (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
+			DEBUG(('Z',2,"ls_zrecvhdr: Any rhZV: %d bytes (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
 			len = c;
 			state = rhFrameType;
 			break;
@@ -339,108 +285,74 @@
         case rhZBIN:
         case rhZHEX:
             if(c < 0 || c > LSZ_MAXFRAME) {
-                DEBUG(('Z',3,"ls_zrecvhdr: Unknown frame type: %d (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
+				DEBUG(('Z',1,"ls_zrecvhdr: Unknown frame type: %d (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
                 state = rhInit;
                 return LSZ_BADCRC;
             }
-            DEBUG(('Z',3,"ls_zrecvhdr: Any rhZ frametype: %d, %s (state: %d, CRC%d)",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET],(int)state,(2==crcl?16:32)));
+			DEBUG(('Z',1,"ls_zrecvhdr: Any rhZ frametype: %d, %s (state: %d, CRC%d)",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET],(int)state,(2==crcl?16:32)));
             len = 4;
             frametype = c;
-            if(2 == crcl) {
-                incrc = LSZ_UPDATE_CRC16((unsigned char)c,LSZ_INIT_CRC16);
-            } else {
-                incrc = LSZ_UPDATE_CRC32((unsigned char)c,LSZ_INIT_CRC32);
-            }
+			if(2 == crcl) { incrc = LSZ_UPDATE_CRC16((unsigned char)c,LSZ_INIT_CRC16); }
+			else { incrc = LSZ_UPDATE_CRC32((unsigned char)c,LSZ_INIT_CRC32); }
             state = rhBYTE;
             break;
         case rhFrameType:
             if(c < 0 || c > LSZ_MAXFRAME) {
-                DEBUG(('Z',3,"ls_zrecvhdr: Unknown frame type: %d (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
+				DEBUG(('Z',1,"ls_zrecvhdr: Unknown frame type: %d (state: %d, CRC%d)",c,(int)state,(2==crcl?16:32)));
                 state = rhInit;
                 return LSZ_BADCRC;
             }
-            DEBUG(('Z',3,"ls_zrecvhdr: frametype %d, %s",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zrecvhdr: frametype %d, %s",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET]));
             frametype = c;
-            if(2 == crcl) {
-                incrc = LSZ_UPDATE_CRC16((unsigned char)c,LSZ_INIT_CRC16);
-            } else {
-                incrc = LSZ_UPDATE_CRC32((unsigned char)c,LSZ_INIT_CRC32);
-            }
+			if(2 == crcl) { incrc = LSZ_UPDATE_CRC16((unsigned char)c,LSZ_INIT_CRC16); }
+			else { incrc = LSZ_UPDATE_CRC32((unsigned char)c,LSZ_INIT_CRC32); }
             state = rhBYTE;
             break;
         case rhBYTE:
-            DEBUG(('Z',3,"ls_zrecvhdr: rhBYTE: %02x (%d)",c,got));
+			DEBUG(('Z',2,"ls_zrecvhdr: rhBYTE: %02x",c));
             hdr[got] = c;
-            if(++got == len) {
-                state = rhCRC;
-            }
-            if(2 == crcl) {
-                incrc = LSZ_UPDATE_CRC16((unsigned char)c,incrc);
-            } else {
-                incrc = LSZ_UPDATE_CRC32((unsigned char)c,incrc);
-            }
+			if(++got == len) state = rhCRC;
+			if(2 == crcl) { incrc = LSZ_UPDATE_CRC16((unsigned char)c,incrc); }
+			else { incrc = LSZ_UPDATE_CRC32((unsigned char)c,incrc); }
             break;
         case rhCRC:
-            DEBUG(('Z',3,"ls_zrecvhdr: rhCRC"));
-            if(2 == crcl) {
-                crc <<= 8;
-                crc |= (unsigned char)c;
-            } else {
-                crc |= (unsigned long)c << (8*crcgot);
-            }
+			DEBUG(('Z',2,"ls_zrecvhdr: rhCRC"));
+			if(2 == crcl) { crc <<= 8; crc |= (unsigned char)c; }
+			else { crc |= (unsigned long)c << (8*crcgot); }
             if(++crcgot == crcl) {  /* Crc finished */
                 state = rhInit;
                 ls_Garbage = 0;
                 if(2 == crcl) {
 #ifdef NEED_DEBUG
-                    if(ls_Protocol&LSZ_OPTCRC32 && rmHEX!=readmode) {
-                        DEBUG(('Z',4,"ls_zrecvhdr: was CRC32, got CRC16 binary header"));
-                    }
+					if(ls_Protocol&LSZ_OPTCRC32 && rmHEX!=readmode) DEBUG(('Z',1,"ls_zrecvhdr: was CRC32, got CRC16 binary header"));
 #endif
-                    incrc = LSZ_FINISH_CRC16(incrc);
-                    crc = STOH(crc & 0xffff);
-                    if(rmHEX!=readmode) {
-                        ls_Protocol &= (~LSZ_OPTCRC32);
-                    }
+					incrc = LSZ_FINISH_CRC16(incrc); crc = STOH(crc & 0xffff);
+					if(rmHEX!=readmode) ls_Protocol &= (~LSZ_OPTCRC32);
                 } else {
 #ifdef NEED_DEBUG
-                    if(!(ls_Protocol&LSZ_OPTCRC32)) {
-                        DEBUG(('Z',4,"ls_zrecvhdr: was CRC16, got CRC32 binary header"));
-                    }
+					if(!(ls_Protocol&LSZ_OPTCRC32)) DEBUG(('Z',1,"ls_zrecvhdr: was CRC16, got CRC32 binary header"));
 #endif
-                    incrc = LSZ_FINISH_CRC32(incrc);
-                    crc = LTOH(crc);
+					incrc = LSZ_FINISH_CRC32(incrc); crc = LTOH(crc);
                     ls_Protocol |= LSZ_OPTCRC32;
                 }
-                DEBUG(('Z',4,"ls_zrecvhdr: CRC%d got %08x, calculated %08x",(2==crcl)?16:32,incrc,crc));
-                if (incrc != crc) {
-                    return LSZ_BADCRC;
-                }
+				DEBUG(('Z',2,"ls_zrecvhdr: CRC%d got %08x, claculated %08x",(2==crcl)?16:32,incrc,crc));
+				if (incrc != crc) return LSZ_BADCRC;
                 *hlen = got;
                 /* We need to read <CR><LF> after HEX header */
-                if(rmHEX == readmode) {
-                    state = rhCR;
-                    readmode = rm8BIT;
-                } else {
-                    return frametype;
+				if(rmHEX == readmode) { state = rhCR; readmode = rm8BIT; }
+				else { return frametype; }
                 }
-            }
             break;
         case rhCR:
             state = rhInit;
-            DEBUG(('Z',3,"ls_zrecvhdr: rhCR"));
+			DEBUG(('Z',2,"ls_zrecvhdr: rhCR"));
             switch(c) {
             case CR:
             case CR|0x80:		/* we need LF after <CR> */
-                DEBUG(('Z',4,"ls_zrecvhdr: rhCR, ignoring any remaining chars."));
-                return frametype;	/* At this point, most implementations ignore checking for the remaining chars */
+				state = rhLF;
+				break;
             case LF:
             case LF|0x80:		/* Ok, UNIX-like EOL */
-                state = rhXON;
-                break;
-            case XON:
-            case XON|0x80:
-                DEBUG(('Z',4,"ls_zrecvhdr: rhCR, got XON without CR/LF?"));
 				return frametype;
 			default:
 				return LSZ_BADCRC;
@@ -448,31 +360,12 @@
             break;
         case rhLF:
             state = rhInit;
-            DEBUG(('Z',3,"ls_zrecvhdr: rhLF"));
+			DEBUG(('Z',2,"ls_zrecvhdr: rhLF"));
             switch(c) {
             case LF:
             case LF|0x80:
-                state = rhXON;
-                break;
-            default:
-                return LSZ_BADCRC;
-            }
-            break;
-        case rhXON:
-            state = rhInit;
-            DEBUG(('Z',3,"ls_zrecvhdr: rhXON"));
-            switch(c) {
-            case ZPAD:
-            case ZPAD|0x80:
-                state = rhZPAD;
-                got = 0;
-                crcgot = 0;
-                break;
-            case XON:
-            case XON|0x80:
                 return frametype;
             default:
-                DEBUG(('Z',4,"ls_zrecvdata: rhXON unexpcted %x (%c)",c,(char)c));
 				return LSZ_BADCRC;
 			}
 			break;
@@ -481,9 +374,9 @@
         }
     }
     /*
-    DEBUG(('Z',2,"ls_zrecvhdr: timeout or something other: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zrecvhdr: timeout or something other: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zrecvhdr: timeout or something other: rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zrecvhdr: timeout or something other: rc=%ld",rc));
 	return rc;
 }
 
@@ -492,7 +385,7 @@
 {
     long crc;
 
-    DEBUG(('Z',2,"ls_zsenddata: %d bytes, %c frameend",len,(char)frame));
+	DEBUG(('Z',1,"ls_zsenddata: %d bytes, %c frameend",len,(char)frame));
 
 	if (ls_Protocol & LSZ_OPTCRC32) {
 		crc = LSZ_INIT_CRC32;
@@ -500,42 +393,32 @@
             ls_sendchar(*data);
             crc = LSZ_UPDATE_CRC32((unsigned char)(*data),crc);
         }
-        BUFCHAR(ZDLE);
-        BUFCHAR(frame);
+		BUFCHAR(ZDLE); BUFCHAR(frame);
         crc = LSZ_UPDATE_CRC32(frame,crc);
         /*chat*/
         if(rnode->opt&MO_CHAT) {
-            if(frame==ZCRCG||frame==ZCRCW) {
-                z_devsend_c(1);
-            }
+			if(frame==ZCRCG||frame==ZCRCW)z_devsend_c(1);
             BUFCHAR(0);
         }
 
         crc = LSZ_FINISH_CRC32(crc);
         crc = LTOI(crc);
         DEBUG(('Z',2,"ls_zsenddata: CRC32 is %08x",crc));
-        ls_sendchar(crc&0xff);
-        crc >>= 8;
-        ls_sendchar(crc&0xff);
-        crc >>= 8;
-        ls_sendchar(crc&0xff);
-        crc >>= 8;
-        ls_sendchar(crc&0xff);
-        crc >>= 8;
+		ls_sendchar(crc&0xff); crc >>= 8;
+		ls_sendchar(crc&0xff); crc >>= 8;
+		ls_sendchar(crc&0xff); crc >>= 8;
+		ls_sendchar(crc&0xff); crc >>= 8;
     } else {
         crc = LSZ_INIT_CRC16;
         for(; len--; data++) {
             ls_sendchar(*data);
             crc = LSZ_UPDATE_CRC16((unsigned char)(*data),crc);
         }
-        BUFCHAR(ZDLE);
-        BUFCHAR(frame);
+		BUFCHAR(ZDLE); BUFCHAR(frame);
         crc = LSZ_UPDATE_CRC16(frame,crc);
         /*chat*/
         if(rnode->opt&MO_CHAT) {
-            if(frame==ZCRCG||frame==ZCRCW) {
-                z_devsend_c(1);
-            }
+			if(frame==ZCRCG||frame==ZCRCW)z_devsend_c(1);
 			BUFCHAR(0);
 		}
 
@@ -546,9 +429,7 @@
         ls_sendchar(crc & 0xff);
     }
 
-    if(!(ls_Protocol & LSZ_OPTDIRZAP) && ZCRCW == frame) {
-        BUFCHAR(XON);
-    }
+	if(!(ls_Protocol & LSZ_OPTDIRZAP) && ZCRCW == frame) BUFCHAR(XON);
 	return BUFFLUSH(ls_DataTimeout);
 }
 
@@ -562,13 +443,13 @@
     int frametype = LSZ_ERROR;		/* Type of frame - ZCRC(G|W|Q|E) */
     int rcvdata = 1;			/* Data is being received NOW (not CRC) */
 
-    DEBUG(('Z',2,"ls_zrecvdata16: timeout %d",timeout));
+	DEBUG(('Z',1,"ls_zrecvdata16: timeout %d",timeout));
 
     while(rcvdata && ((c = ls_readzdle(&timeout)) >= 0)) {
         if(c < 256) {
             *data++ = c & 0xff;
             if(++got > ls_MaxBlockSize) {
-                DEBUG(('Z',3,"ls_zrecvdata16: Block is too big (%d/%d, %02x and %02x)",got,ls_MaxBlockSize,*(data-1),c));
+				DEBUG(('Z',1,"ls_zrecvdata16: Block is too big (%d/%d, %02x and %02x)",got,ls_MaxBlockSize,*(data-1),c));
 				return LSZ_BADCRC;
 			}
 			incrc = LSZ_UPDATE_CRC16((unsigned char)c,incrc);
@@ -580,11 +461,11 @@
             case LSZ_CRCW:
                 rcvdata = 0;
                 frametype = c & 0xff;
-                DEBUG(('Z',3,"ls_zrecvdata16: frameend %c",(char)frametype));
+				DEBUG(('Z',2,"ls_zrecvdata16: frameend %c",(char)frametype));
                 incrc = LSZ_UPDATE_CRC16((unsigned char)c,incrc);
                 break;
             default:
-                DEBUG(('Z',3,"ls_zrecvdata16: bad frameend %d",c));
+				DEBUG(('Z',1,"ls_zrecvdata16: bad frameend %d",c));
 				return LSZ_BADCRC;
 			}
 		}
@@ -592,31 +473,24 @@
     /* We finish loop by error in ls_readzdle() */
     if(rcvdata) {
         /*
-        DEBUG(('Z',2,"ls_zrecvdata16: timeout or something else: %d, %s",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET]));
+		DEBUG(('Z',1,"ls_zrecvdata16: timeout or something else: %d, %s",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET]));
                       */
-        DEBUG(('Z',2,"ls_zrecvdata16: timeout or something else: c=%ld",c));
+		DEBUG(('Z',1,"ls_zrecvdata16: timeout or something else: c=%ld",c));
         return c;
     }
 
     /* Loops ar unrolled */
-    if((c = ls_readzdle(&timeout)) < 0) {
-        return c;
-    }
+	if((c = ls_readzdle(&timeout)) < 0) return c;
     crc = (unsigned char)c;
-    if((c = ls_readzdle(&timeout)) < 0) {
-        return c;
-    }
-    crc <<= 8;
-    crc |= (unsigned char)c;
+	if((c = ls_readzdle(&timeout)) < 0) return c;
+	crc <<= 8; crc |= (unsigned char)c;
     crc = STOH(crc);
     incrc = LSZ_FINISH_CRC16(incrc);
-    DEBUG(('Z',2,"ls_zrecvdata16: CRC16 got %04x, calculated %04x",incrc,crc));
+	DEBUG(('Z',2,"ls_zrecvdata16: CRC16 got %04x, claculated %04x",incrc,crc));
 
-    if (incrc != crc) {
-        return LSZ_BADCRC;
-    }
+	if (incrc != crc) return LSZ_BADCRC;
     *len = got;
-    DEBUG(('Z',2,"ls_zrecvdata16: OK"));
+	DEBUG(('Z',1,"ls_zrecvdata16: OK"));
 	return frametype;
 }
 
@@ -630,13 +504,13 @@
     int frametype = LSZ_ERROR;		/* Type of frame - ZCRC(G|W|Q|E) */
     int rcvdata = 1;				/* Data is being received NOW (not CRC) */
 
-    DEBUG(('Z',2,"ls_zrecvdata32: timeout %d",timeout));
+	DEBUG(('Z',1,"ls_zrecvdata32: timeout %d",timeout));
 
     while(rcvdata && ((c = ls_readzdle(&timeout)) >= 0)) {
         if(c < 256) {
             *data++ = c & 0xff;
             if(++got > ls_MaxBlockSize) {
-                DEBUG(('Z',3,"ls_zrecvdata32: Block is too big (%d/%d, %02x and %02x)",got,ls_MaxBlockSize,*(data-1),c));
+				DEBUG(('Z',1,"ls_zrecvdata32: Block is too big (%d/%d, %02x and %02x)",got,ls_MaxBlockSize,*(data-1),c));
 				return LSZ_BADCRC;
 			}
 			incrc = LSZ_UPDATE_CRC32((unsigned char)c,incrc);
@@ -648,11 +522,11 @@
             case LSZ_CRCW:
                 rcvdata = 0;
                 frametype = c & 0xff;
-                DEBUG(('Z',3,"ls_zrecvdata32: frameend %c",(char)frametype));
+				DEBUG(('Z',2,"ls_zrecvdata32: frameend %c",(char)frametype));
                 incrc = LSZ_UPDATE_CRC32((unsigned char)c,incrc);
                 break;
             default:
-                DEBUG(('Z',3,"ls_zrecvdata32: bad frameend %d",c));
+				DEBUG(('Z',1,"ls_zrecvdata32: bad frameend %d",c));
 				return LSZ_BADCRC;
 			}
 		}
@@ -660,36 +534,26 @@
     /* We finish loop by error in ls_readzdle() */
     if(rcvdata) {
         /*
-        DEBUG(('Z',2,"ls_zrecvdata32: timeout or something else: %d, %s",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET]));
+		DEBUG(('Z',1,"ls_zrecvdata32: timeout or something else: %d, %s",c,LSZ_FRAMETYPES[c+LSZ_FTOFFSET]));
                       */
-        DEBUG(('Z',2,"ls_zrecvdata32: timeout or something else: c=%ld",c));
+		DEBUG(('Z',1,"ls_zrecvdata32: timeout or something else: c=%ld",c));
         return c;
     }
 
     /* Loops ar unrolled */
-    if((c = ls_readzdle(&timeout)) < 0) {
-        return c;
-    }
+	if((c = ls_readzdle(&timeout)) < 0) return c;
     crc |= (unsigned long)c << 0x00;
-    if((c = ls_readzdle(&timeout)) < 0) {
-        return c;
-    }
+	if((c = ls_readzdle(&timeout)) < 0) return c;
     crc |= (unsigned long)c << 0x08;
-    if((c = ls_readzdle(&timeout)) < 0) {
-        return c;
-    }
+	if((c = ls_readzdle(&timeout)) < 0) return c;
     crc |= (unsigned long)c << 0x10;
-    if((c = ls_readzdle(&timeout)) < 0) {
-        return c;
-    }
+	if((c = ls_readzdle(&timeout)) < 0) return c;
     crc |= (unsigned long)c << 0x18;
     crc = LTOH(crc);
     incrc = LSZ_FINISH_CRC32(incrc);
-    DEBUG(('Z',2,"ls_zrecvdata32: CRC32 got %08x, calculated %08x",incrc,crc));
+	DEBUG(('Z',2,"ls_zrecvdata32: CRC32 got %08x, claculated %08x",incrc,crc));
 
-    if (incrc != crc) {
-        return LSZ_BADCRC;
-    }
+	if (incrc != crc) return LSZ_BADCRC;
 	*len = got;
 	DEBUG(('Z',2,"ls_zrecvdata32: OK"));
 	return frametype;
@@ -707,12 +571,9 @@
             esc = 1;
         } else {
             switch (c) {
-            case XON:
-            case XON | 0x80:
-            case XOFF:
-            case XOFF | 0x80:
-            case DLE:
-            case DLE | 0x80:
+			case XON: case XON | 0x80:
+			case XOFF: case XOFF | 0x80:
+			case DLE: case DLE | 0x80:
 			case ZDLE:
 				esc = 1;
 				break;
@@ -743,28 +604,18 @@
     int c;
 
     do {
-        if((c = GETCHART(timeout)) < 0) {
-            return c;
-        }
+		if((c = GETCHART(timeout)) < 0) return c;
     } while((0 == (ls_Protocol & LSZ_OPTDIRZAP)) && (XON == c || XOFF == c));
 
-    if (CAN == c) {
-        if (++ls_CANCount == 5) {
-            return LSZ_CAN;
-        }
-    } else {
-        ls_CANCount = 0;
-    }
+	if (CAN == c) { if (++ls_CANCount == 5) return LSZ_CAN; }
+	else { ls_CANCount = 0; }
     return c & 0x7f;
 }
 
 /* Read one hex character */
-int ls_readhexnibble(int *timeout)
-{
+int ls_readhexnibble(int *timeout) {
     int c;
-    if((c = ls_readcanned(timeout)) < 0) {
-        return c;
-    }
+	if((c = ls_readcanned(timeout)) < 0) return c;
 	if(c >= '0' && c <= '9') {
 		return c - '0';
 	} else if(c >= 'a' && c <= 'f') {
@@ -781,9 +632,7 @@
     int c2;
 
     if(!ls_GotHexNibble) {
-        if((c = ls_readhexnibble(timeout)) < 0) {
-            return c;
-        }
+		if((c = ls_readhexnibble(timeout)) < 0) return c;
 		c <<= 4;
 	}
 	if((c2 = ls_readhexnibble(timeout)) >= 0) {
@@ -802,24 +651,18 @@
 
     if(!ls_GotZDLE) { /* There was no ZDLE in stream, try to read one */
         do {
-            if((c = ls_readcanned(timeout)) < 0) {
-                return c;
-            }
+			if((c = ls_readcanned(timeout)) < 0) return c;
 
             if(!(ls_Protocol & LSZ_OPTDIRZAP)) { /* Check for unescaped XON/XOFF */
                 switch(c) {
-                case XON:
-                case XON | 0x80:
-                case XOFF:
-                case XOFF | 0x80:
+				case XON: case XON | 0x80:
+				case XOFF: case XOFF | 0x80:
                     c = LSZ_XONXOFF;
                 }
             }
             if (ZDLE == c) {
                 ls_GotZDLE = 1;
-            } else if(LSZ_XONXOFF != c) {
-                return c & 0xff;
-            }
+			} else if(LSZ_XONXOFF != c) { return c & 0xff; }
 		} while(LSZ_XONXOFF == c);
 	}
 	/* We will be here only in case of DLE */
@@ -848,9 +691,7 @@
             z_devsend_c(0);
         }
 
-        if(r) {
-            return r;
-        }
+	if(r)return r;
 	switch(c) {
 		case ZRUB0:
 			return ZDEL;
@@ -858,7 +699,7 @@
             return ZDEL | 0x80;
         default:
             if((c&0x60) != 0x40) {
-                DEBUG(('Z',3,"ls_readzdle: bad ZDLed character %02x (%02x)",c,(c ^ 0x40) & 0xff));
+				DEBUG(('Z',1,"ls_readzdle: bad ZDLed character %02x (%02x)",c,(c ^ 0x40) & 0xff));
 				return LSZ_BADCRC;
 			}
 			return (c ^ 0x40) & 0xff;
@@ -871,16 +712,9 @@
 int ls_readcanned(int *timeout)
 {
     int c;
-    if ((c = GETCHART(timeout)) < 0) {
-        return c;
-    }
-    if (CAN == c) {
-        if (++ls_CANCount == 5) {
-            return LSZ_CAN;
-        }
-    } else {
-        ls_CANCount = 0;
-    }
+	if ((c = GETCHART(timeout)) < 0) return c;
+	if (CAN == c) { if (++ls_CANCount == 5) return LSZ_CAN; }
+	else { ls_CANCount = 0; }
 	return c & 0xff;
 }
 
@@ -898,12 +732,9 @@
 long ls_fetchlong(unsigned char *buf)
 {
     long l = buf[LSZ_P3];
-    l<<=8;
-    l|= buf[LSZ_P2];
-    l<<=8;
-    l|= buf[LSZ_P1];
-    l<<=8;
-    l|= buf[LSZ_P0];
+	l<<=8; l|= buf[LSZ_P2];
+	l<<=8; l|= buf[LSZ_P1];
+	l<<=8; l|= buf[LSZ_P0];
 	return LTOH(l);
 }
 
@@ -913,27 +744,20 @@
     int i;
     BUFFLUSH(ls_DataTimeout);
     BUFCHAR(XON);
-    for(i = 0; i < 8; i++) {
-        BUFCHAR(CAN);
-    }
+	for(i = 0; i < 8; i++) BUFCHAR(CAN);
     BUFFLUSH(ls_DataTimeout);
 }
 
 /* chat routines */
 int z_devfree(void)
 {
-    if(chattxstate||!(rnode->opt&MO_CHAT)) {
-        return 0;
-    } else {
-        return 1;
+	if(chattxstate||!(rnode->opt&MO_CHAT))return 0;
+	    else return 1;
     }
-}
 
 int z_devsend(unsigned char *data,unsigned short len)
 {
-    if(!data||!len||!z_devfree()) {
-        return 0;
-    }
+	if(!data||!len||!z_devfree())return 0;
 	chattxbuf=data;
 	chattxbuf[(len>16383)?16383:len]=0;
 	chattxstate=CHAT_DATA;
@@ -946,11 +770,8 @@
     if(chattxstate==CHAT_DATA) {
         p=chattxbuf;
         strtr((char*)p,ZPAD,(unsigned char)248);
-        while(*p++)if(buffr) {
-                BUFCHAR(*p);
-            } else {
-                ls_sendchar(*p);
-            }
+		while(*p++)if(buffr)BUFCHAR(*p);
+		    else ls_sendchar(*p);
 		chattxstate=CHAT_DONE;
 	}
 }
@@ -964,8 +785,7 @@
             goto flush;
         }
     } else {
-flush:
-        if(*inchatbuf) {
+flush:		if(*inchatbuf) {
 			strtr((char*)inchatbuf,(unsigned char)248,ZPAD);
 			c_devrecv(inchatbuf,inchatfill);
 		}
diff -burw ./qico/src/ls_zmodem.h ./trunk/src/ls_zmodem.h
--- ./qico/src/ls_zmodem.h	2024-02-01 18:09:52.567492000 +0300
+++ ./trunk/src/ls_zmodem.h	2024-02-01 18:10:34.599475000 +0300
@@ -4,7 +4,7 @@
    Global variables, common functions.
 */
 /*
- * $Id: ls_zmodem.h,v 1.3 2005/03/31 19:40:38 mitry Exp $
+ * $Id: ls_zmodem.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: ls_zmodem.h,v $
  * Revision 1.3  2005/03/31 19:40:38  mitry
diff -burw ./qico/src/ls_zreceive.c ./trunk/src/ls_zreceive.c
--- ./qico/src/ls_zreceive.c	2024-02-01 18:09:52.567615000 +0300
+++ ./trunk/src/ls_zreceive.c	2024-02-01 18:10:34.584130000 +0300
@@ -4,7 +4,7 @@
    Receiver logic.
 */
 /*
- * $Id: ls_zreceive.c,v 1.4 2005/03/31 19:40:38 mitry Exp $
+ * $Id: ls_zreceive.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: ls_zreceive.c,v $
  * Revision 1.4  2005/03/31 19:40:38  mitry
@@ -23,7 +23,7 @@
 int ls_zinitreceiver(int protocol, int baud, int window, ZFILEINFO *f)
 {
 
-    DEBUG(('Z',2,"ls_zinitreceiver: %08x, %d baud, %d bytes",protocol,baud,window));
+	DEBUG(('Z',1,"ls_zinitreceiver: %08x, %d baud, %d bytes",protocol,baud,window));
 
 	/* Set all options to requested state -- this may be alerted by other side in ZSINIT */
 	ls_Protocol = protocol;
@@ -44,9 +44,8 @@
     ls_SkipGuard = (ls_Protocol&LSZ_OPTSKIPGUARD)?1:0;
 
     rxbuf = xmalloc((ls_MaxBlockSize+16));
-    if ( rxbuf == NULL ) {
+	if ( rxbuf == NULL )
         return LSZ_ERROR;
-    }
 
 	return ls_zrecvfinfo(f,ZRINIT,(protocol&LSZ_OPTFIRSTBATCH)?1:0);
 }
@@ -57,25 +56,23 @@
     int trys = 0;
     int rc;
 
-    DEBUG(('Z',2,"ls_zrecvcrcw"));
+	DEBUG(('Z',1,"ls_zrecvcrcw"));
     do {
         switch((rc=ls_zrecvdata(buf,len,ls_DataTimeout,ls_Protocol&LSZ_OPTCRC32))) {
         case ZCRCW:	/* Ok, here it is */
-            DEBUG(('Z',3,"ls_zrecvcrcw: got frame ZCRCW"));
+			DEBUG(('Z',2,"ls_zrecvcrcw: got frame ZCRCW"));
             return LSZ_OK;
         case LSZ_BADCRC:
-            DEBUG(('Z',3,"ls_zrecvcrcw: BADCRC"));
+			DEBUG(('Z',2,"ls_zrecvcrcw: BADCRC"));
             ls_storelong(ls_txHdr,0L);
             ls_zsendhhdr(ZNAK,4,ls_txHdr);
             return 1;
         case LSZ_TIMEOUT:
-            DEBUG(('Z',3,"ls_zrecvcrcw: TIMEOUT"));
+			DEBUG(('Z',2,"ls_zrecvcrcw: TIMEOUT"));
             break;
         default:
-            DEBUG(('Z',3,"ls_zrecvcrcw:: strange data frame %d",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zrecvcrcw:: strange data frame %d",rc));
+			if(rc<0) return rc;
 			ls_storelong(ls_txHdr,0L);
 			ls_zsendhhdr(ZNAK,4,ls_txHdr);
 			return 1;
@@ -97,19 +94,13 @@
     char flags;
     int win;
 
-    DEBUG(('Z',2,"ls_zrecvfinfo: frame %d, %s, first: %d",frame,LSZ_FRAMETYPES[frame+LSZ_FTOFFSET],first));
+	DEBUG(('Z',1,"ls_zrecvfinfo: frame %d, %s, first: %d",frame,LSZ_FRAMETYPES[frame+LSZ_FTOFFSET],first));
     /* Send temporary variables */
     win = STOI(ls_txWinSize);
     flags = LSZ_RXCANDUPLEX | LSZ_RXCANOVIO;
-    if(ls_Protocol&LSZ_OPTCRC32) {
-        flags |= LSZ_RXCANFC32;
-    }
-    if(ls_Protocol&LSZ_OPTESCAPEALL) {
-        flags |= LSZ_RXWNTESCCTL;
-    }
-    if(ls_Protocol&LSZ_OPTESC8) {
-        flags |= LSZ_RXWNTESC8;
-    }
+	if(ls_Protocol&LSZ_OPTCRC32) flags |= LSZ_RXCANFC32;
+	if(ls_Protocol&LSZ_OPTESCAPEALL) flags |= LSZ_RXWNTESCCTL;
+	if(ls_Protocol&LSZ_OPTESC8) flags |= LSZ_RXWNTESC8;
 
 	f->name[0] = '\x00';
 	f->mtime = f->size = f->filesleft = f->bytesleft = 0;
@@ -117,20 +108,16 @@
     do {
         if(retransmit) {
             if(ZRINIT != frame) {
-                DEBUG(('Z',3,"ls_zrecvfinfo: send %d, %s",frame,LSZ_FRAMETYPES[frame+LSZ_FTOFFSET]));
+				DEBUG(('Z',2,"ls_zrecvfinfo: send %d, %s",frame,LSZ_FRAMETYPES[frame+LSZ_FTOFFSET]));
                 ls_storelong(ls_txHdr,ls_SerialNum);
-                if((rc=ls_zsendhhdr(frame,4,ls_txHdr))<0) {
-                    return rc;
+				if((rc=ls_zsendhhdr(frame,4,ls_txHdr))<0) return rc;
                 }
-            }
-            DEBUG(('Z',3,"ls_zrecvfinfo: send %d, ZRINIT",ZRINIT));
+			DEBUG(('Z',2,"ls_zrecvfinfo: send %d, ZRINIT",ZRINIT));
             ls_txHdr[LSZ_F0] = flags;
             ls_txHdr[LSZ_F1] = (ls_Protocol&LSZ_OPTVHDR)?(char)LSZ_RXCANVHDR:0;
             ls_txHdr[LSZ_P1] = (unsigned char)((win>>8) & 0xff);
             ls_txHdr[LSZ_P0] = (unsigned char)(win & 0xff);
-            if((rc=ls_zsendhhdr(ZRINIT,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZRINIT,4,ls_txHdr))<0) return rc;
 			retransmit = 0;
 			trys++;
 		}
@@ -139,40 +126,32 @@
             first = 1;      /* We will trust in first ZFIN after ZRQINIT */
         case ZNAK:
         case LSZ_TIMEOUT:
-            DEBUG(('Z',3,"ls_zrecvfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zrecvfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             retransmit = 1;
             break;
         case ZSINIT:		/* He want to set some options */
-            DEBUG(('Z',3,"ls_zrecvfinfo: ZSINIT"));
+			DEBUG(('Z',2,"ls_zrecvfinfo: ZSINIT"));
             first = 0;      /* We will trust in first ZFIN after ZSINIT */
-            if((rc=ls_zrecvcrcw(rxbuf,&len))<0) {
-                return rc;
-            }
+			if((rc=ls_zrecvcrcw(rxbuf,&len))<0) return rc;
             if(!rc) { 		/* Everything is OK */
                 ls_storelong(ls_txHdr,1L);
                 ls_zsendhhdr(ZACK,4,ls_txHdr);
                 xstrcpy((char *)ls_rxAttnStr,(char *)rxbuf,LSZ_MAXATTNLEN+1);
                 ls_rxAttnStr[LSZ_MAXATTNLEN] = '\x00';
-                if(ls_rxHdr[LSZ_F0]&LSZ_TXWNTESCCTL) {
-                    ls_Protocol |= LSZ_OPTESCAPEALL;
-                }
-                if(ls_rxHdr[LSZ_F0]&LSZ_TXWNTESC8) {
-                    ls_Protocol |= LSZ_OPTESC8;
-                }
+				if(ls_rxHdr[LSZ_F0]&LSZ_TXWNTESCCTL) ls_Protocol |= LSZ_OPTESCAPEALL;
+				if(ls_rxHdr[LSZ_F0]&LSZ_TXWNTESC8) ls_Protocol |= LSZ_OPTESC8;
             } else {		/* We could not receive ZCRCW subframe, but error is not fatal */
                 trys++;
             }
             break;
         case ZFILE:			/* Ok, File started! */
-            DEBUG(('Z',3,"ls_zrecvfinfo: ZFILE"));
-            if((rc=ls_zrecvcrcw(rxbuf,&len))<0) {
-                return rc;
-            }
+			DEBUG(('Z',2,"ls_zrecvfinfo: ZFILE"));
+			if((rc=ls_zrecvcrcw(rxbuf,&len))<0) return rc;
             if(!rc) { 		/* Everything is OK, decode frame */
                 xstrcpy(f->name,(char *)rxbuf,MAX_PATH);
                 f->name[MAX_PATH-1] = '\x00';
                 if(sscanf((char *)rxbuf+strlen(f->name)+1,"%ld %lo %o %o %ld %ld",(long*)&f->size,(unsigned long*)&f->mtime,(unsigned*)&len,(unsigned*)&ls_SerialNum,(long*)&f->filesleft,(long*)&f->bytesleft) < 2) {
-                    DEBUG(('Z',4,"ls_zrecvfinfo: file info is corrupted: '%s'",rxbuf+strlen(f->name)+1));
+					DEBUG(('Z',1,"ls_zrecvfinfo: file info is corrupted: '%s'",rxbuf+strlen(f->name)+1));
 					f->filesleft = -1;
 				}
 				return ZFILE;
@@ -181,37 +160,33 @@
             }
             break;
         case ZFIN:			/* ZFIN from previous session? Or may be real one? */
-            DEBUG(('Z',3,"ls_zrecvfinfo: ZFIN %d, first: %d",zfins,first));
-            if(first || ++zfins == LSZ_TRUSTZFINS) {
-                return ZFIN;
-            }
+			DEBUG(('Z',2,"ls_zrecvfinfo: ZFIN %d, first: %d",zfins,first));
+			if(first || ++zfins == LSZ_TRUSTZFINS) return ZFIN;
             break;
         case ZABORT:		/* Abort this session -- we trust in ABORT! */
-            DEBUG(('Z',3,"ls_zrecvfinfo: ABORT"));
+			DEBUG(('Z',2,"ls_zrecvfinfo: ABORT"));
             return ZABORT;
         case LSZ_BADCRC:
-            DEBUG(('Z',3,"ls_zrecvfinfo: BADCRC"));
+			DEBUG(('Z',2,"ls_zrecvfinfo: BADCRC"));
             ls_storelong(ls_txHdr,0L);
             ls_zsendhhdr(ZNAK,4,ls_txHdr);
             retransmit = 1;
             break;
         default:
             /*
-            DEBUG(('Z',3,"ls_zrecvfinfo: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zrecvfinfo: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"ls_zrecvfinfo: something strange rc=%ld",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zrecvfinfo: something strange rc=%ld",rc));
+			if(rc<0) return rc;
             ls_storelong(ls_txHdr,0L);
             ls_zsendhhdr(ZNAK,4,ls_txHdr);
             break;
         }
     } while(trys < 10);
     /*
-    DEBUG(('Z',2,"ls_zrecvfinfo: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zrecvfinfo: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zrecvfinfo: timeout or something other: rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zrecvfinfo: timeout or something other: rc=%ld",rc));
 	return LSZ_TIMEOUT;
 }
 
@@ -222,46 +197,42 @@
     int trys = 0;
     int hlen;
 
-    DEBUG(('Z',2,"ls_zrecvnewpos: will retransmit %d",oldpos));
+	DEBUG(('Z',1,"ls_zrecvnewpos: will retransmit %d",oldpos));
     do {
         switch((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))) {
         case ZDATA:
         case ZEOF:
-            DEBUG(('Z',3,"ls_zrecvnewpos: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zrecvnewpos: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             *pos = ls_fetchlong(ls_rxHdr);
             return rc;
         case ZNAK:
-            DEBUG(('Z',3,"ls_zrecvnewpos: ZNAK"));
+			DEBUG(('Z',2,"ls_zrecvnewpos: ZNAK"));
             ls_storelong(ls_txHdr,oldpos);
-            if((rc=ls_zsendhhdr(ZRPOS,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZRPOS,4,ls_txHdr))<0) return rc;
             break;
         case LSZ_TIMEOUT:
-            DEBUG(('Z',3,"ls_zrecvnewpos: TIEMOUT"));
+			DEBUG(('Z',2,"ls_zrecvnewpos: TIEMOUT"));
             break;
         case LSZ_BADCRC:
-            DEBUG(('Z',3,"ls_zrecvnewpos: BADCRC"));
+			DEBUG(('Z',2,"ls_zrecvnewpos: BADCRC"));
             ls_storelong(ls_txHdr,0L);
             ls_zsendhhdr(ZNAK,4,ls_txHdr);
             break;
         default:
             /*
-            DEBUG(('Z',3,"ls_zrecvnewpos: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zrecvnewpos: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"ls_zrecvnewpos: something strange rc=%ld",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zrecvnewpos: something strange rc=%ld",rc));
+			if(rc<0) return rc;
             ls_storelong(ls_txHdr,0L);
             ls_zsendhhdr(ZNAK,4,ls_txHdr);
             break;
         }
     } while (++trys < 10);
     /*
-    DEBUG(('Z',2,"ls_zrecvnewpos: timeout or something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zrecvnewpos: timeout or something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zrecvnewpos: timeout or something strange rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zrecvnewpos: timeout or something strange rc=%ld",rc));
 	return LSZ_TIMEOUT;
 }
 
@@ -273,14 +244,12 @@
     int needzdata = 1;
     int len;
 
-    DEBUG(('Z',2,"ls_zrecvfile form %d",pos));
+	DEBUG(('Z',1,"ls_zrecvfile form %d",pos));
 
     rxpos = pos;
     rxstatus=0;
     ls_storelong(ls_txHdr,rxpos);
-    if((rc=ls_zsendhhdr(ZRPOS,4,ls_txHdr))<0) {
-        return rc;
-    }
+	if((rc=ls_zsendhhdr(ZRPOS,4,ls_txHdr))<0) return rc;
 
 	do {
 		if(!needzdata) {
@@ -288,11 +257,9 @@
             case ZCRCE:
                 needzdata = 1;
             case ZCRCG:
-                DEBUG(('Z',3,"ls_zrecvfile: ZCRC%c, %d bytes at %d",rc==ZCRCE?'E':'G',len,rxpos));
+				DEBUG(('Z',2,"ls_zrecvfile: ZCRC%c, %d bytes at %d",rc==ZCRCE?'E':'G',len,rxpos));
                 rxpos += len;
-                if(len != fwrite(rxbuf,1,len,rxfd)) {
-                    return ZFERR;
-                }
+				if(len != fwrite(rxbuf,1,len,rxfd)) return ZFERR;
 
 				recvf.foff = rxpos;
 				check_cps();
@@ -301,11 +268,9 @@
             case ZCRCW:
                 needzdata = 1;
             case ZCRCQ:
-                DEBUG(('Z',3,"ls_zrecvfile: ZCRC%c, %d bytes at %d",rc==ZCRCW?'W':'Q',len,rxpos));
+				DEBUG(('Z',2,"ls_zrecvfile: ZCRC%c, %d bytes at %d",rc==ZCRCW?'W':'Q',len,rxpos));
                 rxpos += len;
-                if(len != fwrite(rxbuf,1,len,rxfd)) {
-                    return ZFERR;
-                }
+				if(len != fwrite(rxbuf,1,len,rxfd)) return ZFERR;
 				ls_storelong(ls_txHdr,rxpos);
 				ls_zsendhhdr(ZACK,4,ls_txHdr);
 
@@ -315,59 +280,43 @@
                 break;
             case LSZ_BADCRC:
             case LSZ_TIMEOUT:
-                DEBUG(('Z',3,"ls_zrecvfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
-                if(ls_rxAttnStr[0]) {
-                    PUTSTR(ls_rxAttnStr);
-                }
+				DEBUG(('Z',1,"ls_zrecvfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+				if(ls_rxAttnStr[0]) PUTSTR(ls_rxAttnStr);
                 PURGE();
                 ls_storelong(ls_txHdr,rxpos);
                 ls_zsendhhdr(ZRPOS,4,ls_txHdr);
                 needzdata = 1;
                 break;
             default:
-                DEBUG(('Z',3,"ls_zrecvfile: something strange %ld",rc));
-                if(rc<0) {
-                    return rc;
-                }
-                if(ls_rxAttnStr[0]) {
-                    PUTSTR(ls_rxAttnStr);
-                }
+				DEBUG(('Z',1,"ls_zrecvfile: something strange %ld",rc));
+				if(rc<0) return rc;
+				if(ls_rxAttnStr[0]) PUTSTR(ls_rxAttnStr);
                 PURGE();
                 ls_storelong(ls_txHdr,rxpos);
                 ls_zsendhhdr(ZRPOS,4,ls_txHdr);
                 needzdata = 1;
             }
         } else {		/* We need new position -- ZDATA (and may be ZEOF) */
-            DEBUG(('Z',3,"ls_zrecvfile: want ZDATA/ZEOF at %d",rxpos));
-            if((rc=ls_zrecvnewpos(rxpos,&newpos))<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zrecvfile: want ZDATA/ZEOF at %d",rxpos));
+			if((rc=ls_zrecvnewpos(rxpos,&newpos))<0) return rc;
             if(newpos != rxpos) {
-                DEBUG(('Z',4,"ls_zrecvfile: bad new position %d in %s",newpos,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
-                if(ls_rxAttnStr[0]) {
-                    PUTSTR(ls_rxAttnStr);
-                }
+				DEBUG(('Z',1,"ls_zrecvfile: bad new position %d in %s",newpos,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+				if(ls_rxAttnStr[0]) PUTSTR(ls_rxAttnStr);
                 PURGE();
                 ls_storelong(ls_txHdr,rxpos);
-                if((rc=ls_zsendhhdr(ZRPOS,4,ls_txHdr))<0) {
-                    return rc;
-                }
+				if((rc=ls_zsendhhdr(ZRPOS,4,ls_txHdr))<0) return rc;
             } else {
                 if(ZEOF == rc) {
-                    DEBUG(('Z',4,"ls_zrecvfile: ZEOF"));
+					DEBUG(('Z',2,"ls_zrecvfile: ZEOF"));
                     ls_storelong(ls_txHdr,0);
-                    if((rc=ls_zsendhhdr(ZRINIT,4,ls_txHdr))<0) {
-                        return rc;
-                    }
+					if((rc=ls_zsendhhdr(ZRINIT,4,ls_txHdr))<0) return rc;
                     return LSZ_OK;
                 }
-                DEBUG(('Z',4,"ls_zrecvfile: ZDATA"));
+				DEBUG(('Z',2,"ls_zrecvfile: ZDATA"));
                 needzdata = 0;
             }
         }
-        if(rxstatus) {
-            return((rxstatus==RX_SKIP)?ZSKIP:ZFERR);
-        }
+		if(rxstatus)return((rxstatus==RX_SKIP)?ZSKIP:ZFERR);
 	} while(1);
 	return LSZ_OK;
 }
@@ -378,47 +327,37 @@
     int trys = 0;
     int hlen;
     int retransmit = 1;
-    DEBUG(('Z',2,"ls_zdonereceiver"));
+	DEBUG(('Z',1,"ls_zdonereceiver"));
     xfree(rxbuf);
     do {
         if (retransmit) {
             ls_storelong(ls_txHdr,0);
-            if((rc=ls_zsendhhdr(ZFIN,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZFIN,4,ls_txHdr))<0) return rc;
             retransmit = 0;
             trys++;
         }
         switch (rc=GETCHAR(ls_HeaderTimeout)) {
         case 'O':				/* Ok, GOOD */
-            DEBUG(('Z',3,"ls_zdonereceiver: O"));
+			DEBUG(('Z',2,"ls_zdonereceiver: O"));
             rc = GETCHAR(0);
             return LSZ_OK;
-        case XON:
-        case XOFF:
-        case XON | 0x80:
-        case XOFF | 0x80:
-            DEBUG(('Z',3,"ls_zdonereceiver: XON/XOFF, skip it"));
+		case XON: case XOFF:
+		case XON | 0x80: case XOFF | 0x80:
+			DEBUG(('Z',2,"ls_zdonereceiver: XON/XOFF, skip it"));
             break;
         case ZPAD:
-            DEBUG(('Z',3,"ls_zdonereceiver: ZPAD"));
-            if((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))<0) {
-                return rc;
-            }
-            if(ZFIN != rc) {
-                return LSZ_OK;
-            }
+			DEBUG(('Z',2,"ls_zdonereceiver: ZPAD"));
+			if((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))<0) return rc;
+			if(ZFIN != rc) return LSZ_OK;
             retransmit = 1;
             break;
         default:
-            DEBUG(('Z',3,"ls_zdonereceiver: something strange %d",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zdonereceiver: something strange %d",rc));
+			if(rc<0) return rc;
             retransmit = 1;
             break;
         }
     } while (trys < 10);
-    DEBUG(('Z',2,"ls_zdonereceiver: timeout or something strange %d",rc));
+	DEBUG(('Z',1,"ls_zdonereceiver: timeout or something strange %d",rc));
 	return rc;
 }
diff -burw ./qico/src/ls_zsend.c ./trunk/src/ls_zsend.c
--- ./qico/src/ls_zsend.c	2024-02-01 18:09:52.567781000 +0300
+++ ./trunk/src/ls_zsend.c	2024-02-01 18:10:34.589264000 +0300
@@ -4,7 +4,7 @@
    Sender logic.
 */
 /*
- * $Id: ls_zsend.c,v 1.4 2005/03/31 19:40:38 mitry Exp $
+ * $Id: ls_zsend.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: ls_zsend.c,v $
  * Revision 1.4  2005/03/31 19:40:38  mitry
@@ -35,12 +35,10 @@
     int hlen;
     int l;
 
-    DEBUG(('Z',2,"ls_zsendsinit: '%s'",attstr?attstr:"(null)"));
+	DEBUG(('Z',1,"ls_zsendsinit: '%s'",attstr?attstr:"(null)"));
 
     if (attstr) {
-        if (strlen(attstr) > LSZ_MAXATTNLEN-1) {
-            attstr[LSZ_MAXATTNLEN-1] = '\x00';
-        }
+		if (strlen(attstr) > LSZ_MAXATTNLEN-1) attstr[LSZ_MAXATTNLEN-1] = '\x00';
 		xstrcpy((char *)txbuf,attstr,1024);
 	} else {
 		txbuf[0] = '\x00';
@@ -49,61 +47,51 @@
 
     do {
         if(retransmit) {
-            DEBUG(('Z',3,"ls_zsendsinit: resend ZSINIT"));
+			DEBUG(('Z',2,"ls_zsendsinit: resend ZSINIT"));
             /* We don't support ESC8, so don't ask for it in any case */
             ls_txHdr[LSZ_F0] = (ls_Protocol&LSZ_OPTESCAPEALL)?LSZ_TXWNTESCCTL:0;
             ls_txHdr[LSZ_F1] = ls_txHdr[LSZ_F2] = ls_txHdr[LSZ_F3] = 0;
-            if((rc=ls_zsendbhdr(ZSINIT,4,ls_txHdr))<0) {
-                return rc;
-            }
-            if((rc=ls_zsenddata(txbuf,l,ZCRCW))) {
-                return rc;
-            }
+			if((rc=ls_zsendbhdr(ZSINIT,4,ls_txHdr))<0) return rc;
+			if((rc=ls_zsenddata(txbuf,l,ZCRCW))) return rc;
             retransmit = 0;
             trys++;
         }
         switch((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))) {
         case ZRINIT:		/* Skip it */
-            DEBUG(('Z',3,"ls_zsendsinit: ZRINIT"));
+			DEBUG(('Z',2,"ls_zsendsinit: ZRINIT"));
             break;
         case ZACK:			/* Ok */
-            DEBUG(('Z',3,"ls_zsendsinit: ZACK"));
+			DEBUG(('Z',2,"ls_zsendsinit: ZACK"));
             return LSZ_OK;
         case ZCHALLENGE:	/* Return number to peer, he is paranoid */
-            DEBUG(('Z',3,"ls_zsendsinit: CHALLENGE"));
+			DEBUG(('Z',2,"ls_zsendsinit: CHALLENGE"));
             ls_storelong(ls_txHdr,ls_fetchlong(ls_rxHdr));
-            if((rc=ls_zsendhhdr(ZACK,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZACK,4,ls_txHdr))<0) return rc;
             break;
         case LSZ_BADCRC:
         case ZCOMMAND:
-            DEBUG(('Z',3,"ls_zsendsinit: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zsendsinit: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             ls_storelong(ls_txHdr,0);
-            if((rc=ls_zsendhhdr(ZNAK,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZNAK,4,ls_txHdr))<0) return rc;
             break;
         case ZNAK:			/* Retransmit */
         case LSZ_TIMEOUT:
-            DEBUG(('Z',3,"ls_zsendsinit: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zsendsinit: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             retransmit = 1;
             break;
         default:
             /*
-            DEBUG(('Z',3,"ls_zsendsinit: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zsendsinit: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"ls_zsendsinit: something strange rc=%ld",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zsendsinit: something strange rc=%ld",rc));
+			if(rc<0) return rc;
             break;
         }
     } while(trys < 10);
     /*
-    DEBUG(('Z',2,"ls_zsendsinit: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zsendsinit: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zsendsinit: timeout or something other: rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zsendsinit: timeout or something other: rc=%ld",rc));
 	return rc;
 }
 
@@ -117,7 +105,7 @@
     int rxOptions;	/* Options from ZRINIT header */
     int zfins = 0;	/* ZFIN counter -- we will trust only MAY of them on this stage */
 
-    DEBUG(('Z',2,"ls_zinitsender: %08x, %d baud, %d bytes",protocol,baud,window));
+	DEBUG(('Z',1,"ls_zinitsender: %08x, %d baud, %d bytes",protocol,baud,window));
 
 	/* Set all options to requested state -- this may be alerted by other side */
 	ls_Protocol = protocol;
@@ -141,11 +129,9 @@
     do {
         if(retransmit) {
             /* Send first ZRQINIT (do we need it?) */
-            DEBUG(('Z',3,"ls_zinitsender: resend ZRQINIT"));
+			DEBUG(('Z',2,"ls_zinitsender: resend ZRQINIT"));
             ls_storelong(ls_txHdr,0L);
-            if((rc=ls_zsendhhdr(ZRQINIT,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZRQINIT,4,ls_txHdr))<0) return rc;
 			retransmit = 0;
 			trys++;
 		}
@@ -155,115 +141,85 @@
             /* What receiver could (in hardware) -- Duplex, sim. I/O, send break signals */
             ls_rxCould = (rxOptions&(LSZ_RXCANDUPLEX|LSZ_RXCANOVIO|LSZ_RXCANBRK));
             /* Strip RLE from ls_Protocol, if peer could not use RLE (WE COULD NOT RLE in ANY CASE!) */
-            if(!(rxOptions&LSZ_RXCANRLE)) {
-                ls_Protocol&=(~LSZ_OPTRLE);
-            }
+			if(!(rxOptions&LSZ_RXCANRLE)) ls_Protocol&=(~LSZ_OPTRLE);
             /* Strip CRC32 from ls_Protocol, if peer could not use CRC32 */
-            if(!(rxOptions&LSZ_RXCANFC32)) {
-                ls_Protocol&=(~LSZ_OPTCRC32);
-            }
+			if(!(rxOptions&LSZ_RXCANFC32)) ls_Protocol&=(~LSZ_OPTCRC32);
             /* Set EscapeAll if peer want it */
-            if(rxOptions&LSZ_RXWNTESCCTL) {
-                ls_Protocol|=LSZ_OPTESCAPEALL;
-            }
+			if(rxOptions&LSZ_RXWNTESCCTL) ls_Protocol|=LSZ_OPTESCAPEALL;
             /* Strip VHeaders from ls_Protocol, if peer could not use VHDR */
-            if(!(rxOptions&LSZ_RXCANVHDR)) {
-                ls_Protocol&=(~LSZ_OPTVHDR);
-            }
+			if(!(rxOptions&LSZ_RXCANVHDR)) ls_Protocol&=(~LSZ_OPTVHDR);
             /* Ok, options are ready */
             /* Fetch window size */
             ls_txWinSize=STOH(((ls_rxHdr[LSZ_P1]&0xFF)<<8) | (ls_rxHdr[LSZ_P0]&0xFF));
             /* Override empty or big window by our window (if not emty too) */
-            if(window && (!ls_txWinSize || ls_txWinSize > window)) {
-                ls_txWinSize = window;
-            }
+			if(window && (!ls_txWinSize || ls_txWinSize > window)) ls_txWinSize = window;
 
-            DEBUG(('Z',3,"ls_zinitsender: RINIT OK, effproto: %08x, winsize: %d",ls_Protocol,ls_txWinSize));
+			DEBUG(('Z',2,"ls_zinitsender: RINIT OK, effproto: %08x, winsize: %d",ls_Protocol,ls_txWinSize));
 
             /* Ok, now we could calculate real max frame size and initial block size */
             if(ls_txWinSize && ls_MaxBlockSize>ls_txWinSize) {
                 for(ls_MaxBlockSize=1; ls_MaxBlockSize<ls_txWinSize; ls_MaxBlockSize<<=1);
                 /*ls_MaxBlockSize >>= 1;*/
-                if(ls_MaxBlockSize<32) {
-                    ls_txWinSize=ls_MaxBlockSize=32;
+				if(ls_MaxBlockSize<32) ls_txWinSize=ls_MaxBlockSize=32;
                 }
-            }
 
-            if(baud<2400) {
-                ls_txCurBlockSize = 256;
-            } else if(baud>=2400 && baud<4800) {
-                ls_txCurBlockSize = 512;
-            } else {
-                ls_txCurBlockSize = 1024;
-            }
+                        if(baud<2400) ls_txCurBlockSize = 256;
+			else if(baud>=2400 && baud<4800) ls_txCurBlockSize = 512;
+			else ls_txCurBlockSize = 1024;
 
             if(ls_Protocol&LSZ_OPTZEDZAP) {
-                if(baud>=7200 && baud<9600) {
-                    ls_txCurBlockSize = 2048;
-                } else if(baud>=9600 && baud<14400) {
-                    ls_txCurBlockSize = 4096;
-                } else if(baud>=14400) {
-                    ls_txCurBlockSize = 8192;
+                                if(baud>=7200 && baud<9600) ls_txCurBlockSize = 2048;
+				else if(baud>=9600 && baud<14400) ls_txCurBlockSize = 4096;
+				else if(baud>=14400) ls_txCurBlockSize = 8192;
                 }
-            }
-            if(ls_txCurBlockSize>ls_MaxBlockSize) {
-                ls_txCurBlockSize=ls_MaxBlockSize;
-            }
-            DEBUG(('Z',3,"ls_zinitsender: Block sizes: %d, %d",ls_MaxBlockSize,ls_txCurBlockSize));
+			if(ls_txCurBlockSize>ls_MaxBlockSize) ls_txCurBlockSize=ls_MaxBlockSize;
+			DEBUG(('Z',2,"ls_zinitsender: Block sizes: %d, %d",ls_MaxBlockSize,ls_txCurBlockSize));
 
             /* Allocate memory for send buffer */
             txbuf = xmalloc((ls_MaxBlockSize+16));
-            if ( txbuf == NULL ) {
+			if ( txbuf == NULL )
                 return LSZ_ERROR;
-            }
 
             /* Send ZSINIT, if we need it */
-            if(attstr || (!(rxOptions&LSZ_RXWNTESCCTL) && (ls_Protocol&LSZ_OPTESCAPEALL))) {
+			if(attstr || (!(rxOptions&LSZ_RXWNTESCCTL) && (ls_Protocol&LSZ_OPTESCAPEALL)))
                 return ls_zsendsinit(attstr);
-            } else {
+			else
                 return LSZ_OK;
-            }
         case ZCHALLENGE:	/* Return number to peer, he is paranoid */
-            DEBUG(('Z',3,"ls_zinitsender: CHALLENGE"));
+			DEBUG(('Z',2,"ls_zinitsender: CHALLENGE"));
             ls_storelong(ls_txHdr,ls_fetchlong(ls_rxHdr));
-            if((rc=ls_zsendhhdr(ZACK,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZACK,4,ls_txHdr))<0) return rc;
             break;
         case ZNAK:			/* Send ZRQINIT again */
         case LSZ_TIMEOUT:
-            DEBUG(('Z',3,"ls_zinitsender: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zinitsender: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             retransmit = 1;
             break;
         case ZFIN:			/* ZFIN from previous session? Or may be real one? */
-            DEBUG(('Z',3,"ls_zinitsender: ZFIN %d",zfins));
-            if(++zfins == LSZ_TRUSTZFINS) {
-                return LSZ_ERROR;
-            }
+			DEBUG(('Z',2,"ls_zinitsender: ZFIN %d",zfins));
+			if(++zfins == LSZ_TRUSTZFINS) return LSZ_ERROR;
             break;
         case LSZ_BADCRC:	/* Please, resend */
         case ZCOMMAND:		/* We don't support it! */
-            DEBUG(('Z',3,"ls_zinitsender: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zinitsender: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             ls_storelong(ls_txHdr,0L);
             ls_zsendhhdr(ZNAK,4,ls_txHdr);
         case ZABORT:		/* Abort this session -- we trust in ABORT! */
-            DEBUG(('Z',3,"ls_zinitsender: ABORT"));
+			DEBUG(('Z',2,"ls_zinitsender: ABORT"));
             return LSZ_ERROR;
         default:
             /*
-            DEBUG(('Z',3,"ls_zinitsender: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zinitsender: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"ls_zinitsender: something strange rc=%ld",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zinitsender: something strange rc=%ld",rc));
+			if(rc<0) return rc;
             break;
         }
     } while(trys < 10);
     /*
-    DEBUG(('Z',2,"ls_zinitsender: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zinitsender: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zinitsender: timeout or something other: rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zinitsender: timeout or something other: rc=%ld",rc));
 	return rc;
 }
 
@@ -283,35 +239,30 @@
     int len;
     long sn;
 
-    DEBUG(('Z',2,"ls_zsendfinfo: %s, %d, %d, %d, %d, %d",f->name,f->size,f->mtime,sernum,f->filesleft,f->bytesleft));
+	DEBUG(('Z',1,"ls_zsendfinfo: %s, %d, %d, %d, %d, %d",f->name,f->size,f->mtime,sernum,f->filesleft,f->bytesleft));
 
     txbuf[0] = '\x00';
     xstrcpy((char *)txbuf,f->name,1024);
     p = txbuf + strlen(f->name);
-    *p = '\x00';
-    p++;
+	*p = '\x00'; p++;
     snprintf((char *)p,1024-(p-txbuf+1),"%ld %lo %o %o %ld %ld",f->size,f->mtime,(int)0,(int)sernum,f->filesleft,f->bytesleft);
     finfolen = strlen((char *)txbuf) + strlen((char *)p) + 2;
 
     do {
         if(retransmit) {
-            DEBUG(('Z',3,"ls_zsendfinfo: resend ZFILE"));
+			DEBUG(('Z',2,"ls_zsendfinfo: resend ZFILE"));
             ls_txHdr[LSZ_F0] = LSZ_CONVBIN | LSZ_CONVRECOV;
             ls_txHdr[LSZ_F1] = 0; /* No managment */
             ls_txHdr[LSZ_F2] = 0; /* No compression/encryption */
             ls_txHdr[LSZ_F3] = 0; /* No sparse files or variable headers */
-            if((rc=ls_zsendbhdr(ZFILE,4,ls_txHdr))<0) {
-                return rc;
-            }
-            if((rc=ls_zsenddata(txbuf,finfolen,ZCRCW))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendbhdr(ZFILE,4,ls_txHdr))<0) return rc;
+			if((rc=ls_zsenddata(txbuf,finfolen,ZCRCW))<0) return rc;
             retransmit = 0;
             trys++;
         }
         switch((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))) {
         case ZRPOS:				/* Ok, he want our file */
-            DEBUG(('Z',3,"ls_zsendfinfo: ZRPOS at %d",ls_fetchlong(ls_rxHdr)));
+			DEBUG(('Z',2,"ls_zsendfinfo: ZRPOS at %d",ls_fetchlong(ls_rxHdr)));
 			*pos = ls_fetchlong(ls_rxHdr);
 			return ZRPOS;
 		case ZSKIP:		/* Skip */
@@ -319,82 +270,70 @@
             /* Check for double-skip protection */
             sn = ls_fetchlong(ls_rxHdr);
             if(ls_SkipGuard && sn && sn == sernum - 1) {	/* Here is skip protection */
-                DEBUG(('Z',3,"ls_zsendfinfo: double-skip protection! for %d, %s (this file: %d, got: %d, ls_SN: %d)",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET],sernum,sn,ls_SerialNum));
+				DEBUG(('Z',1,"ls_zsendfinfo: double-skip protection! for %d, %s (this file: %d, got: %d, ls_SN: %d)",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET],sernum,sn,ls_SerialNum));
                 ls_storelong(ls_txHdr,0);
-                if((rc=ls_zsendhhdr(ZNAK,4,ls_txHdr))<0) {
-                    return rc;
-                }
+				if((rc=ls_zsendhhdr(ZNAK,4,ls_txHdr))<0) return rc;
                 break;								/* We don't need to skip this file */
             } else if(sn != sernum) {
-                DEBUG(('Z',3,"ls_zsendfinfo: turn off double-skip protection in %d, %s (%d)",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET],sn));
+				DEBUG(('Z',1,"ls_zsendfinfo: turn off double-skip protection in %d, %s (%d)",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET],sn));
                 ls_SkipGuard = 0;
             }
         /* Fall through */
         case ZABORT:	/* Abort this session */
         case ZFIN:		/* Finish this session */
-            DEBUG(('Z',3,"ls_zsendfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zsendfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             return rc;
         case ZCRC:		/* Send CRC to peer */
-            DEBUG(('Z',3,"ls_zsendfinfo: ZCRC for %d bytes",ls_fetchlong(ls_rxHdr)));
+			DEBUG(('Z',2,"ls_zsendfinfo: ZCRC for %d bytes",ls_fetchlong(ls_rxHdr)));
             len = ls_fetchlong(ls_rxHdr);
-            if(!len) {
-                len = f->size;
-            }
+			if(!len) len = f->size;
             cnt = 0;
             fseek(txfd,0,SEEK_SET);
-            while((cnt++ < len) && ((c = getc(txfd)) > 0)) {
-                crc = LSZ_UPDATE_CRC32(c,crc);
-            }
+			while((cnt++ < len) && ((c = getc(txfd)) > 0)) { crc = LSZ_UPDATE_CRC32(c,crc); }
             clearerr(txfd);
             fseek(txfd,0,SEEK_SET);
             crc = LSZ_FINISH_CRC32(crc);
             ls_storelong(ls_txHdr,crc);
-            if((rc=ls_zsendhhdr(ZCRC,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZCRC,4,ls_txHdr))<0) return rc;
             break;
         case ZRINIT:
-            DEBUG(('Z',3,"ls_zsendfinfo: skip ZRINIT"));
+			DEBUG(('Z',2,"ls_zsendfinfo: skip ZRINIT"));
             break;
         case ZNAK:
         case LSZ_TIMEOUT:
-            DEBUG(('Z',3,"ls_zsendfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zsendfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             retransmit = 1;
             break;
         case LSZ_BADCRC:
-            DEBUG(('Z',3,"ls_zsendfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',2,"ls_zsendfinfo: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
             ls_storelong(ls_txHdr,0);
-            if((rc=ls_zsendhhdr(ZNAK,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZNAK,4,ls_txHdr))<0) return rc;
             break;
         default:
             /*
-            DEBUG(('Z',3,"ls_zsendfinfo: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zsendfinfo: something strange %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"ls_zsendfinfo: something strange rc=%ld",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zsendfinfo: something strange rc=%ld",rc));
+			if(rc<0) return rc;
             break;
         }
     } while (trys < 10);
     /*
-    DEBUG(('Z',2,"ls_zsendfinfo: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zsendfinfo: timeout or something other: %ld, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zsendfinfo: timeout or something other: rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zsendfinfo: timeout or something other: rc=%ld",rc));
     return rc;
 }
 
 /* Intrnal function to process ZRPOS */
 int ls_zrpos(int newpos)
 {
-    DEBUG(('Z',2,"ls_zrpos: ZRPOS to %d",newpos));
+	DEBUG(('Z',1,"ls_zrpos: ZRPOS to %d",newpos));
     txpos = newpos;
 
     if(txpos == ls_txLastRepos) {
         if(++ls_txReposCount > 10) {
-            DEBUG(('Z',3,"ls_zrpos: ZRPOS to %ld limit reached",txpos));
+			DEBUG(('Z',1,"ls_zrpos: ZRPOS to %ld limit reached",txpos));
 			return LSZ_ERROR;
 		}
 	} else {
@@ -404,12 +343,10 @@
     ls_txLastACK = txpos;	/* Drop window */
     clearerr(txfd);			/* May be EOF */
     if(fseek(txfd,txpos,SEEK_SET)) {
-        DEBUG(('Z',3,"ls_zrpos: ZRPOS to %ld seek error",txpos));
+		DEBUG(('Z',1,"ls_zrpos: ZRPOS to %ld seek error",txpos));
         return LSZ_ERROR;
     }
-    if(ls_txCurBlockSize > 32) {
-        ls_txCurBlockSize >>= 1;
-    }
+	if(ls_txCurBlockSize > 32) ls_txCurBlockSize >>= 1;
 	ls_txGoodBlocks = 0;
 	return LSZ_OK;
 }
@@ -431,93 +368,74 @@
     int hlen;
     int needack = 0;
 
-    DEBUG(('Z',2,"ls_zsendfile: %s",f->name));
+	DEBUG(('Z',1,"ls_zsendfile: %s",f->name));
 
     switch((rc = ls_zsendfinfo(f,sernum,&txpos))) {
     case ZRPOS:		/* Ok, It's OK! */
-        DEBUG(('Z',3,"ls_zsendfile: ZRPOS to %d",txpos));
+		DEBUG(('Z',2,"ls_zsendfile: ZRPOS to %d",txpos));
         break;
     case ZSKIP:		/* Skip it */
     case ZFERR:		/* Suspend it */
-        DEBUG(('Z',3,"ls_zsendfile: %s",LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+		DEBUG(('Z',2,"ls_zsendfile: %s",LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
         return rc;
     case ZABORT:
     case ZFIN:		/* Session is aborted */
-        DEBUG(('Z',3,"ls_zsendfile: %s",LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+		DEBUG(('Z',2,"ls_zsendfile: %s",LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
         ls_finishsend();
         return LSZ_ERROR;
     default:
-        if(rc < 0) {
-            return rc;
-        }
-        DEBUG(('Z',3,"ls_zsendfile: Strange answer on ZFILE:  %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+		if(rc < 0) return rc;
+		DEBUG(('Z',1,"ls_zsendfile: Strange answer on ZFILE:  %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
         return LSZ_ERROR;
     }
 
     if(fseek(txfd,txpos,SEEK_SET)) {
-        DEBUG(('Z',3,"ls_zsendfile: Seek to %d error",txpos));
+		DEBUG(('Z',1,"ls_zsendfile: Seek to %d error",txpos));
         return LSZ_ERROR;
     }
     sendf.soff=txpos;
 
     /* Send file data */
     if(ls_txWinSize) {
-        if(ls_rxCould & LSZ_RXCANDUPLEX) {
-            mode = sfSlidingWindow;
+		if(ls_rxCould & LSZ_RXCANDUPLEX) mode = sfSlidingWindow;
+		else mode = sfBuffered;
         } else {
-            mode = sfBuffered;
-        }
-    } else {
         mode = sfStream;
     }
     frame = ZCRCW;
-    DEBUG(('Z',2,"ls_zsendfile: mode %s",sfStream==mode?"stream":(sfBuffered==mode?"buffered":"sliding window")));
+	DEBUG(('Z',1,"ls_zsendfile: mode %s",sfStream==mode?"stream":(sfBuffered==mode?"buffered":"sliding window")));
 
     while(!feof(txfd)) {
         /* We need to send ZDATA if previous frame was ZCRCW
         Also, frame will be ZCRCW, if it is after RPOS */
         if(ZCRCW == frame) {
-            DEBUG(('Z',3,"ls_zsendfile: send ZDATA at %d",txpos));
+			DEBUG(('Z',1,"ls_zsendfile: send ZDATA at %d",txpos));
             ls_storelong(ls_txHdr,txpos);
-            if((rc=ls_zsendbhdr(ZDATA,4,ls_txHdr))<0) {
-                return rc;
+			if((rc=ls_zsendbhdr(ZDATA,4,ls_txHdr))<0) return rc;
             }
-        }
         /* Send frame of data */
         bread = fread(txbuf,1,ls_txCurBlockSize,txfd);
         if(bread < 0) {
-            DEBUG(('Z',3,"ls_zsendfile: read error at %d",txpos));
+			DEBUG(('Z',1,"ls_zsendfile: read error at %d",txpos));
             return LSZ_ERROR;
         }
         /* Select sub-frame type */
         if(bread < ls_txCurBlockSize) {		/* This is last sub-frame -- EOF */
-            DEBUG(('Z',3,"ls_zsendfile: EOF at %d",txpos+bread));
-            if(sfStream == mode) {
-                frame = ZCRCE;
-            } else {
-                frame = ZCRCW;
-            }
+			DEBUG(('Z',2,"ls_zsendfile: EOF at %d",txpos+bread));
+			if(sfStream == mode) frame = ZCRCE;
+			else frame = ZCRCW;
         } else {							/* This is not-last sub-frame */
             switch(mode) {
-            case sfStream:
-                frame = ZCRCG;
-                break;	/* Simple sub-frame */
-            case sfSlidingWindow:
-                frame = ZCRCQ;
-                break;	/* Simple sub-frame, but with SlWin */
+			case sfStream:			frame = ZCRCG; break;	/* Simple sub-frame */
+			case sfSlidingWindow:	frame = ZCRCQ; break;	/* Simple sub-frame, but with SlWin */
             case sfBuffered:
-                if(txpos + bread > ls_txLastACK + ls_txWinSize) {
-                    frame = ZCRCW;    /* Last sub-frame in buffer */
-                } else {
-                    frame = ZCRCG;    /* Simple sub-frame */
-                }
+				if(txpos + bread > ls_txLastACK + ls_txWinSize) frame = ZCRCW;	/* Last sub-frame in buffer */
+				else frame = ZCRCG;	/* Simple sub-frame */
                 break;
             }
         }
-        DEBUG(('Z',3,"ls_zsendfile: send at %d",txpos));
-        if((rc=ls_zsenddata(txbuf,bread,frame))<0) {
-            return rc;
-        }
+		DEBUG(('Z',2,"ls_zsendfile: send at %d",txpos));
+		if((rc=ls_zsenddata(txbuf,bread,frame))<0) return rc;
 		txpos += bread;
 
 		sendf.foff = txpos;
@@ -530,17 +448,15 @@
             switch((rc=ls_zrecvhdr(ls_rxHdr,&hlen,needack?ls_HeaderTimeout:0))) {
             case ZSKIP:		/* They don't need this file */
             case ZFERR:		/* Problems occured -- suspend file */
-                DEBUG(('Z',3,"ls_zsendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+				DEBUG(('Z',2,"ls_zsendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                 return rc;
             case ZACK:		/* Ok, position ACK */
-                DEBUG(('Z',3,"ls_zsendfile: ACK at %d",ls_fetchlong(ls_rxHdr)));
+				DEBUG(('Z',2,"ls_zsendfile: ACK at %d",ls_fetchlong(ls_rxHdr)));
                 ls_txLastACK = ls_fetchlong(ls_rxHdr);
                 break;
             case ZRPOS:		/* Repos */
-                DEBUG(('Z',3,"ls_zsendfile: ZRPOS"));
-                if((rc=ls_zrpos(ls_fetchlong(ls_rxHdr)))<0) {
-                    return rc;
-                }
+				DEBUG(('Z',2,"ls_zsendfile: ZRPOS"));
+				if((rc=ls_zrpos(ls_fetchlong(ls_rxHdr)))<0) return rc;
 				frame = ZCRCW; /* Force to retransmit ZDATA */
 				break;
 			case ZABORT:	/* Abort transfer */
@@ -551,18 +467,16 @@
             /* Fall through */
             case LSZ_RCDO:
             case LSZ_ERROR:
-                DEBUG(('Z',3,"ls_zsendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+				DEBUG(('Z',2,"ls_zsendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                 return LSZ_ERROR;
             case LSZ_TIMEOUT:	/* Ok! */
                 break;
             default:		/* STRANGE! */
                 /*
-                DEBUG(('Z',3,"ls_zsendfile: something strange %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+				DEBUG(('Z',1,"ls_zsendfile: something strange %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                 */
-                DEBUG(('Z',3,"ls_zsendfile: something strange rc=%d",rc));
-                if(rc < 0) {
-                    return rc;
-                }
+				DEBUG(('Z',1,"ls_zsendfile: something strange rc=%d",rc));
+				if(rc < 0) return rc;
 				break;
 			}
 		} while(
@@ -570,15 +484,13 @@
              || ((ZCRCW == frame) && txpos > ls_txLastACK)) 			/* Frame was ZCRCW and here is no ACK for it */
             && ++trys < 10);										/* trys less than 10 */
         if(trys >= 10) {
-            DEBUG(('Z',3,"ls_zsendfile: Trys when waiting for ACK/RPOS exceed"));
+			DEBUG(('Z',1,"ls_zsendfile: Trys when waiting for ACK/RPOS exceed"));
             return LSZ_ERROR;
         }
         /* Ok, increase block, if here is MANY good blocks was sent */
         if(++ls_txGoodBlocks > 32) {
             ls_txCurBlockSize <<= 1;
-            if(ls_txCurBlockSize > ls_MaxBlockSize) {
-                ls_txCurBlockSize = ls_MaxBlockSize;
-            }
+			if(ls_txCurBlockSize > ls_MaxBlockSize) ls_txCurBlockSize = ls_MaxBlockSize;
 			ls_txGoodBlocks = 0;
 		}
 
@@ -586,57 +498,51 @@
         /* We do it here, because we coulde receive ZRPOS as answer */
         if(feof(txfd)) {
             ls_storelong(ls_txHdr,txpos);
-            if((rc=ls_zsendhhdr(ZEOF,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZEOF,4,ls_txHdr))<0) return rc;
             trys = 0;
             do {
                 switch((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))) {
                 case ZSKIP:		/* They don't need this file */
                 case ZFERR:		/* Problems occured -- suspend file */
-                    DEBUG(('Z',3,"ls_zsendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+					DEBUG(('Z',2,"ls_zsendfile: %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                     return rc;
                 case ZRPOS:		/* Repos */
-                    DEBUG(('Z',3,"ls_zsendfile: ZRPOS after ZEOF",ls_fetchlong(ls_rxHdr)));
-                    if((rc=ls_zrpos(ls_fetchlong(ls_rxHdr)))<0) {
-                        return rc;
-                    }
+					DEBUG(('Z',2,"ls_zsendfile: ZRPOS after ZEOF",ls_fetchlong(ls_rxHdr)));
+					if((rc=ls_zrpos(ls_fetchlong(ls_rxHdr)))<0) return rc;
                     frame = ZCRCW; /* Force to retransmit ZDATA */
                     break;
                 case ZRINIT:	/* OK! */
                     return LSZ_OK;
                 case ZACK:		/* ACK for data -- it lost! */
-                    DEBUG(('Z',3,"ls_zsendfile: ACK after EOF at %d",ls_fetchlong(ls_rxHdr)));
+					DEBUG(('Z',2,"ls_zsendfile: ACK after EOF at %d",ls_fetchlong(ls_rxHdr)));
                     ls_txLastACK = ls_fetchlong(ls_rxHdr);
                     break;
                 case ZABORT:	/* Abort transfer */
                 case ZFIN:		/* Strange? Ok, abort too */
                 case ZCAN:		/* Abort too */
-                    DEBUG(('Z',3,"ls_zsendfile: after ZEOF %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+					DEBUG(('Z',1,"ls_zsendfile: after ZEOF %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                     return LSZ_ERROR;
                 case LSZ_TIMEOUT:	/* Ok, here is no header */
-                    DEBUG(('Z',3,"ls_zsendfile: TIEMOUT after ZEOF"));
+					DEBUG(('Z',2,"ls_zsendfile: TIEMOUT after ZEOF"));
                     trys++;
                     break;
                 default:		/* STRANGE! */
-                    DEBUG(('Z',3,"ls_zsendfile: something strange after ZEOF %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
-                    if(rc<0) {
-                        return rc;
-                    }
+					DEBUG(('Z',1,"ls_zsendfile: something strange after ZEOF %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+					if(rc<0) return rc;
                     trys++;
                     break;
                 }
             } while(feof(txfd) && trys < 10);
             if(feof(txfd)) {
-                DEBUG(('Z',3,"ls_zsendfile: To many tries waiting for ZEOF ACK"));
+				DEBUG(('Z',1,"ls_zsendfile: To many tries waiting for ZEOF ACK"));
                 return LSZ_ERROR;
             }
         }
     }
     /*
-    DEBUG(('Z',2,"ls_zsendfile: timeout or something else %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zsendfile: timeout or something else %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zsendfile: timeout or something else rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zsendfile: timeout or something else rc=%ld",rc));
 	return rc;
 }
 
@@ -647,20 +553,17 @@
     int hlen;
     int trys = 0;
     int retransmit = 1;
-    DEBUG(('Z',2,"ls_zdonesender"));
+	DEBUG(('Z',1,"ls_zdonesender"));
     do {
         if(retransmit) {
             ls_storelong(ls_txHdr,0);
-            if((rc=ls_zsendhhdr(ZFIN,4,ls_txHdr))<0) {
-                return rc;
-            }
+			if((rc=ls_zsendhhdr(ZFIN,4,ls_txHdr))<0) return rc;
             trys++;
             retransmit = 0;
         }
         switch ((rc=ls_zrecvhdr(ls_rxHdr,&hlen,ls_HeaderTimeout))) {
         case ZFIN:				/* Ok, GOOD */
-            PUTCHAR('O');
-            PUTCHAR('O');
+			PUTCHAR('O');PUTCHAR('O');
 			return LSZ_OK;
 		case ZNAK:
 		case LSZ_TIMEOUT:
@@ -668,18 +571,16 @@
             break;
         default:
             /*
-            DEBUG(('Z',3,"ls_zdonesender: something strange %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+			DEBUG(('Z',1,"ls_zdonesender: something strange %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
                                  */
-            DEBUG(('Z',3,"ls_zdonesender: something strange rc=%ld",rc));
-            if(rc<0) {
-                return rc;
-            }
+			DEBUG(('Z',1,"ls_zdonesender: something strange rc=%ld",rc));
+			if(rc<0) return rc;
             retransmit = 1;
         }
     } while (trys < 10);
     /*
-    DEBUG(('Z',2,"ls_zdonesender: timeout or somethin strange %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
+	DEBUG(('Z',1,"ls_zdonesender: timeout or somethin strange %d, %s",rc,LSZ_FRAMETYPES[rc+LSZ_FTOFFSET]));
            */
-    DEBUG(('Z',2,"ls_zdonesender: timeout or somethin strange rc=%ld",rc));
+	DEBUG(('Z',1,"ls_zdonesender: timeout or somethin strange rc=%ld",rc));
 	return rc;
 }
diff -burw ./qico/src/mailer.h ./trunk/src/mailer.h
--- ./qico/src/mailer.h	2024-02-01 18:09:52.567866000 +0300
+++ ./trunk/src/mailer.h	2024-02-01 18:10:34.588926000 +0300
@@ -1,6 +1,6 @@
 /**********************************************************
  * protocol definitions
- * $Id: mailer.h,v 1.12 2005/05/16 11:17:30 mitry Exp $
+ * $Id: mailer.h 18 2010-08-23 15:50:49Z semik $
  **********************************************************/
 #ifndef __MAILER_H__
 #define __MAILER_H__
diff -burw ./qico/src/main.c ./trunk/src/main.c
--- ./qico/src/main.c	2024-02-01 18:09:52.568020000 +0300
+++ ./trunk/src/main.c	2024-02-01 18:10:34.592515000 +0300
@@ -2,9 +2,12 @@
  * qico's main module.
  **********************************************************/
 /*
- * $Id: main.c,v 1.24 2005/08/11 19:15:14 mitry Exp $
+ * $Id: main.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: main.c,v $
+ * Revision 1.25  2005/11/28 06:55:41  mitry
+ * Fixed tty name detection if /dev/ttySX is linked to /dev/tts/X
+ *
  * Revision 1.24  2005/08/11 19:15:14  mitry
  * Changed code a bit
  *
@@ -147,12 +150,11 @@
 	log_init( cfgs( CFG_LOG ), rnode->tty );
 	write_log( "exiting with rc=%d", rc );
 	log_done();
+	nodelist_done();
     cls_close( ssock );
     cls_shutd( lins_sock );
     cls_shutd( uis_sock );
-    /*
-    killconfig();
-    */
+	/* killconfig(); */
 
 	exit( rc );
 }
@@ -164,20 +166,18 @@
     outbound_done();
     write_log( "got SIG%s signal", sigs[sig] );
 
-    if ( cfgs( CFG_PIDFILE ) && getpid() == islocked( ccs )) {
+	if ( cfgs( CFG_PIDFILE ) && getpid() == islocked( ccs ))
         lunlink( ccs );
-    }
 
     IFPerl( perl_done( 1 ));
     log_done();
 
     if ( tty_online ) {
-        if ( is_ip ) {
+		if ( is_ip )
             tcp_done();
-        } else {
+		else
             modem_done();
         }
-    }
 
 	qqreset();
 	sline( "" );
@@ -200,12 +200,11 @@
 
 static void getsysinfo(void)
 {
-    struct utsname uts;
 	char		tmp[ MAX_STRING + 1 ];
+	struct utsname	uts;
 
-    if ( uname( &uts )) {
+	if ( uname( &uts ))
         return;
-    }
 
 	snprintf( tmp, MAX_STRING, "%s-%s (%s)", uts.sysname, uts.release, uts.machine );
 	osname = xstrdup( tmp );
@@ -222,16 +221,24 @@
     TIO tio;
     sts_t sts;
 
-    if ( cfgs( CFG_ROOTDIR ) && ccs[0] ) {
+	if ( cfgs( CFG_ROOTDIR ) && *ccs )
         chdir( ccs );
-    }
 
 	rnode = xcalloc( 1, sizeof( ninfo_t ));
+
 	is_ip = !isatty( 0 );
+	if ( is_ip ) {
+		rnode->tty = xstrdup( bink ? "binkp" : "tcpip" );
+	} else {
+		cs = getenv( "DEVICE" );
+		if ( !cs || !*cs ) {
+			cs = ttyname( 0 );
+		}
+		rnode->tty = xstrdup( qbasename( cs ));
+	}
 
-    xstrcpy( ip_id, "ipline", 10 );
-    rnode->tty = xstrdup( is_ip ? ( bink ? "binkp" : "tcpip" ) : qbasename( ttyname( 0 )));
 	rnode->options |= O_INB;
+	xstrcpy( ip_id, "ipline", 10 );
 
 	if ( !log_init( cfgs( CFG_LOG ), rnode->tty )) {
 		printf( "can't open log %s!\n", ccs );
@@ -243,6 +250,7 @@
 	signal( SIGSEGV, sigerr );
 	signal( SIGFPE, sigerr );
 	signal( SIGPIPE, SIG_IGN );
+
 	IFPerl( perl_init( cfgs( CFG_PERLFILE ), 0 ));
 
 	__CLS_CONN
@@ -255,6 +263,7 @@
     
 	tty_fd = 0;
 	tty_online = TRUE;
+
 	if( is_ip && getpeername( 0, (struct sockaddr*) &sa, &ss ) == 0 ) {
 		get_hostname( &sa, ss, host, sizeof( host ));
 		write_log( "remote is %s", host );
@@ -265,19 +274,18 @@
         spd = cs ? atoi( cs ) : 0;
         xfree( connstr );
         connstr = xstrdup( cs );
-        if ( cs && spd ) {
+		if ( cs && spd )
             strcpy( host, cs );
-        } else {
+		else {
             strcpy( host, "Unknown" );
             spd = DEFAULT_SPEED;
         }
         write_log( "*** CONNECT %s", host );
-        if (( cs = getenv( "CALLER_ID" )) && strcasecmp( cs, "none" ) && strlen( cs ) > 3 ) {
+		if (( cs = getenv( "CALLER_ID" )) && strcasecmp( cs, "none" ) && strlen( cs ) > 3 )
             write_log( "caller-id: %s", cs );
-        }
 
         tio_get( tty_fd, &tty_stio );
-        memcpy( &tio, &tty_stio, sizeof( TIO ));
+		memmove( &tio, &tty_stio, sizeof( TIO ));
 
 		DEBUG(('M',4,"answering: tio_get_speed %d", tio_get_speed( &tio )));
 
@@ -291,9 +299,8 @@
         fd_set_nonblock( tty_fd, true );
     }
 
-    if ( !tty_gothup ) {
+	if ( !tty_gothup )
         rc = session( SM_INBOUND, type, NULL, spd );
-    }
 
 	sline( "Hanging up..." );
 	if ( is_ip ) {
@@ -316,7 +323,6 @@
     }
 
     title( "Waiting..." );
-    vidle();
 	sline( "" );
 	outbound_done();
 	stopit( rc );
@@ -344,14 +350,11 @@
             while( str && *str ) {
                 switch( tolower( *str )) {
                 case 'n':
-                    call_flags = FC_NORMAL;
-                    break;
+                            call_flags = FC_NORMAL; break;
                 case 'i':
-                    call_flags |= FC_IMMED;
-                    break;
+                            call_flags |= FC_IMMED; break;
                 case 'a':
-                    call_flags |= FC_ANY;
-                    break;
+                            call_flags |= FC_ANY; break;
                         default:
                             write_log( "unknown call option: %c", *optarg );
                             exit( S_FAILURE );
@@ -379,9 +382,8 @@
             daemon = DM_ANSWER;
             sesstype = SESSION_AUTO;
             if ( !strncasecmp( optarg, "**emsi", 6 )
-                    || !strncasecmp( optarg, "emsi", 4 )) {
+                    || !strncasecmp( optarg, "emsi", 4 ))
                 sesstype = SESSION_EMSI;
-            }
 #ifdef WITH_BINKP
                 else if ( !strncasecmp( optarg, "binkp", 5)) {
                     sesstype = SESSION_BINKP;
@@ -414,9 +416,8 @@
         }
     }
 
-    if ( !hostname && daemon <= DM_NONE ) {
+    if ( !hostname && daemon <= DM_NONE )
         usage( argv[0] );
-    }
 
     getsysinfo();
     ssock = lins_sock = uis_sock = -1;
@@ -473,13 +474,11 @@
 
             rc = do_call( &fa, hostname, NULL );
             outbound_unlocknode( &fa, LCK_x );
-        } else {
+        } else
             rc = S_FAILURE;
-        }
 
-        if( rc & S_MASK ) {
+        if( rc & S_MASK )
             write_log( "can't call to %s", ftnaddrtoa( &fa ));
-        }
         outbound_done();
         stopit( rc );
     }
@@ -490,9 +489,9 @@
                 write_log( "can't parse line number '%s'!\n", argv[optind] );
                 exit( S_FAILURE );
             }
-        } else {
-            line = 0;
         }
+        else
+            line = 0;
 
         __CLS_CONN
 
@@ -507,13 +506,12 @@
 
             rc = force_call( &fa, line, call_flags );
             outbound_unlocknode( &fa, LCK_x );
-        } else {
-            rc = S_FAILURE;
         }
+        else
+            rc = S_FAILURE;
 
-        if( rc & S_MASK ) {
+        if( rc & S_MASK )
             write_log( "can't call to %s", ftnaddrtoa( &fa ));
-        }
         outbound_done();
         stopit( rc );
     }
diff -burw ./qico/src/malloc.c ./trunk/src/malloc.c
--- ./qico/src/malloc.c	2024-02-01 18:09:52.568083000 +0300
+++ ./trunk/src/malloc.c	2024-02-01 18:10:34.583733000 +0300
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $Id: malloc.c,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $ */
+/* $Id: malloc.c 18 2010-08-23 15:50:49Z semik $ */
 /* written by Jim Meyering */
 
 #include <config.h>
@@ -34,8 +34,7 @@
 char *
 rpl_malloc (size_t n)
 {
-    if (n == 0) {
+  if (n == 0)
         n = 1;
-    }
   return malloc (n);
 }
diff -burw ./qico/src/md5q.c ./trunk/src/md5q.c
--- ./qico/src/md5q.c	2024-02-01 18:09:52.568229000 +0300
+++ ./trunk/src/md5q.c	2024-02-01 18:10:34.599833000 +0300
@@ -24,9 +24,12 @@
  */
 
 /*
- * $Id: md5q.c,v 1.1 2005/03/28 15:33:56 mitry Exp $
+ * $Id: md5q.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: md5q.c,v $
+ * Revision 1.2  2006/03/11 03:07:32  mitry
+ * Fixed internal md5 stuff if size of long is 8 bytes.
+ *
  * Revision 1.1  2005/03/28 15:33:56  mitry
  * MD5 logic now in separate files
  *
@@ -39,9 +42,9 @@
 #ifndef HAVE_MEMMOVE
 
 static void Encode PROTO_LIST
-((unsigned char *, UINT4 *, unsigned int));
+  ((unsigned char *, UINT32 *, unsigned int));
 static void Decode PROTO_LIST
-((UINT4 *, unsigned char *, unsigned int));
+  ((UINT32 *, unsigned char *, unsigned int));
 
 static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
 #else
@@ -83,7 +86,7 @@
 #define S43 15
 #define S44 21
 
-static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
+static void MD5Transform PROTO_LIST ((UINT32 [4], unsigned char [64]));
 
 static unsigned char PADDING[64] = {
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -106,22 +109,22 @@
 Rotation is separate from addition to prevent recomputation.
  */
 #define FF(a, b, c, d, x, s, ac) { \
-      (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+      (a) += F ((b), (c), (d)) + (x) + (UINT32)(ac); \
       (a) = ROTATE_LEFT ((a), (s)); \
       (a) += (b); \
   }
 #define GG(a, b, c, d, x, s, ac) { \
-      (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+      (a) += G ((b), (c), (d)) + (x) + (UINT32)(ac); \
       (a) = ROTATE_LEFT ((a), (s)); \
       (a) += (b); \
   }
 #define HH(a, b, c, d, x, s, ac) { \
-      (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+      (a) += H ((b), (c), (d)) + (x) + (UINT32)(ac); \
       (a) = ROTATE_LEFT ((a), (s)); \
       (a) += (b); \
   }
 #define II(a, b, c, d, x, s, ac) { \
-      (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+      (a) += I ((b), (c), (d)) + (x) + (UINT32)(ac); \
       (a) = ROTATE_LEFT ((a), (s)); \
       (a) += (b); \
   }
@@ -159,10 +162,9 @@
     index = (unsigned int)((context->count[0] >> 3) & 0x3F);
 
     /* Update number of bits */
-    if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3)) {
+    if ((context->count[0] += ((UINT32)inputLen << 3)) < ((UINT32)inputLen << 3))
         context->count[1]++;
-    }
-    context->count[1] += ((UINT4)inputLen >> 29);
+    context->count[1] += ((UINT32)inputLen >> 29);
 
     partLen = 64 - index;
 
@@ -171,14 +173,13 @@
         MD5_memcpy ((POINTER)&context->buffer[index], (POINTER)input, partLen);
         MD5Transform (context->state, context->buffer);
 
-        for (i = partLen; i + 63 < inputLen; i += 64) {
+        for (i = partLen; i + 63 < inputLen; i += 64)
             MD5Transform (context->state, &input[i]);
-        }
 
         index = 0;
-    } else {
-        i = 0;
     }
+    else
+        i = 0;
 
     /* Buffer remaining input */
     MD5_memcpy ((POINTER)&context->buffer[index], (POINTER)&input[i], inputLen-i);
@@ -216,10 +217,10 @@
 /* MD5 basic transformation. Transforms state based on block.
  */
 static void MD5Transform (state, block)
-UINT4 state[4];
+UINT32 state[4];
 unsigned char block[64];
 {
-    UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+    UINT32 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
 
     Decode (x, block, 64);
 
@@ -306,12 +307,12 @@
 
 #ifndef HAVE_MEMMOVE
 
-/* Encodes input (UINT4) into output (unsigned char). Assumes len is
+/* Encodes input (UINT32) into output (unsigned char). Assumes len is
   a multiple of 4.
  */
 static void Encode (output, input, len)
 unsigned char *output;
-UINT4 *input;
+UINT32 *input;
 unsigned int len;
 {
     unsigned int i, j;
@@ -325,19 +326,19 @@
 }
 
 
-/* Decodes input (unsigned char) into output (UINT4). Assumes len is
+/* Decodes input (unsigned char) into output (UINT32). Assumes len is
   a multiple of 4.
  */
 static void Decode (output, input, len)
-UINT4 *output;
+UINT32 *output;
 unsigned char *input;
 unsigned int len;
 {
     unsigned int i, j;
 
     for (i = 0, j = 0; j < len; i++, j += 4)
-        output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
-                    (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
+        output[i] = ((UINT32)input[j]) | (((UINT32)input[j+1]) << 8) |
+            (((UINT32)input[j+2]) << 16) | (((UINT32)input[j+3]) << 24);
 }
 
 
@@ -351,10 +352,9 @@
 {
     unsigned int i;
 
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < len; i++)
         output[i] = input[i];
     }
-}
 
 #endif /* HAVE_MEMMOVE */
 
@@ -371,10 +371,9 @@
 {
     unsigned int i;
 
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < len; i++)
         ((char *)output)[i] = (char)value;
     }
-}
 
 #endif /* HAVE_MEMSET */
 
@@ -471,8 +470,9 @@
 
 void md5_cram_set(const unsigned char *challenge)
 {
-    long rnd=(long)random(),utm=time(NULL);
-    long pid=((long)getpid())^((long)random());
+	UINT32 rnd = (UINT32)random(), utm = time(NULL);
+	UINT32 pid = ((UINT32)getpid())^((UINT32)random());
+
 	STORE32(challenge,rnd);
 	STORE16(challenge+4,pid)
 	STORE32(challenge+6,utm);
@@ -499,23 +499,18 @@
         char *n;
         int count;
 
-        if (( n = strstr((char *) buf, "CRAM-" )) == NULL ) {
+        if (( n = strstr((char *) buf, "CRAM-" )) == NULL )
             return NULL;
-        }
-        if (( n = strstr( n, "MD5" )) == NULL ) {
+        if (( n = strstr( n, "MD5" )) == NULL )
             return NULL;
-        }
         while( *n && *n++ != '-' );
-        if ( !*n || !isxdigit( *n )) {
+        if ( !*n || !isxdigit( *n ))
             return NULL;
-        }
         count = strspn( n, hexdigitsall );
-        if ( !count ) {
+        if ( !count )
             return NULL;
-        }
-        if ( count > 128 ) {
+        if ( count > 128 )
             count = 128;
-        }
         n[count] = '\0';		/* Just in case */
         count /= 2;
         ret = (unsigned char *) xcalloc( 1, count + 1 );
@@ -530,9 +525,8 @@
     md_caddr_t digest;
     char *ret = NULL;
 
-    if ( !pwd || !challenge ) {
+    if ( !pwd || !challenge )
         return NULL;
-    }
     hmac_md5( challenge + 1, (int) challenge[0], pwd, strlen( pwd ), digest );
     ret = xcalloc( 1, MD5_DIGEST_LEN * 2 + 5 );
     bin2strhex((unsigned char *) ret, digest, MD5_DIGEST_LEN );
diff -burw ./qico/src/md5q.h ./trunk/src/md5q.h
--- ./qico/src/md5q.h	2024-02-01 18:09:52.568311000 +0300
+++ ./trunk/src/md5q.h	2024-02-01 18:10:34.581123000 +0300
@@ -24,9 +24,12 @@
  */
 
 /*
- * $Id: md5q.h,v 1.1 2005/03/28 15:33:56 mitry Exp $
+ * $Id: md5q.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: md5q.h,v $
+ * Revision 1.2  2006/03/11 03:07:32  mitry
+ * Fixed internal md5 stuff if size of long is 8 bytes.
+ *
  * Revision 1.1  2005/03/28 15:33:56  mitry
  * MD5 logic now in separate files
  *
@@ -34,6 +37,7 @@
 
 
 #include "config.h"
+#include "types.h"
 
 #ifndef HAVE_LIBMD
 
@@ -55,22 +59,6 @@
 /* POINTER defines a generic pointer type */
 typedef unsigned char *POINTER;
 
-/* UINT2 defines a two byte word */
-#ifdef UINT16
-typedef UINT16 UINT2;
-#else
-typedef unsigned short int UINT2;
-#endif
-
-/* UINT4 defines a four byte word */
-#ifdef UINT32
-typedef UINT32 UINT4;
-#elif SIZEOF_INT==4
-typedef unsigned int UINT4;
-#else
-typedef unsigned long int UINT4;
-#endif
-
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
   returns an empty list.
@@ -84,8 +72,8 @@
 
 /* MD5 context. */
 typedef struct {
-    UINT4 state[4];                                   /* state (ABCD) */
-    UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
+	UINT32		state[4];	/* state (ABCD) */
+	UINT32		count[2];	/* number of bits, modulo 2^64 (lsb first) */
 	unsigned char	buffer[64];	/* input buffer */
 } MD5_CTX;
 
@@ -97,9 +85,10 @@
 
 typedef unsigned char md_caddr_t[MD5_DIGEST_LEN];
 
-extern void md5_cram_get(const unsigned char *secret, const unsigned char *challenge,
-                         int challenge_length, unsigned char *digest);
-extern void md5_cram_set(const unsigned char *challenge);
+void		md5_cram_get(const unsigned char *, const unsigned char *,
+         		int, unsigned char *);
+void		md5_cram_set(const unsigned char *);
 
-extern unsigned char *md5_challenge(const unsigned char *buf);
-extern char *md5_digest(const char *pwd, const unsigned char *challenge);
+unsigned char	*md5_challenge(const unsigned char *);
+char		*md5_digest(const char *, const unsigned char *);
+
diff -burw ./qico/src/memcmp.c ./trunk/src/memcmp.c
--- ./qico/src/memcmp.c	2024-02-01 18:09:52.568396000 +0300
+++ ./trunk/src/memcmp.c	2024-02-01 18:10:34.606409000 +0300
@@ -1,4 +1,4 @@
-/* $Id: memcmp.c,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+/* $Id: memcmp.c 18 2010-08-23 15:50:49Z semik $
  *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -52,9 +52,8 @@
         register const unsigned char *p1 = s1, *p2 = s2;
 
         do {
-            if (*p1++ != *p2++) {
+			if (*p1++ != *p2++)
                 return (*--p1 - *--p2);
-            }
 		} while (--n != 0);
 	}
 	return (0);
diff -burw ./qico/src/modem.c ./trunk/src/modem.c
--- ./qico/src/modem.c	2024-02-01 18:09:52.568641000 +0300
+++ ./trunk/src/modem.c	2024-02-01 18:10:34.592863000 +0300
@@ -2,9 +2,12 @@
  * Modem routines.
  **********************************************************/
 /*
- * $Id: modem.c,v 1.18 2005/08/16 10:32:19 mitry Exp $
+ * $Id: modem.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: modem.c,v $
+ * Revision 1.19  2006/03/31 19:38:30  mitry
+ * Fixed typo error
+ *
  * Revision 1.18  2005/08/16 10:32:19  mitry
  * Fixed broken calls of loginscript
  *
@@ -67,8 +70,7 @@
 #include "modem.h"
 
 static int dial_rc = MC_OK;
-static char *mcs[] =               /* MC_ defined in tty.h */
-{
+static char *mcs[] = {             /* MC_ defined in tty.h */
     "ok",                          /* MC_OK              0 */
     "fail",                        /* MC_FAIL            1 */
     "error",                       /* MC_ERROR           2 */
@@ -94,26 +96,23 @@
 
     tty_fd = -1;
 
-    if( *dev != '/' ) {
+	if( *dev != '/' )
         xstrcat( port, dev, sizeof( port ));
-    } else {
+	else
         xstrcpy( port, dev, sizeof( port ));
-    }
 
     if (( p = strchr( port, ':' ))) {
         *p++ = '\0';
         speed = atoi( p );
     }
 
-    if ( !speed ) {
+	if ( !speed )
         speed = DEFAULT_SPEED;
-    }
 
     DEBUG(('M',4,"modem_init_device: port %s, speed %d", port, speed));
 
-    if ( tty_lock( port )) {
+	if ( tty_lock( port ))
         return ME_CANTLOCK;
-    }
 
     
 	tty_fd = open( port, O_RDWR | O_NONBLOCK );
@@ -141,7 +140,7 @@
         return ME_ATTRS;
     }
 
-    memcpy( &tio, &tty_stio, sizeof( TIO ));
+	memmove( &tio, &tty_stio, sizeof( TIO ));
 	tio_raw_mode( &tio );
 	tio_local_mode( &tio, TRUE );
 	tio_set_speed( &tio, speed );
@@ -254,9 +253,8 @@
 {
     int rc = 1;
 
-    if ( !cmd ) {
+    if ( !cmd )
         return 1;
-    }
     
     DEBUG(('M',1,">> %s",cmd));
 
@@ -286,23 +284,18 @@
 
         case 'v':
             rc = 0;
-            if ( !strchr( cmd, '^' )) {	/* It's just a 'v' command */
+                if ( !strchr( cmd, '^' ))	/* It's just a 'v' command */
                 goto writeit;
-            }
             cmd++;
             while( *cmd && *cmd != '^' ) {
-                if      ( *cmd == '~' ) {
-                    rc += 1000;
-                } else if ( *cmd == '\'' ) {
-                    rc += 200;
-                }
+                    if      ( *cmd == '~' ) rc += 1000;
+                    else if ( *cmd == '\'' ) rc += 200;
                 cmd++;
             }
-            if ( *cmd != '^' ) {	/* Just in case */
+                if ( *cmd != '^' )		/* Just in case */
                 write_log( "Can't lower dtr without raising it back" );
-            } else {
+                else
                 rc = tio_toggle_dtr( tty_fd, rc > 250 ? rc : 250 ) == OK;
-            }
                 break;
 
             default:
@@ -313,11 +306,10 @@
         cmd++;
     }
 
-    if ( rc > 0 ) {
+    if ( rc > 0 )
         DEBUG(('M',2,"modem_send_str: sent"));
-    } else {
+    else
         DEBUG(('M',2,"modem_send_str: error, rc=%d, errno=%d",rc,errno));
-    }
 
     return rc;
 }
@@ -345,12 +337,11 @@
 
         rc = OK;
         if ( ch == '\r' || ch == '\n' ) {
-            if ( ptr ) {
+            if ( ptr )
                 break;
-            } else {
+            else
                 continue;
             }
-        }
 
         if ( ptr == (int) nbytes ) {
             ptr--;
@@ -359,10 +350,9 @@
             break;
         }
 
-        if ( ch >= 0 ) {
+        if ( ch >= 0 )
             buf[ptr++] = ch;
         }
-    }
     buf[ptr] = '\0';
 
     if ( timer_expired( tout )) {
@@ -384,24 +374,21 @@
 
     DEBUG(('M',1,"modem_chat: cmd=\"%s\" timeout=%d",cmd,timeout));
 
-    if ( rest ) {
+    if ( rest )
         *rest = '\0';
-    }
 
     rc = modem_send_str( cmd );
     if ( rc != 1 ) {
-        if ( rest ) {
+        if ( rest )
             xstrcpy( rest, "FAILURE", restlen );
-        }
         DEBUG(('M',1,"modem_chat: modem_send_str failed, rc=%d",rc));
         return MC_FAIL;
     }
 
     DEBUG(('M',2,"modem_send_str OK"));
 
-    if ( !oks && !ers && !bys ) {
+    if ( !oks && !ers && !bys )
         return MC_OK;
-    }
     
     rc = OK;
     t1 = timer_set( timeout );
@@ -422,28 +409,24 @@
         }
 
         if ( rc != OK ) {
-            if ( rest ) {
+            if ( rest )
                 xstrcpy( rest, "FAILURE", restlen );
-            }
             DEBUG(('M',1,"modem_chat: modem_get_str failed, rc=%d",rc));
             return MC_FAIL;
         }
 
-        if ( !*buf || strcasestr( cmd, buf )) {
+        if ( !*buf || strcasestr( cmd, buf ))
             continue;
-        }
 
         for( cs = oks; cs; cs = cs->next )
             if ( !strncmp( buf, cs->str, strlen( cs->str ))) {
-                if ( rest ) {
+                if ( rest )
                     xstrcpy( rest, buf, restlen );
-                }
                 return MC_OK;
             }
 
-        if ( show ) {
+        if ( show )
             write_log( buf );
-        }
 
         for( cs = ers; cs; cs = cs->next )
             if ( !strncmp( buf, cs->str, strlen( cs->str ))) {
@@ -486,14 +469,13 @@
     }
 
     if ( rest ) {
-        if ( nrings && maxrings && nrings >= maxrings) {
+        if ( nrings && maxrings && nrings >= maxrings)
             snprintf( rest, restlen, "%d RINGINGs", nrings );
-        } else if( ISTO( rc )) {
+        else if( ISTO( rc ))
             xstrcpy( rest, "TIMEOUT", restlen );
-        } else {
+        else
             xstrcpy( rest, "FAILURE", restlen );
         }
-    }
     return MC_FAIL;
 }
 
@@ -508,22 +490,19 @@
 
     DEBUG(('M',2,"modem_stat: cmd=\"%s\" timeout=%d",cmd,timeout));
 
-    if ( stat ) {
+    if ( stat )
         *stat = '\0';
-    }
 
     rc = modem_send_str( cmd );
     if ( rc != 1 ) {
-        if ( stat ) {
+        if ( stat )
             xstrcpy( stat, "FAILURE", stat_len );
-        }
         DEBUG(('M',1,"modem_stat: modem_send_str failed, rc=%d",rc));
         return MC_FAIL;
     }
 
-    if ( !oks && !ers ) {
+    if ( !oks && !ers )
         return MC_OK;
-    }
 
     rc = OK;
     t1 = timer_set( timeout );
@@ -532,31 +511,27 @@
         rc = modem_get_str( buf, MAX_STRING-1, timer_rest( t1 ));
         DEBUG(('M',3,"modem_stat: modem_get_str rc=%d, buf='%s'", rc, buf));
 
-        if ( !*buf || strcasestr( cmd, buf )) {
+        if ( !*buf || strcasestr( cmd, buf ))
             continue;
-        }
 
         if ( rc != OK ) {
-            if ( stat ) {
+            if ( stat )
                 xstrcat( stat, "FAILURE", stat_len );
-            }
             DEBUG(('M',1,"modem_stat: modem_get_str failed"));
             return MC_FAIL;
         }
 
         for( cs = oks; cs; cs = cs->next )
             if ( !strncmp( buf, cs->str, strlen( cs->str ))) {
-                if ( stat ) {
+                if ( stat )
                     xstrcat( stat, buf, stat_len );
-                }
                 return MC_OK;
             }
 
         for( cs = ers; cs; cs = cs->next )
             if ( !strncmp( buf, cs->str, strlen( cs->str ))) {
-                if ( stat ) {
+                if ( stat )
                     xstrcat( stat, buf, stat_len );
-                }
                 return MC_ERROR;
             }
 
@@ -567,12 +542,11 @@
     }
 
     if( stat ) {
-        if ( ISTO( rc )) {
+        if ( ISTO( rc ))
             xstrcat( stat, "TIMEOUT", stat_len );
-        } else {
+        else
             xstrcat( stat, "FAILURE", stat_len );
         }
-    }
     return MC_FAIL;
 }
 
@@ -583,9 +557,8 @@
     int	rc = MC_OK;
 
     ac = cfgs( CFG_MODEMALIVE );
-    if ( ac == NULL ) {
+	if ( ac == NULL )
         return MC_OK;
-    }
 
 	DEBUG(('M',1,"modem_alive: checking modem..."));
 	rc = modem_chat( ac, cfgsl( CFG_MODEMOK ), cfgsl( CFG_MODEMERROR ),
@@ -593,9 +566,8 @@
                      cfgs( CFG_MODEMRINGING ), cfgi( CFG_MAXRINGS ), 5, NULL, 0, 0 );
 
 #ifdef NEED_DEBUG
-    if ( rc != MC_OK ) {
+	if ( rc != MC_OK )
         DEBUG(('M',1,"modem_alive: failed, rc=%d [%s]",rc,mcs[rc]));
-    }
 #endif
 
 	return rc;
@@ -625,21 +597,18 @@
         DEBUG(('M',2,"dial_rc %d",dial_rc));
         if ( rc == MC_OK ) {
             tty_online = FALSE;
-            if ( dial_rc == MC_OK ) {
+			if ( dial_rc == MC_OK )
                 rc = modem_alive();
             }
         }
-    }
 
 #ifdef NEED_DEBUG
-    if ( rc != MC_OK ) {
+	if ( rc != MC_OK )
         DEBUG(('M',1,"modem_hangup: failed, rc=%d [%s]",rc,mcs[rc]));
-    }
 #endif
 
-    if ( tty_dcd( tty_fd )) {
+	if ( tty_dcd( tty_fd ))
         write_log( "WARNING: DCD line still active, check modem settings (AT&Dx)" );
-    }
 
 	tty_purge();
 	return rc;
@@ -652,9 +621,8 @@
     int	rc = MC_OK;
     char	stat[2048], *cur_stat, *p;
 
-    if ( !cfgsl( CFG_MODEMSTAT )) {
+	if ( !cfgsl( CFG_MODEMSTAT ))
         return MC_OK;
-    }
 
 	write_log( "collecting statistics..." );
 
@@ -667,9 +635,8 @@
         for( cur_stat = stat; *cur_stat; ) {
             for( p = cur_stat; *p && *p != '\n' && *p != '\r'; p++ );
 
-            if ( *p ) {
+			if ( *p )
                 *(p++) = '\0';
-            }
 			write_log( "%s", cur_stat );
 			cur_stat = p;
 		}
@@ -683,9 +650,8 @@
     slist_t	*hc;
     int	rc = MC_OK;
 
-    if ( !cfgsl( CFG_MODEMRESET )) {
+	if ( !cfgsl( CFG_MODEMRESET ))
         return MC_OK;
-    }
 
 	DEBUG(('M',1,"modem_reset"));
 
@@ -696,9 +662,8 @@
                          cfgsl( CFG_MODEMERROR ), cfgsl( CFG_MODEMBUSY ),
                          cfgs( CFG_MODEMRINGING ), cfgi( CFG_MAXRINGS ),
                          cfgi( CFG_WAITRESET ), NULL, 0, 1 );
-    if ( rc != MC_OK ) {
+	if ( rc != MC_OK )
         write_log( "modem reset failed, rc=%d [%s]", rc, mcs[rc] );
-    }
     
 	return rc;
 }
@@ -739,15 +704,13 @@
     /* XXX tty_purge(); */
 
     if ( dial_rc != MC_OK ) {
-        if ( *conn ) {
+		if ( *conn )
             write_log( "%s", conn );
-        }
 
         if ( dial_rc == MC_RING ) {
             sline( "RING found..." );
-        } else {
+		} else
             sline( "Call failed - %s", mcs[dial_rc] );
-        }
 		return dial_rc;
 	}
 
@@ -778,7 +741,7 @@
     signal( SIGPIPE, SIG_IGN );
     tty_gothup = FALSE;
 
-    memcpy( &tio, &tty_stio, sizeof( TIO ));
+        memmove( &tio, &tty_stio, sizeof( TIO ));
 
         tio_raw_mode( &tio );
 	tio_set_flow_control( tty_fd, &tio, FLOW_NONE );
diff -burw ./qico/src/modem.h ./trunk/src/modem.h
--- ./qico/src/modem.h	2024-02-01 18:09:52.568696000 +0300
+++ ./trunk/src/modem.h	2024-02-01 18:10:34.603132000 +0300
@@ -1,5 +1,5 @@
 /*
- * $Id: modem.h,v 1.1 2005/05/16 20:33:46 mitry Exp $
+ * $Id: modem.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: modem.h,v $
  * Revision 1.1  2005/05/16 20:33:46  mitry
diff -burw ./qico/src/nodelist.c ./trunk/src/nodelist.c
--- ./qico/src/nodelist.c	2024-02-01 18:09:52.568992000 +0300
+++ ./trunk/src/nodelist.c	2024-02-01 18:10:34.593280000 +0300
@@ -2,9 +2,19 @@
  * work with nodelists
  **********************************************************/
 /*
- * $Id: nodelist.c,v 1.20 2005/08/22 19:41:53 mitry Exp $
+ * $Id: nodelist.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: nodelist.c,v $
+ * Revision 1.23  2007/03/19 23:11:06  mitry
+ * Fix core dump after internet flags implementation
+ *
+ * Revision 1.22  2007/03/07 01:01:27  mitry
+ * Check that IBN/IFC flags contain port if specified (not host)
+ * Add support for IP-only nodes phone style via phonetr
+ *
+ * Revision 1.21  2007/01/28 17:55:00  mitry
+ * Add support for INA flag and IBN/IFC optional port number.
+ *
  * Revision 1.20  2005/08/22 19:41:53  mitry
  * Fixed detection of stale index
  *
@@ -127,18 +137,14 @@
     const idxaddr_t	*bb = (const idxaddr_t *)b;
     int		res;
 
-    if (( res = aa->z - bb->z )) {
+	if (( res = aa->z - bb->z ))
         return res;
-    }
-    if (( res = aa->n - bb->n )) {
+	if (( res = aa->n - bb->n ))
         return res;
-    }
-    if (( res = aa->f - bb->f )) {
+	if (( res = aa->f - bb->f ))
         return res;
-    }
-    if (( res = aa->p - bb->p )) {
+	if (( res = aa->p - bb->p ))
         return res;
-    }
 	return 0;
 }
 
@@ -149,21 +155,16 @@
     const idxaddr_t	*bb = &(((idxent_t *) b)->addr);
     int		res;
 
-    if (( res = aa->z - bb->z )) {
+	if (( res = aa->z - bb->z ))
         return res;
-    }
-    if (( res = aa->n - bb->n )) {
+	if (( res = aa->n - bb->n ))
         return res;
-    }
-    if (( res = aa->f - bb->f )) {
+	if (( res = aa->f - bb->f ))
         return res;
-    }
-    if (( res = aa->p - bb->p )) {
+	if (( res = aa->p - bb->p ))
         return res;
-    }
-    if (( res = ((idxent_t *) a)->index - ((idxent_t *) b)->index )) {
+	if (( res = ((idxent_t *) a)->index - ((idxent_t *) b)->index ))
         return res;
-    }
 	return 0;
 }
 
@@ -172,22 +173,18 @@
 {
     char *p, *q;
 
-    if ( !s || !*s ) {
+	if ( !s || !*s )
         return -1;
-    }
-    if ( !( p = strchr( s, ',' ))) {
+	if ( !( p = strchr( s, ',' )))
         return -1;
-    }
     q = strchr( ++p, ',' );
-    if ( q ) {
+	if ( q )
         *q = 0;
-    }
-    if ( !*p ) {
+	if ( !*p )
         return -1;
-    } else {
+	else
         return atoi( p );
     }
-}
 
 
 /*
@@ -204,22 +201,19 @@
 
     DEBUG(('N',1,"ndl_open"));
 
-    if ( !cfgs( CFG_NLPATH )) {
+	if ( !cfgs( CFG_NLPATH ))
         return NDL_ENOPATH;    /* No nlpath defined */
-    }
 
     xstrcpy( ndlpath, ccs, MAX_PATH );
 
-    if ( ndl_lock( ndlpath, NDL_CHK_LOCK )) {
+	if ( ndl_lock( ndlpath, NDL_CHK_LOCK ))
         return -(NDL_ELOCKED);    /* Nodelist index is locked */
-    }
 
     xstrcat( ndlpath, ndl_idx, MAX_PATH );
 
     idx = fopen( ndlpath, "rb" );
-    if ( !idx ) {
+	if ( !idx )
         return -(NDL_EOPENINDEX);    /* Can't open nodelist index */
-    }
 
 	if ( fread( &idx_header, sizeof( idxh_t ), 1, idx ) != 1 ) {
 		fclose( idx );
@@ -250,7 +244,8 @@
     if ( idx_header.nlists ) {
         ndl_i->lists = xcalloc( idx_header.nlists, sizeof( idx_list_t ));
 
-        for( i = 0; i < idx_header.nlists; i++ ) {
+		for( i = 0; i < idx_header.nlists; i++ )
+		{
 			if ( fread( &ndl_i->lists[i].info, sizeof( idx_l_t ), 1, idx ) != 1 ) {
 				fclose( idx );
 				ndl_close();
@@ -267,7 +262,8 @@
             }
 
             if ( stat( ndl_i->lists[i].name, &sb ) != 0
-                    || ndl_i->lists[i].info.mtime != sb.st_mtime ) {
+				|| ndl_i->lists[i].info.mtime != sb.st_mtime )
+			{
 				DEBUG(('N',3,"ndl_open: index needs recompiling: list '%s' out of date", ndl_i->lists[i].name));
 				fclose( idx );
 				ndl_close();
@@ -283,9 +279,8 @@
     ndl_i->offset = idx_header.offset;
     ndl_i->ecount = idx_header.ecount;
 
-    if ( stat( ndlpath, &sb ) == 0 ) {
+	if ( stat( ndlpath, &sb ) == 0 )
         ndl_i->mtime = sb.st_mtime;
-    }
 
 	DEBUG(('N',3,"ndl_open: path '%s'",ndl_i->path));
 
@@ -322,9 +317,8 @@
 
 static int ndl_get_list_name(int lindex, char *list)
 {
-    if ( !nodelist_index->lists[lindex].name ) {
+	if ( !nodelist_index->lists[lindex].name )
         return 0;
-    }
 
 	xstrcpy( list, nodelist_index->lists[lindex].name, MAX_PATH );
 
@@ -340,9 +334,8 @@
     int		rc;
     struct stat	sb;
 
-    if ( !ndl_get_list_name( index, list )) {
+	if ( !ndl_get_list_name( index, list ))
         return -(NDL_EENTRYNOTFOUND);
-    }
 
 	rc = (( stat( list, &sb ) == 0 ) && ( sb.st_mtime == nodelist_index->lists[index].info.mtime ));
 	DEBUG(('N',1,"ndl_uptodate_file: index %d, rc %d", index + 1, rc));
@@ -356,7 +349,8 @@
     struct stat	sb;
 
     if (( stat( nodelist_index->path, &sb ) != 0 || sb.st_mtime != nodelist_index->mtime )
-            && ndl_refresh() != 1 ) {
+		&& ndl_refresh() != 1 )
+	{
 		DEBUG(('N',1,"ndl_uptodate: index needs recompiling"));
 		return 0;
 	}
@@ -381,16 +375,14 @@
 
     DEBUG(('N',1,"ndl_loadindex: ecount %ld",ndl_i->ecount));
 
-    if ( ndl_i->ecount == 0 ) {
+	if ( ndl_i->ecount == 0 )
         return 1;
-    }
 
     xfree( ndl_i->data );
 
     idx = fopen( ndl_i->path, "rb" );
-    if ( !idx ) {
+	if ( !idx )
         return -(NDL_EOPENINDEX);    /* Can't open nodelist index */
-    }
 
 	if ( fseeko( idx, ndl_i->offset, SEEK_SET ) == -1 ) {
 		fclose( idx );
@@ -452,16 +444,14 @@
     register int	cmp;
 
     DEBUG(('N',2,"ndl_find_entry: data %.8p",nodelist_index->data));
-    if ( !nodelist_index->data ) {
+	if ( !nodelist_index->data )
         return -1;
-    }
 
     for( lim = nodelist_index->ecount; lim != 0; lim >>= 1 ) {
         ptr = base + (lim >> 1);
         cmp = comp_addrie( addr, &nodelist_index->data[ptr].addr );
-        if ( cmp == 0 ) {
+		if ( cmp == 0 )
             return (int) ptr;
-        }
 		if ( cmp > 0 ) {	/* addr > entry: move right */
 			base = ptr + 1;
 			lim--;
@@ -486,15 +476,13 @@
     DEBUG(('N',2,"ndl_read_entry: data %.8p, index %d",
            ndl_i->data,index));
 
-    if ( !ndl_i->data ) {
+	if ( !ndl_i->data )
         return -(NDL_EENTRYNOTFOUND);
-    }
 
     ie = &ndl_i->data[index];
 
-    if ( !ndl_get_list_name( ie->index, list )) {
+	if ( !ndl_get_list_name( ie->index, list ))
         return -(NDL_EENTRYNOTFOUND);
-    }
 
 	/*
 	if ( ndl_uptodate_file( ie->index ) != 1 )
@@ -502,9 +490,8 @@
     */
 
     idx = fopen( list, "rt" );
-    if ( !idx ) {
+	if ( !idx )
         return -(NDL_EOPENLIST);
-    }
 	
 	if ( fseek( idx, ie->offset, SEEK_SET )) {
 		fclose( idx );
@@ -519,10 +506,9 @@
     {
         int l = strlen( ndl_str );
 
-        while( l-- && ( ndl_str[l] == '\n' || ndl_str[l] == '\r' )) {
+		while( l-- && ( ndl_str[l] == '\n' || ndl_str[l] == '\r' ))
             ndl_str[l] = '\0';
         }
-    }
 
 	fclose( idx );
 	return 1;
@@ -540,26 +526,23 @@
     int		ptr;
     char		ndl_str[MAX_STRING + 5], *p, *t;
     idx_t		*ndl_i;
-    ninfo_t		*nlent;
+	ninfo_t		*nlent = NULL;
     ndl_field_t	field = NDL_STATUS;
 
     DEBUG(('N',1,"ndl_query"));
 
-    if ( nodelist_index == NULL && ( ptr = ndl_open()) < 1 ) {
+	if ( nodelist_index == NULL && ( ptr = ndl_open()) < 1 )
         return ptr;
-    }
 
     ndl_i = nodelist_index;
 
     DEBUG(('N',2,"ndl_query: nodelist_index %.8p",nodelist_index));
 
-    if (( ptr = ndl_find_entry( addr )) == -1 ) {
+	if (( ptr = ndl_find_entry( addr )) == -1 )
         return -(NDL_EENTRYNOTFOUND);
-    }
 
-    if (( ptr = ndl_read_entry( (size_t) ptr, ndl_str )) != 1 ) {
+	if (( ptr = ndl_read_entry( (size_t) ptr, ndl_str )) != 1 )
         return ptr;
-    }
 
 	t = ndl_str;
 	nlent = xcalloc( 1, sizeof( ninfo_t ));
@@ -578,15 +561,10 @@
 
         switch( field ) {
         case NDL_STATUS:
-            if ( !strcasecmp( p, "pvt" )) {
-                nlent->type = NT_PVT;
-            } else if ( !strcasecmp( p, "hold" ))	{
-                nlent->type = NT_HOLD;
-            } else if ( !strcasecmp( p, "down" ))	{
-                nlent->type = NT_DOWN;
-            } else if ( !strcasecmp( p, "hub" ))	{
-                nlent->type = NT_HUB;
-            }
+			if ( !strcasecmp( p, "pvt" ))		nlent->type = NT_PVT;
+			else if ( !strcasecmp( p, "hold" ))	nlent->type = NT_HOLD;
+			else if ( !strcasecmp( p, "down" ))	nlent->type = NT_DOWN;
+			else if ( !strcasecmp( p, "hub" ))	nlent->type = NT_HUB;
 			break;
 
 		case NDL_ADDR:
@@ -615,26 +593,47 @@
 
         case NDL_FLAGS:
         default:
-            if ( nlent->type == NT_PVT ) {
+
 #ifdef WITH_BINKP
-                if ( strstr( p, "IBN" )) {
+			if ( strncasecmp( p, "IBN", 3 ) == 0 )
+			{
 				nlent->opt |= MO_BINKP;
+				if ( strlen( p ) > 4 && p[3] == ':' && isdigit((int) p[4] ))
+				{
+					nlent->bp_port = atoi( p + 4 );
 				}
+				DEBUG(('N',4,"ndl_query: BINKP '%s:%d'",p,nlent->bp_port));
+			}
 #endif
-                if ( strstr( p, "IFC" )) {
+
+			if ( strncasecmp( p, "IFC", 3 ) == 0 )
+			{
 				nlent->opt |= MO_IFC;
+				if ( strlen( p ) > 4 && p[3] == ':' && isdigit((int) p[4] ))
+				{
+					nlent->bp_port = atoi( p + 4 );
 				}
+				DEBUG(('N',4,"ndl_query: IFCICO '%s:%d'",p,nlent->ifc_port));
             }
 
             if (( p[0] == 'T' && strlen( p ) == 3 )
-                    || ( strcmp( p, "CM" ) == 0 )) {
+				|| ( strcmp( p, "CM" ) == 0 ))
+			{
 				nlent->wtime = xstrdup( p );
 			}
+
+			if (( strncasecmp( p, "INA:", 4 ) == 0 )
+				&& ( strlen( p ) > 4 ))
+			{
+				nlent->host = xstrdup( p + 4 );
+				DEBUG(('N',4,"ndl_query: INA '%s'",nlent->host));
 			}
+		}
         field++;
     }
 
-    if ( nlent->opt ) {
+	if ( nlent->opt && nlent->host == NULL )
+	{
 		nlent->host = xstrdup( ftnaddrtoia( addr ));
 	}
 
@@ -656,12 +655,11 @@
     vsnprintf( str, sizeof( str ), fmt, args );
     va_end( args );
 
-    if ( msg_con ) {
+	if ( msg_con )
         printf( "%s\n", str );
-    } else {
+	else
         vwrite_log( str, 1 );
     }
-}
 
 
 static int ndl_compile(void)
@@ -682,9 +680,8 @@
     fa.z = cfgal( CFG_ADDRESS )->addr.z;
     fa.n = cfgal( CFG_ADDRESS )->addr.n;
 
-    if ( msg_con ) {
+	if ( msg_con )
         setbuf( stdout, NULL );
-    }
 
 	if ( !cfgs( CFG_NLPATH )) {
 		ndl_log( "Error: nlpath is not defined!" );
@@ -729,9 +726,8 @@
                 xstrcpy( nidx, s, MAX_PATH );
             }
             xstrcpy( s, p, MAX_PATH );
-        } else {
+		} else
             xstrcpy( nidx, npath, MAX_PATH );
-        }
 
 #ifdef NDL_LOG
 		ndl_log( "nidx: %s", nidx );
@@ -756,22 +752,21 @@
             max = -1;
 
             while(( de = readdir( d ))) {
-                if ( de->d_name[0] == '.' ) {
+				if ( de->d_name[0] == '.' )
                     continue;
-                }
 
                 if ( !strncasecmp( de->d_name, s, strlen( s ))) {
                     p = de->d_name + strlen( s );
 
                     if (( *p == '.' ) && strlen( p ) == 4
-                            && strspn( p + 1, "0123456789") == 3 ) {
+						&& strspn( p + 1, "0123456789") == 3 )
+					{
                         char	_n[MAX_PATH + 5];
                         time_t	_mtime = 0;
 
                         snprintf( _n, MAX_PATH, "%s/%s", nidx, de->d_name );
-                        if ( !stat( _n, &sb )) {
+						if ( !stat( _n, &sb ))
                             _mtime = sb.st_mtime;
-                        }
 
 						num = atoi( p + 1 );
 						if ( !msg_con ) {
@@ -796,18 +791,15 @@
 
             closedir( d );
 
-            if ( max < 0 ) {
+			if ( max < 0 )
                 ndl_log( "No lists matching %s/%s.[0-9] found", nidx, s );
-            } else {
+			else
                 snprintf( nodelist, MAX_PATH, "%s/%s", nidx, nlmax );
-            }
-        } else {
+		} else
             snprintf( nodelist, MAX_PATH, "%s/%s", nidx, s );
-        }
 
-        if ( !nodelist[0] ) {
+		if ( !nodelist[0] )
             continue;
-        }
 
 		if ( stat( nodelist, &sb ) == -1 ) {
 			ndl_log( "Can't open %s for reading: %s",
@@ -830,20 +822,17 @@
                 pos = ftello( f );
                 line++;
 
-                if ( !fgets( s, MAX_STRING, f )) {
+				if ( !fgets( s, MAX_STRING, f ))
                     break;
-                }
 
                 if ( *s == ';' || *s == '\r' || *s == '\n'
-                        || *s == 0x1a || !*s ) {
+						|| *s == 0x1a || !*s )
                     continue;
-                }
 
                 if ( !strncmp( s, "Boss,", 5 )) {
                     rc = parseftnaddr( s + 5, &fa, NULL, 0 );
-                    if ( rc ) {
+					if ( rc )
                         gp = 1;
-                    }
 					continue;
 				}
 				
@@ -855,18 +844,19 @@
                     fa.z = fa.n = ndl_ext( s );
                     fa.f = fa.p = 0;
                 } else if ( !strncmp( s, "Host,", 5 )
-                            || !strncmp( s, "Region,", 7 )) {
+					|| !strncmp( s, "Region,", 7 ))
+				{
                     gp = 0;
                     fa.n = ndl_ext( s );
                     fa.f = fa.p = 0;
                 } else if ( !gp && strncmp( s, "Down,", 5 )) {
                     fa.f = ndl_ext( s );
                     fa.p = 0;
-                } else if ( !gp ) {
+				} else if ( !gp )
                     continue;
-                }
 
-                if ( fa.z < 0 || fa.n < 0 || fa.f < 0 || fa.p < 0 ) {
+				if ( fa.z < 0 || fa.n < 0 || fa.f < 0 || fa.p < 0 )
+				{
 					ndl_log( "Can't parse address at line %d of %s",
 						line, qbasename( nodelist ));
 					fclose( idx );
@@ -909,7 +899,8 @@
     fseeko( idx, sizeof( idxh_t ), SEEK_SET );
     for( k = 0; k < nlists; k++ ) {
         if ( fwrite( &lists[k].info, sizeof( idx_l_t ), 1, idx ) != 1
-                || fwrite( lists[k].name, lists[k].info.nsize, 1, idx ) != 1 ) {
+			|| fwrite( lists[k].name, lists[k].info.nsize, 1, idx ) != 1 )
+		{
 			ndl_log( "Can't write index header: %s", strerror( errno ));
 			goto failure;
 		}
@@ -929,21 +920,19 @@
 
         while( k < total - 1 ) {
             if ( !memcmp( &ies[k].addr, &ies[k + 1].addr, sizeof( ies->addr ))) {
-                if ( firsteq < 0 ) {
+				if ( firsteq < 0 )
                     firsteq = k;
-                }
                 lasteq = k + 1;
                 k++;
             } else if ( firsteq >= 0 ) {
-                memcpy( &ies[firsteq + 1], &ies[lasteq + 1],
+				memmove( &ies[firsteq + 1], &ies[lasteq + 1],
                         sizeof( *ies ) * (total - lasteq - 1));
                 firsteq = lasteq = -1;
                 deleted++;
                 total--;
-            } else {
+			} else
                 k++;
             }
-        }
 
 		ndl_log( "%d duplicate records deleted", deleted );
 
@@ -978,9 +967,8 @@
 failure:
     xfree( ies );
     if ( lists ) {
-        for( k = 0; k < nlists; k++ ) {
+		for( k = 0; k < nlists; k++ )
             xfree( lists[k].name );
-        }
 		xfree( lists );
 	}
 	fclose( idx );
@@ -1010,22 +998,19 @@
 {
     int rc = 1;
 
-    if ( nodelist_index == NULL ) {
+	if ( nodelist_index == NULL )
         rc = ndl_open();
-    }
 
-    if ( rc != 1 && rc != -(NDL_ENEEDCOMPILE)) {
+	if ( rc != 1 && rc != -(NDL_ENEEDCOMPILE))
         return rc;
-    }
 
     if ( rc == -(NDL_ENEEDCOMPILE) || ndl_uptodate() != 1 ) {
         ndl_close();
         rc = nodelist_compile( FALSE ) ? 1 : -(NDL_ENEEDCOMPILE);
     }
 
-    if ( rc != 1 ) {
+	if ( rc != 1 )
         return rc;
-    }
 
 	return ndl_query( addr, nl );
 }
@@ -1043,27 +1028,23 @@
     falist_t	*i;
 
     DEBUG(('N',1,"nodelist_listed: needall %d",needall));
-    if ( nodelist_index == NULL ) {
+	if ( nodelist_index == NULL )
         rc = ndl_open();
-    }
 
-    if ( rc != 1 ) {
+	if ( rc != 1 )
         return 0;
-    }
 
     for( i = addrs; i; i = i->next ) {
         rc = ndl_listed_one( &i->addr );
         DEBUG(('N',2,"nodelist_listed: %s, rc %d",ftnaddrtoa(&i->addr),rc));
         if ( needall ) {
-            if ( !rc ) {
+			if ( !rc )
                 return 0;
-            }
         } else {
-            if ( rc ) {
+			if ( rc )
                 return 1;
             }
         }
-    }
 
 	return needall;
 }
@@ -1071,56 +1052,35 @@
 
 void phonetrans(char **pph, slist_t *phtr)
 {
-    int rc=1;
-    slist_t *pht;
+	int rc=1;slist_t *pht;
     char *s, *t,*p, tmp[MAX_STRING + 5];
     char *ph = *pph;
     int len=0;
 
-    if(!*pph || !*ph) {
-        return;
-    }
+	if(!*pph || !*ph) return;
     for(pht=phtr; pht && rc; pht=pht->next) {
         s=xstrdup(pht->str);
         p=strchr(s,' ');
         if(p) {
             *(p++)='\0';
-            while(*p==' ') {
-                p++;
-            }
+			while(*p==' ') p++;
             t=strchr(p,' ');
-            if(t) {
-                *t='\0';
+			if(t) *t='\0';
             }
-        }
         if(strncmp(ph, s, strlen(s))==0) {
-            if(p) {
-                xstrcpy(tmp, p, MAX_STRING);
-            } else {
-                *tmp=0;
-            }
+			if(p) xstrcpy(tmp, p, MAX_STRING);else *tmp=0;
             xstrcat(tmp, ph+strlen(s), MAX_STRING);
             len=strlen(tmp)+1;
-            xfree(ph);
-            ph=xmalloc(len);
-            *pph=ph;
-            xstrcpy(ph, tmp, len);
-            xfree(s);
+			xfree(ph); ph=xmalloc(len); *pph=ph;
+			xstrcpy(ph, tmp, len);xfree(s);
             return;
         }
         if(s[0]=='=') {
-            if(p) {
-                xstrcpy(tmp, p, MAX_STRING);
-            } else {
-                *tmp=0;
-            }
+			if(p) xstrcpy(tmp, p, MAX_STRING);else *tmp=0;
             xstrcat(tmp, ph, MAX_STRING);
             len=strlen(tmp)+1;
-            xfree(ph);
-            ph=xmalloc(len);
-            *pph=ph;
-            xstrcpy(ph, tmp, len);
-            xfree(s);
+			xfree(ph); ph=xmalloc(len); *pph=ph;
+			xstrcpy(ph, tmp, len);xfree(s);
 			return;
 		}
 		xfree(s);
@@ -1140,15 +1100,13 @@
 
         while( *c ) {
             char t = tolower( *c++ );
-            if ( t < 'a' || t > 'x' ) {
+			if ( t < 'a' || t > 'x' )
                 return 0;
             }
         }
-    }
 
-    if ( t < 0 ) {
+	if ( t < 0 )
         t += 1440;
-    }
 
 	t1 = ( toupper((int) p[1] ) - 'A' ) * 60 + ( islower((int) p[1] ) ? 30 : 0 );
 	t2 = ( toupper((int) p[2] ) - 'A' ) * 60 + ( islower((int) p[2] ) ? 29 : -1 );
@@ -1168,12 +1126,11 @@
     u = w;
     while(( p = strsep( &u, "," )) && !rc ) {
         DEBUG(('N',2,"token: '%s'",p));
-        if ( !strcmp( p, "CM" )) {
+		if ( !strcmp( p, "CM" ))
             rc = 1;
-        } else if ( p[0] == 'T' && strlen( p ) == 3 ) {
+		else if ( p[0] == 'T' && strlen( p ) == 3 )
             rc = chktxy( p );
         }
-    }
 
 	xfree( w );
 	DEBUG(('N',2,"checktxy(%s): %d",flags,rc));
@@ -1194,9 +1151,8 @@
     }
 
     while ( *tstr ) {
-        if ( strchr( "0123456789.:", *tstr )) {
+		if ( strchr( "0123456789.:", *tstr ))
             buf[l++] = *tstr;
-        }
 		tstr++;
 	}
 	buf[l] = '\0';
@@ -1205,9 +1161,8 @@
     if ( s ) {
         *day = atoi( s - 1 );
         s++;
-    } else {
+	} else
         s = buf;
-    }
 
 	*hour = atoi( s );
 
@@ -1235,17 +1190,14 @@
 
     DEBUG(('N',1,"checktimegaps: '%s'",ranges));
 
-    if ( !ranges ) {
+	if ( !ranges )
         return 0;
-    }
 
-    if ( !strlen( ranges )) {
+	if ( !strlen( ranges ))
         return 0;
-    }
 
-    if ( !( rs = xstrdup( ranges ))) {
+	if ( !( rs = xstrdup( ranges )))
         return 0;
-    }
 
 	rsrun = rs;
 
@@ -1254,29 +1206,24 @@
 
         DEBUG(('N',2,"token: '%s'",r));
 
-        while( *r == ' ' ) {
+		while( *r == ' ' )
             r++;
-        }
 
-        if ( !*r ) {
+		if ( !*r )
             continue;
-        }
 
-        if ( !strcasecmp( r, "cm" )) {
+		if ( !strcasecmp( r, "cm" ))
             XFR1;
-        }
 
-        if ( !strcasecmp( r, "never" )) {
+		if ( !strcasecmp( r, "never" ))
             XFR0;
-        }
 
         if ( r[0] == 'T' ) {
             if ( chktxy( r ))
                 XFR1
-                else {
+			else
                     continue;
                 }
-        }
 
 		firstDay = secondDay = -1;
 		firstHour = secondHour = -1;
@@ -1288,9 +1235,8 @@
             *p = '\0';
             parsetime( r, &firstDay, &firstHour, &firstMinute );
 
-            if ( firstDay != -1 ) {
+			if ( firstDay != -1 )
                 secondDay = firstDay;
-            }
 			
 			parsetime( p + 1, &secondDay, &secondHour, &secondMinute );
 		} else {
@@ -1300,9 +1246,8 @@
             if ( s ) {
                 firstDay = atoi( r );
                 s++;
-            } else {
+			} else
                 s = r;
-            }
 
 			secondDay = firstDay;
 
@@ -1319,28 +1264,26 @@
                 secondDay < -1    || secondDay > 7 || secondDay == 0 ||
                 secondHour < -1   || secondHour > 24 ||
                 secondMinute < -1 || secondMinute > 59 ||
-                ( secondDay != -1 && secondHour == -1 )) {
+			( secondDay != -1 && secondHour == -1 ))
+		{
             XFR0;
         }
 
         tim = time( NULL );
         ti = localtime( &tim );
         Day = ti->tm_wday;
-        if ( !Day ) {
+		if ( !Day )
             Day = 7;
-        }
 
         Hour = ti->tm_hour;
         Min = ti->tm_min;
         firstMark = firstHour * 60;
-        if ( firstMinute != -1 ) {
+		if ( firstMinute != -1 )
             firstMark += firstMinute;
-        }
 
         secondMark = secondHour * 60;
-        if ( secondMinute != -1 ) {
+		if ( secondMinute != -1 )
             secondMark += secondMinute;
-        }
 
 		currentMark = Hour * 60 + Min;
 
@@ -1353,58 +1296,46 @@
             if ( firstDay < secondDay ) {
                 if ( Day >= firstDay && Day <= secondDay) {
                     if ( firstMark < secondMark ) {
-                        if ( currentMark >= firstMark && currentMark < secondMark ) {
+						if ( currentMark >= firstMark && currentMark < secondMark )
                             XFR1;
-                        }
-                    } else if ( currentMark >= firstMark || currentMark < secondMark ) {
+					} else if ( currentMark >= firstMark || currentMark < secondMark )
                         XFR1;
                     }
-                }
             } else 	if ( firstDay == secondDay ) {
                 if ( Day == firstDay ) {
                     if ( firstMark <= secondMark ) {
-                        if ( currentMark >= firstMark && currentMark < secondMark ) {
+						if ( currentMark >= firstMark && currentMark < secondMark )
                             XFR1;
-                        }
-                    } else if ( currentMark >= firstMark || currentMark < secondMark ) {
+					} else if ( currentMark >= firstMark || currentMark < secondMark )
                         XFR1;
                     }
-                }
             } else if ( Day >= firstDay || Day <= secondDay ) {
                 if ( firstMark <= secondMark ) {
-                    if(currentMark >= firstMark && currentMark < secondMark ) {
+					if(currentMark >= firstMark && currentMark < secondMark )
                         XFR1;
-                    }
-                } else if ( currentMark >= firstMark || currentMark < secondMark ) {
+				} else if ( currentMark >= firstMark || currentMark < secondMark )
                     XFR1;
                 }
-            }
         } else if ( secondHour != -1 ) {
             if ( firstMark <= secondMark ) {
-                if ( currentMark >= firstMark && currentMark < secondMark ) {
+				if ( currentMark >= firstMark && currentMark < secondMark )
                     XFR1;
-                }
-            } else if ( currentMark >= firstMark || currentMark < secondMark ) {
+			} else if ( currentMark >= firstMark || currentMark < secondMark )
                 XFR1;
-            }
         } else if ( firstDay != -1 ) {
             if ( firstMinute != -1 ) {
-                if ( Day == firstDay && Hour == firstHour && Min == firstMinute ) {
+				if ( Day == firstDay && Hour == firstHour && Min == firstMinute )
                     XFR1;
-                }
-            } else if ( Day == firstDay && Hour == firstHour ) {
+			} else if ( Day == firstDay && Hour == firstHour )
                 XFR1;
-            }
         } else {
             if( firstMinute != -1 ) {
-                if ( Hour == firstHour && Min == firstMinute ) {
+				if ( Hour == firstHour && Min == firstMinute )
                     XFR1;
-                }
-            } else if( Hour == firstHour ) {
+			} else if( Hour == firstHour )
                 XFR1;
             }
         }
-    }
 
 	XFR0;
 }
@@ -1444,29 +1375,29 @@
             q->nhids = 0;
         }
 
-        d = xmalloc( sizeof( dialine_t ));
+		d = xcalloc( 1, sizeof( dialine_t ));
 
         /* Insert ind _end_ of list */
         c = q->hiddens;
         if ( !c ) {
             q->current = q->hiddens = d;
         } else {
-            while( c->next ) {
+			while( c->next )
                 c = c->next;
-            }
 			c->next = d;
 		}
 
 		d->num = ++q->nhids;
+		/*
 		d->phone = d->timegaps = d->host = NULL;
 		d->next = NULL;
 		d->flags = 0;
+		*/
 
         pstr = p = xstrdup( skip_blanks( sbs->str ));
         while(( t = strsep( &p, " " ))) {
-            if ( *t == '\0' ) {
+			if ( *t == '\0' )
                 continue;
-            }
 
 			DEBUG(('N',2,"parsesubst: field [%d], token '%s'", (int) field, t ));
 			if ( strcmp( t, "-" ) ) {
@@ -1482,21 +1413,18 @@
                     break;
 
                 case SUBST_FLAGS:
-                    if ( !strcasecmp( t, "ifc" )) {
+					if ( !strcasecmp( t, "ifc" ))
                         d->flags |= MO_IFC;
-                    }
 #ifdef WITH_BINKP
-                    else if ( !strcasecmp( t, "binkp" )) {
+					else if ( !strcasecmp( t, "binkp" ))
                         d->flags |= MO_BINKP;
-                    }
 #endif
-                    else {
+					else
                         ndl_log( "unknown subst flag: '%s'", t );
-                    }
 
-                    if ( d->flags ) {
-                        d->host = xstrdup( d->phone ? d->phone : ftnaddrtoia( &sbs->addr ));
-                        xfree( d->phone );
+					if ( d->flags && d->phone ) {
+						d->host = d->phone;
+						d->phone = NULL;
 						DEBUG(('N',3,"parsesubst: host '%s'", d->host ));
 					}
 					break;
@@ -1520,33 +1448,46 @@
     dialine_t	*d;
     ninfo_t		*from_nl = NULL;
 
-    if ( !sb ) {
+	if ( !sb )
         return 0;
-    }
 
     d = sb->current;
     sb->current = sb->current->next;
-    if ( !sb->current ) {
+	if ( !sb->current )
         sb->current = sb->hiddens;
-    }
 
-    if ( !d->phone && !d->host ) {
+	if ( !d->phone && !d->host )
         nodelist_query( &nl->addrs->addr, &from_nl );
-    }
 
 	if ( d->phone ) {
 		xfree( nl->phone );
 		nl->phone = xstrdup( d->phone );
 	} else if ( from_nl && from_nl->phone ) {
 		xfree( nl->phone );
+		phonetrans( &from_nl->phone, cfgsl( CFG_PHONETR ));
+		if ( from_nl->phone && *from_nl->phone == '\0' )
+			nl->type = NT_PVT;
+		else
         nl->phone = xstrdup( from_nl->phone );
-        phonetrans( &nl->phone, cfgsl( CFG_PHONETR ));
     }
 
-    if ( d->host ) {
+	if ( d->host )
+	{
 		xfree( nl->host );
 		nl->host = xstrdup( d->host );
 	}
+	else if ( from_nl && from_nl->host )
+	{
+		xfree( nl->host );
+		nl->host = xstrdup( from_nl->host );
+		nl->ifc_port = from_nl->ifc_port;
+		nl->bp_port = from_nl->bp_port;
+	}
+	else
+	{
+		xfree( nl->host );
+		nl->host = xstrdup( ftnaddrtoia( &nl->addrs->addr ));
+	}
 
 	if ( d->timegaps ) {
 		xfree( nl->wtime );
@@ -1556,9 +1497,8 @@
     nl->hidnum = ( sb->nhids > 1 ) ? d->num : 0;
     nl->opt &= ~(MO_BINKP|MO_IFC);
     nl->opt |= d->flags;
-    if ( from_nl ) {
+	if ( from_nl )
         nlkill( &from_nl );
-    }
 	return 1;
 }
 
@@ -1588,31 +1528,26 @@
 {
     DEBUG(('N',2,"can_dial: ct %d",ct));
 
-    if ( !nl ) {
+	if ( !nl )
         return 0;
-    }
 
     if ( !nl->host || !*nl->host ) {
         char	*p;
         int	d = 0;
 
-        if ( !*nl->phone ) {
+		if ( !*nl->phone )
             return 0;
-        }
 
         for( p = nl->phone; *p; p++ )
-            if ( !strchr( "0123456789*#TtPpRr,.\"Ww@!-", *p )) {
+			if ( !strchr( "0123456789*#TtPpRr,.\"Ww@!-", *p ))
                 d++;
-            }
 
-        if ( d > 0 ) {
+		if ( d > 0 )
             return 0;
         }
-    }
 
-    if ( ct ) {
+	if ( ct )
         return 1;
-    }
 
 	DEBUG(('N',2,"can_dial: wtime '%s'",nl->wtime));
 	if ( nl->wtime ) {
@@ -1622,7 +1557,8 @@
     }
 
     if ( nl->type == NT_HOLD || nl->type == NT_DOWN
-            || ( nl->type == NT_PVT && !nl->host )) {
+		|| ( nl->type == NT_PVT && !nl->host ))
+	{
 		DEBUG(('N',2,"can_dial: NO by type"));
 		return 0;
 	}
@@ -1659,9 +1595,8 @@
 
 static void nlfree(ninfo_t *nl)
 {
-    if ( !nl ) {
+	if ( !nl )
         return;
-    }
 	falist_kill( &nl->addrs );
 	xfree( nl->name );
 	xfree( nl->place );
@@ -1677,9 +1612,8 @@
 
 void nlkill(ninfo_t **nl)
 {
-    if ( !*nl ) {
+	if ( !*nl )
         return;
-    }
 	nlfree( *nl );
 	xfree( *nl );
 }
diff -burw ./qico/src/nodelist.h ./trunk/src/nodelist.h
--- ./qico/src/nodelist.h	2024-02-01 18:09:52.569065000 +0300
+++ ./trunk/src/nodelist.h	2024-02-01 18:10:34.586520000 +0300
@@ -1,5 +1,5 @@
 /*
- * $Id: nodelist.h,v 1.4 2005/08/11 19:06:53 mitry Exp $
+ * $Id: nodelist.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: nodelist.h,v $
  * Revision 1.4  2005/08/11 19:06:53  mitry
diff -burw ./qico/src/outbound.c ./trunk/src/outbound.c
--- ./qico/src/outbound.c	2024-02-01 18:09:52.569359000 +0300
+++ ./trunk/src/outbound.c	2024-02-01 18:10:34.585578000 +0300
@@ -2,9 +2,12 @@
  * Outbound management.
  **********************************************************/
 /*
- * $Id: outbound.c,v 1.21 2005/08/10 19:45:50 mitry Exp $
+ * $Id: outbound.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: outbound.c,v $
+ * Revision 1.22  2006/04/14 18:51:45  mitry
+ * Changed a bit node (un)lock logic.
+ *
  * Revision 1.21  2005/08/10 19:45:50  mitry
  * Added param to qscandir() to return full path with file name
  *
@@ -104,19 +107,18 @@
                 p_domain = xstrdup( p + 1 );
                 pd_len = strlen( p_domain );
 
-                if ( p == out_internal_tmp ) {
+				if ( p == out_internal_tmp )
                     *(p + 1) = '\0';
-                } else {
+				else
                     *p = '\0';
-                }
+
                 bso_base = xstrdup( out_internal_tmp );
                 bso_defzone = def_zone;
                 rc |= BSO;
-            } else {
+			} else
                 len = 0;
             }
         }
-    }
 
 	if ( !len ) {
 		xfree( bso_base );
@@ -130,26 +132,25 @@
         xstrcpy( out_internal_tmp, asopath, MAX_PATH );
         len = chopc( out_internal_tmp, '/' );
 
-        if ( !len ) {
+		if ( !len )
             aso_base = xstrdup( "/" );
-        } else {
+		else
             aso_base = xstrdup( out_internal_tmp );
-        }
+		
         rc |= ASO;
     }
 
-    if ( !rc ) {
+	if ( !rc )
         return 0;
-    }
 
     if ( stspath && *stspath ) {
         xstrcpy( out_internal_tmp, stspath, MAX_PATH );
         len = chopc( out_internal_tmp, '/' );
-        if ( !len ) {
+
+		if ( !len )
             sts_base = xstrdup( "/" );
-        } else {
+		else
             sts_base = xstrdup( stspath );
-        }
 	} else if ( bsopath ) {
 		sts_base = xstrdup( bsopath );
 	} else if ( asopath ) {
@@ -176,9 +177,8 @@
 
     switch( type ) {
     case ASO:
-        if ( aso_base ) {
+		if ( aso_base )
             snprintf( out_internal_tmp, MAX_PATH, "%s/%d.%d.%d.%d.", aso_base, fa->z, fa->n, fa->f, fa->p) ;
-        }
 		break;
 
 	case BSO:
@@ -203,9 +203,8 @@
         return NULL;
     }
 
-    if ( *out_internal_tmp ) {
+	if ( *out_internal_tmp )
         return out_internal_tmp;
-    }
 
 	return NULL;
 }
@@ -219,22 +218,13 @@
     if ( name ) {
         switch( fl ) {
         case F_NORM:
-        case F_REQ:
-            *e = 'o';
-            break;
-        case F_DIR:
-            *e = 'd';
-            break;
-        case F_CRSH:
-            *e = 'c';
-            break;
-        case F_HOLD:
-            *e = 'h';
-            break;
-        case F_IMM:
-            *e = 'i';
-            break;
+		case F_REQ:  *e = 'o'; break;
+		case F_DIR:  *e = 'd'; break;
+		case F_CRSH: *e = 'c'; break;
+		case F_HOLD: *e = 'h'; break;
+		case F_IMM:  *e = 'i'; break;
 		}
+
 		xstrcat( name, e, MAX_PATH );
 	}
 
@@ -250,22 +240,13 @@
     if ( name ) {
         switch( fl ) {
         case F_NORM:
-        case F_REQ:
-            *e = 'f';
-            break;
-        case F_DIR:
-            *e = 'd';
-            break;
-        case F_CRSH:
-            *e = 'c';
-            break;
-        case F_HOLD:
-            *e = 'h';
-            break;
-        case F_IMM:
-            *e = 'i';
-            break;
+		case F_REQ:  *e = 'f'; break;
+		case F_DIR:  *e = 'd'; break;
+		case F_CRSH: *e = 'c'; break;
+		case F_HOLD: *e = 'h'; break;
+		case F_IMM:  *e = 'i'; break;
 		}
+
 		xstrcat( name, e, MAX_PATH );
 	}
 
@@ -277,9 +258,8 @@
 {
     char *name = get_outbound_name( type, fa );
 
-    if ( name ) {
+	if ( name )
         xstrcat( name, "req", MAX_PATH );
-    }
 
 	return name;
 }
@@ -302,9 +282,11 @@
 static char *get_status_name(const ftnaddr_t *fa)
 {
     if ( sts_base ) {
-        snprintf( out_internal_tmp, MAX_PATH, "%s/%d.%d.%d.%d.qst", sts_base, fa->z, fa->n, fa->f, fa->p);
+		snprintf( out_internal_tmp, MAX_PATH, "%s/%d.%d.%d.%d.qst",
+			sts_base, fa->z, fa->n, fa->f, fa->p);
 		return out_internal_tmp;
 	}
+
 	return NULL;
 }
 
@@ -314,14 +296,13 @@
     size_t len = strlen( flo_name );
 
     DEBUG(('S',3,"out_scan_flo: flo_name == '%s'", flo_name));
-    if ( !strcasecmp( (char *) (flo_name + len - 2), "lo" )) {
+	if ( !strcasecmp( (char *) (flo_name + len - 2), "lo" ))
         (*_each)( flo_name, addr, T_ARCMAIL, outbound_flavor( flo_name[len - 3] ), _rslow );
-    } else if ( !strcasecmp( (char *) (flo_name + len - 2), "ut" )) {
+	else if ( !strcasecmp( (char *) (flo_name + len - 2), "ut" ))
         (*_each)( flo_name, addr, T_NETMAIL, outbound_flavor( flo_name[len - 3] ), _rslow );
-    } else if ( !strcasecmp( (char *) (flo_name + len - 3), "req" )) {
+	else if ( !strcasecmp( (char *) (flo_name + len - 3), "req" ))
         (*_each)( flo_name, addr, T_REQ, F_REQ, _rslow );
     }
-}
 
 
 /*
@@ -334,17 +315,14 @@
 
     DEBUG(('S',3,"aso_select: '%s'",d_name));
 
-    if ( *d_name == '.' ) {
+	if ( *d_name == '.' )
         return 0;
-    }
 
-    if ( strrchr( d_name, '.' ) == NULL ) {
+	if ( strrchr( d_name, '.' ) == NULL )
         return 0;
-    }
 
-    if ( sscanf( d_name, "%u.%u.%u.%u", &len, &len, &len, &len ) != 4 ) {
+	if ( sscanf( d_name, "%u.%u.%u.%u", &len, &len, &len, &len ) != 4 )
         return 0;
-    }
 
 	len = strlen( d_name ) - 4;
 	for( p = ext_lo; *p; p++ )
@@ -368,18 +346,16 @@
     char	**namelist = NULL;
     int	i, n;
 
-    if ( aso_base == NULL ) {
+	if ( aso_base == NULL )
         return 0;
-    }
 
     DEBUG(('S',4,"out_aso_rescan: aso_base == '%s'", aso_base));
 
     n = qscandir( aso_base, &namelist, 0, aso_select, NULL );
     DEBUG(('S',4,"out_aso_rescan: n == %d", n));
 
-    if ( n < 0 ) { /* Error */
+	if ( n < 0 ) /* Error */
         return 0;
-    }
 
 	for( i = 0; i < n; i++ ) {
 		char	*f = qbasename( namelist[i] );
@@ -414,18 +390,15 @@
 
     DEBUG(('S',3,"bso_select: '%s'",d_name));
 
-    if ( *d_name == '.' ) {
+	if ( *d_name == '.' )
         return 0;
-    }
 
     len = strlen( d_name );
-    if ( len != 12 ) {
+	if ( len != 12 )
         return 0;
-    }
 
-    if ( strspn( d_name, "0123456789abcdefABCDEF" ) != 8 ) {
+	if ( strspn( d_name, "0123456789abcdefABCDEF" ) != 8 )
         return 0;
-    }
 
 	for( p = ext_lo; *p; p++ )
 		if ( !strcasecmp( *p, &d_name[len - 4] )) {
@@ -452,16 +425,15 @@
 
     DEBUG(('S',3,"bso_root_select: '%s'",d_name));
 
-    if ( *d_name == '.' ) {
+	if ( *d_name == '.' )
         return 0;
-    }
 
-    if ( strncasecmp( p_domain, d_name, pd_len ) != 0 ) {
+	if ( strncasecmp( p_domain, d_name, pd_len ) != 0 )
         return 0;
-    }
 
     if ( len == pd_len ||
-            ( len - 4 == pd_len && strspn( d_name + len - 3, "0123456789abcdefABCDEF" ) == 3 )) {
+		( len - 4 == pd_len && strspn( d_name + len - 3, "0123456789abcdefABCDEF" ) == 3 ))
+	{
 		DEBUG(('S',3,"bso_root_select: '%s' OK",d_name));
 		return 1;
 	}
@@ -481,17 +453,15 @@
     n = qscandir( zonehold, &namelist, 0, bso_select, qalphasort );
     DEBUG(('S',4,"out_bso_scan_zone: n == %d", n));
 
-    if ( n <= 0 ) { /* Error */
+	if ( n <= 0 ) /* Error */
         return 0;
-    }
 
     p = strrchr( zonehold, '.' );
     if ( p != NULL) {
         sscanf( p, ".%03x", &i );
         a.z = (short) i;
-    } else {
+	} else
         a.z = bso_defzone;
-    }
 
 	for( i = 0; i < n; i++ ) {
 		int	an, af;
@@ -550,9 +520,8 @@
     int	i, n;
     char	**namelist = NULL;
 
-    if ( bso_base == NULL ) {
+	if ( bso_base == NULL )
         return 0;
-    }
 
 	DEBUG(('S',4,"out_bso_rescan: bso_base == '%s', p_domain == '%s'", bso_base, p_domain));
 
@@ -560,9 +529,8 @@
     n = qscandir( bso_base, &namelist, 0, bso_root_select, qalphasort );
     DEBUG(('S',4,"out_bso_rescan: n == %d", n));
 
-    if ( n < 0 ) {
+	if ( n < 0 )
         return 0;
-    }
 
 	/* For each directory found do recursive rescan */
 	for( i = 0; i < n; i++ ) {
@@ -594,101 +562,111 @@
 {
     char *obn = get_busy_name( type, adr, 'b' );
 
-    if ( !obn ) {
+	if ( !obn )
         return 0;
-    }
 
     mkdirs( obn );
 
-    if ( islocked( obn )) {
+	if ( islocked( obn ))
         return 0;
-    }
 
-    if ( l == LCK_s ) {
+	if ( l == LCK_s )
         return lockpid( obn );
-    }
 
-    if ( l == LCK_t ) {
+	if ( l == LCK_t )
         return getpid();
-    }
 
-    if ( islocked( get_busy_name( type, adr, 'c' ))) {
+	if ( islocked( get_busy_name( type, adr, 'c' )))
         return 0;
-    }
     
 	return lockpid( out_internal_tmp );
 }
 
 
+static void out_unlock(int type, const ftnaddr_t *adr, int l)
+{
+	if ( l == LCK_s || l == LCK_x )
+		lunlink( get_busy_name( type, adr, 'b' ));
+
+	if ( l == LCK_c || l == LCK_x )
+		lunlink( get_busy_name( type, adr, 'c' ));
+}
+
+
 /*
  * Returns whether the address is busy. 0 == free, 1 == busy.
  */
 int outbound_addr_busy(const ftnaddr_t *addr)
 {
-    if ( islocked( get_busy_name( ASO, addr, 'b' ))) {
+	if ( islocked( get_busy_name( ASO, addr, 'b' )))
         return 1;
-    }
 
-    if ( islocked( get_busy_name( ASO, addr, 'c' ))) {
+	if ( islocked( get_busy_name( ASO, addr, 'c' )))
         return 1;
-    }
 
-    if ( islocked( get_busy_name( BSO, addr, 'b' ))) {
+	if ( islocked( get_busy_name( BSO, addr, 'b' )))
         return 1;
-    }
 
-    if ( islocked( get_busy_name( BSO, addr, 'c' ) )) {
+	if ( islocked( get_busy_name( BSO, addr, 'c' ) ))
         return 1;
-    }
 
     return 0;
 }
 
 
-int outbound_locknode(const ftnaddr_t *addr, int l)
+int outbound_locknode(ftnaddr_t *addr, int l)
 {
-    int rc = 0;
+	int rc = 0, x = 0;
 
-    if ( aso_base && out_lock( ASO, addr, l )) {
+	if ( aso_base ) {
+		x |= ASO;
+		if ( out_lock( ASO, addr, l ))
         rc |= ASO;
     }
 
-    if ( bso_base && out_lock( BSO, addr, l )) {
+	if ( x != rc )
+		return 0;
+
+	if ( bso_base ) {
+		if ( out_lock( BSO, addr, l )) {
 			rc |= BSO;
+		} else if ( x ) {
+			out_unlock( ASO, addr, l );
+			rc = 0;
 		}
+	}
 	
+	addr->locked = rc;
+	
+	DEBUG(('S',1,"outbound_locknode: %d:%d/%d.%d, locked: %d",
+		addr->z, addr->n, addr->f, addr->p, addr->locked));
     return rc;
 }
 
 
-int outbound_unlocknode(const ftnaddr_t *addr, int l)
+int outbound_unlocknode(ftnaddr_t *addr, int l)
 {
-    if ( l == LCK_t ) {
+	DEBUG(('S',1,"outbound_unlocknode: %d:%d/%d.%d, locked: %d",
+		addr->z, addr->n, addr->f, addr->p, addr->locked));
+
+	if ( !addr->locked )
         return 1;
-    }
 
+        addr->locked = 0;
+
+	if ( l == LCK_t )
+		return 1;
+
     if ( aso_base ) {
-        if ( get_busy_name( ASO, addr, 'b' )) {
-            lunlink( out_internal_tmp );
+		out_unlock( ASO, addr, l );
         }
 
-        if ( get_busy_name( ASO, addr, 'c' )) {
-            lunlink( out_internal_tmp );
-        }
-    }
-
     if ( bso_base ) {
-        if ( get_busy_name( BSO, addr, 'b' )) {
-            lunlink( out_internal_tmp );
-        }
+		out_unlock( BSO, addr, l );
 
-        if ( get_busy_name( BSO, addr, 'c' )) {
-            lunlink( out_internal_tmp );
-        }
-
-        if ( addr->z != bso_defzone ) {
+		if ( addr->z != bso_defzone )
             rmdirs( out_internal_tmp );
-        } else if ( addr->p ) {
+		else if ( addr->p ) {
 			rmdir( out_internal_tmp );
 		}
 	}
@@ -700,20 +678,14 @@
 int outbound_flavor(char fl)
 {
     switch( tolower( fl )) {
-    case 'h':
-        return F_HOLD;
+	case 'h': return F_HOLD;
     case 'f':
     case 'n':
-    case 'o':
-        return F_NORM;
-    case 'd':
-        return F_DIR;
-    case 'c':
-        return F_CRSH;
-    case 'i':
-        return F_IMM;
-    case 'r':
-        return F_REQ;
+	case 'o': return F_NORM;
+	case 'd': return F_DIR;
+	case 'c': return F_CRSH;
+	case 'i': return F_IMM;
+	case 'r': return F_REQ;
 	}
 	return F_ERR;
 }
@@ -723,18 +695,15 @@
 {
     FILE *f = NULL;
 
-    if ( bso_base ) {
+	if ( bso_base )
         f = mdfopen( get_flo_name( BSO, addr, flv ), "at" );
-    }
-    if ( !f && aso_base ) {
+	if ( !f && aso_base )
         f = mdfopen( get_flo_name( ASO, addr, flv ), "at" );
-    }
     if ( f ) {
         slist_t *fl;
 
-        for( fl = files; fl; fl = fl->next ) {
+		for( fl = files; fl; fl = fl->next )
             fprintf( f, "%s\n", fl->str );
-        }
 		fclose( f );
 		return 1;
 	}
@@ -746,18 +715,15 @@
 {
     FILE *f = NULL;
 
-    if ( bso_base ) {
+	if ( bso_base )
         f = mdfopen( get_req_name( BSO, addr ), "at" );
-    }
-    if ( !f && aso_base ) {
+	if ( !f && aso_base )
         f = mdfopen( get_req_name( ASO, addr ), "at" );
-    }
     if ( f ) {
         slist_t *fl;
 
-        for( fl = files; fl; fl = fl->next ) {
+		for( fl = files; fl; fl = fl->next )
             fprintf( f, "%s\r\n", fl->str );
-        }
 		fclose( f );
 		return 1;
 	}
@@ -782,9 +748,8 @@
 
     if((f = mdfopen( name, "wt" ))) {
         fprintf( f, "%d %d %lu %lu", st->try, st->flags, st->htime, st->utime );
-        if ( st->bp.name && st->bp.flags ) {
+		if ( st->bp.name && st->bp.flags )
             fprintf( f, " %d %d %lu %s", st->bp.flags, st->bp.size, st->bp.time, st->bp.name );
-        }
 		fclose( f );
 		return 1;
 	}
@@ -795,9 +760,9 @@
 int outbound_getstatus(const ftnaddr_t *fa, sts_t *st)
 {
     int rc;
-    FILE *f;
 	char	*name = get_status_name( fa );
 	char	tmp[MAX_PATH + 5];
+	FILE	*f;
 
 	tmp[0] = '\0';
 
@@ -812,17 +777,20 @@
                          tmp );
             fclose( f );
 
-            if ( rc < 8 ) {
+#define	RESMASK		( 0x0004 | 0x0008 )
+
+			if ( rc & RESMASK ) {
+				if ( rc == 4 )
                 memset( &st->bp, 0, sizeof( st->bp ));
-            } else if ( *tmp ) {
+				else if ( *tmp )
                 st->bp.name = xstrdup( tmp );
-            }
 
-            if ( rc == 4 || rc == 8 ) {
                 return 1;
             }
-            write_log( "status file %s corrupted", name );
-            xfree( st->bp.name );
+			write_log( "status file %s is corrupted!", name );
+
+#undef	RESMASK
+		
 		}
 	}
 	memset( st, 0, sizeof( sts_t ));
@@ -842,15 +810,9 @@
             off = ftello( f );
             while(fgets(str,MAX_PATH,f)) {
                 p=strrchr(str,'\r');
-                if(!p) {
-                    p=strrchr(str,'\n');
-                }
-                if(p) {
-                    *p=0;
-                }
-                if(!*str) {
-                    continue;
-                }
+            if(!p)p=strrchr(str,'\n');
+            if(p)*p=0;
+            if(!*str)continue;
             p=str;
             switch(*p) {
                 case '~':
@@ -858,20 +820,17 @@
 
                 case '^': /* kill */
                 case '#': /* trunc */
-                case ' ': /* filename starting with directive */
                     p++;
 
                 default:
-                    if (( m = mappath( p )) && *m ) {
+                    if (( m = mappath( p )) && *m )
                         p = m;
-                    }
                     fp = xstrdup( p );
                     m = qbasename( fp );
-                    if ( map && strchr( map, 'L' )) {
+                    if ( map && strchr( map, 'L' ))
                         strlwr( m );
-                    } else if( map && strchr( map, 'U' )) {
+                    else if( map && strchr( map, 'U' ))
                         strupr( m );
-                    }
                     fn = qbasename( p );
                     mapname( fn, map, MAX_PATH - ( fn - str ) - 1 );
                     addflist( fl, fp, xstrdup( fn ), str[0], off, f, 1 );
@@ -934,11 +893,10 @@
                 }
                 xfree( flolist[i] );
             }
-            if ( flo_count > 0 ) {
+		if ( flo_count > 0 )
                 xfree( flolist );
             }
         }
-    }
 	DEBUG(('S',2,"asoflist exp out: m %ld, n %ld, f %ld",totalm,totaln,totalf));
     
         totalm = _tm;
@@ -993,12 +951,10 @@
     for( i = 0; i < ( 5 - (( cfgi( CFG_HOLDOUT ) == 1) && mode )); i++) {
         char *name = NULL;
 
-        if ( bso_base && (name = get_flo_name( BSO, fa, fls[i] ))) {
+		if ( bso_base && (name = get_flo_name( BSO, fa, fls[i] )))
             floflist( fl, name );
-        }
-        if ( aso_base && (name = get_flo_name( ASO, fa, fls[i] ))) {
+		if ( aso_base && (name = get_flo_name( ASO, fa, fls[i] )))
             floflist( fl, name );
-        }
 	}
 	return 0;
 }
diff -burw ./qico/src/perl.c ./trunk/src/perl.c
--- ./qico/src/perl.c	2024-02-01 18:09:52.569505000 +0300
+++ ./trunk/src/perl.c	2024-02-01 18:10:34.605232000 +0300
@@ -2,7 +2,7 @@
  * perl support
  **********************************************************/
 /*
- * $Id: perl.c,v 1.8 2005/08/22 17:17:18 mitry Exp $
+ * $Id: perl.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: perl.c,v $
  * Revision 1.8  2005/08/22 17:17:18  mitry
@@ -94,10 +94,7 @@
     "end_send"
 };
 
-static struct {
-    char *name;
-    int val;
-} perl_const[]= {
+static struct {char *name;int val;} perl_const[]={
 	{"S_OK",S_OK},
 	{"S_NODIAL",S_NODIAL},
 	{"S_REDIAL",S_REDIAL},
@@ -122,9 +119,7 @@
 {
     STRLEN len;
     char *s=SvPV(ERRSV,len);
-    if(!s||!len) {
-        s="(null message)";
-    }
+	if(!s||!len)s="(null message)";
 	write_log("perl %s error:%s%s",perl_subnames[sub],strchr(s,'\n')?"\n":" ",s);
 }
 
@@ -135,18 +130,11 @@
     char *str;
     STRLEN len;
     if(items==1||items==2) {
-        if(items==2) {
-            lvl=SvIV(ST(0));
-        }
+		if(items==2)lvl=SvIV(ST(0));
         str=(char*)SvPV(ST((items-1)),len);
-        if(!lvl) {
-            write_log("%s",len?str:"(empty perl log)");
-        } else {
-            DEBUG(('P',lvl,"%s",len?str:NULL));
-        }
-    } else {
-        write_log("perl wlog() error: wrong number of args");
-    }
+		if(!lvl)write_log("%s",len?str:"(empty perl log)");
+		    else DEBUG(('P',lvl,"%s",len?str:NULL));
+	} else write_log("perl wlog() error: wrong number of args");
 	XSRETURN_EMPTY;
 }
 
@@ -158,19 +146,13 @@
         num=SvIV(ST(0));
         arg=SvTRUE(ST(1));
         DEBUG(('P',3,"perl setflag(%d,%d)",num,arg));
-        if(num<0||num>9) {
-            write_log("perl setflags() error: illegal argument");
-        } else {
-            if(arg) {
-                perl_flg|=1<<num;
-            } else {
-                perl_flg&=~(1<<num);
+		if(num<0||num>9)write_log("perl setflags() error: illegal argument");
+		    else {
+			if(arg)perl_flg|=1<<num;
+			else perl_flg&=~(1<<num);
             }
-        }
 
-    } else {
-        write_log("perl setflags() error: wrong number of args");
-    }
+	} else write_log("perl setflags() error: wrong number of args");
 	XSRETURN_EMPTY;
 }
 
@@ -189,9 +171,7 @@
             slist_kill(&sl);
         }
         DEBUG(('P',3,"perl qexpr(%s), rc=%d",str,rc));
-    } else {
-        write_log("perl qexpr() error: wrong number of args");
-    }
+	} else write_log("perl qexpr() error: wrong number of args");
 	XSRETURN_IV(rc);
 }
 
@@ -220,17 +200,12 @@
     hv_clear(hv);
     for(i=0; i<CFG_NNN; i++)
         for(c=configtab[i].items; c; c=c->next) {
-            if(c->condition) {
-                continue;
-            }
+		if(c->condition)continue;
             switch(configtab[i].type) {
-            case C_PATH:
-            case C_STR: /* $conf{kw} */
+		    case C_PATH: case C_STR: /* $conf{kw} */
                 plhadd_str(hv,sv,configtab[i].keyword,c->value.v_char);
                 break;
-            case C_INT:
-            case C_OCT:
-            case C_YESNO: /* $conf{kw} */
+		    case C_INT: case C_OCT: case C_YESNO: /* $conf{kw} */
 			plhadd_int(hv,sv,configtab[i].keyword,c->value.v_int);
 			break;
 		    case C_STRL: /* @conf{kw} */
@@ -254,8 +229,7 @@
                 plhadd_sv(hv,sv,configtab[i].keyword);
                 break;
             case C_ADRSTRL: /* @conf{kw}{adr|str} */
-                av=newAV();
-                ava=newAV();
+			av=newAV();ava=newAV();
 			for(fasl=c->value.v_fasl;fasl;fasl=fasl->next) {
 				sv=newSVpv(fasl->addr.d?ftnaddrtoda(&fasl->addr):ftnaddrtoa(&fasl->addr),0);
 				SvREADONLY_on(sv);
@@ -282,9 +256,7 @@
     int rc;
     SV *sv;
     char *perlargs[]= {"",NULL,NULL};
-    if(!script||!*script) {
-        return 0;
-    }
+	if(!script||!*script)return 0;
 	DEBUG(('P',2,"perl_init(%s, %d)",script,mode));
 	if(!fexist(script)||access(script,R_OK)) {
 		perl=NULL;
@@ -312,18 +284,15 @@
     }
     perl_run(perl);
     for(rc=0,perl_nc=0; rc<sizeof(perl_subnames)/sizeof(*perl_subnames); rc++)
-        if(perl_get_cv(perl_subnames[rc],FALSE)) {
-            perl_nc|=1<<rc;
-        }
+		if(perl_get_cv(perl_subnames[rc],FALSE))perl_nc|=1<<rc;
     if(!perl_nc) {
         perl_done(0);
         return 0;
     }
     pladd_strz(sv,"version",version);
     perl_setup(mode,1);
-    for(rc=0; rc<sizeof(perl_const)/sizeof(*perl_const); rc++) {
+	for(rc=0;rc<sizeof(perl_const)/sizeof(*perl_const);rc++)
         pladd_int(sv,perl_const[rc].name,perl_const[rc].val);
-    }
 	perl_on_std(PERL_ON_INIT);
 	return 1;
 }
@@ -365,11 +334,9 @@
         PUTBACK;
         FREETMPS;
         LEAVE;
-        if(SvTRUE(ERRSV)) {
-            sub_err(sub);
+		if(SvTRUE(ERRSV))sub_err(sub);
         }
     }
-}
 
 void perl_on_log(char *str)
 {
@@ -381,8 +348,7 @@
         dSP;
         Lock=1;
         DEBUG(('P',5,"perl_on_log(%s)",str));
-        pladd_strz(sv,"_",str);
-        ploffRO(sv);
+		pladd_strz(sv,"_",str);ploffRO(sv);
 		ENTER;
 		SAVETMPS;
 		PUSHMARK(SP);
@@ -390,9 +356,7 @@
         perl_call_pv(perl_subnames[PERL_ON_LOG],G_EVAL|G_SCALAR|G_NOARGS);
         SPAGAIN;
         svret=POPs;
-        if(SvOK(svret)) {
-            rc=SvTRUE(svret);
-        }
+		if(SvOK(svret))rc=SvTRUE(svret);
 		PUTBACK;
 		FREETMPS;
 		LEAVE;
@@ -401,10 +365,9 @@
             rc=1;
         } else if(rc&&sv) {
             char *p=SvPV(sv,len);
-            if(p&&len) {
+			if(p&&len)
                 xstrcpy(str,p,MIN(len+1,LARGE_STRING-1));
             }
-        }
 		Lock=0;
 	}
 }
@@ -428,9 +391,7 @@
         perl_call_pv(perl_subnames[PERL_ON_CALL],G_EVAL|G_SCALAR|G_NOARGS);
         SPAGAIN;
         svret=POPs;
-        if(SvOK(svret)) {
-            rc=SvIV(svret);
-        }
+		if(SvOK(svret))rc=SvIV(svret);
 		PUTBACK;
 		FREETMPS;
 		LEAVE;
@@ -513,9 +474,7 @@
         perl_call_pv(perl_subnames[PERL_ON_SESSION],G_EVAL|G_SCALAR|G_NOARGS);
         SPAGAIN;
         svret=POPs;
-        if(SvOK(svret)) {
-            rc=SvIV(svret);
-        }
+		if(SvOK(svret))rc=SvIV(svret);
 		PUTBACK;
 		FREETMPS;
 		LEAVE;
@@ -550,11 +509,9 @@
         PUTBACK;
         FREETMPS;
         LEAVE;
-        if(SvTRUE(ERRSV)) {
-            sub_err(PERL_END_SESSION);
+		if(SvTRUE(ERRSV))sub_err(PERL_END_SESSION);
         }
     }
-}
 
 int perl_on_recv(void)
 {
@@ -576,9 +533,7 @@
         perl_call_pv(perl_subnames[PERL_ON_RECV],G_EVAL|G_SCALAR|G_NOARGS);
         SPAGAIN;
         svret=POPs;
-        if(SvOK(svret)) {
-            rc=SvIV(svret);
-        }
+		if(SvOK(svret))rc=SvIV(svret);
 		PUTBACK;
 		FREETMPS;
 		LEAVE;
@@ -610,12 +565,8 @@
         svret=POPs;
         if(SvOK(svret)) {
             rc=SvPV(svret,len);
-            if(!len) {
-                rc=NULL;
-            }
-        } else {
-            rc="";
-        }
+			if(!len)rc=NULL;
+		} else rc="";
 		PUTBACK;
 		FREETMPS;
 		LEAVE;
@@ -653,12 +604,8 @@
         svret=POPs;
         if(SvOK(svret)) {
             rc=SvPV(svret,len);
-            if(!len) {
-                rc=NULL;
-            }
-        } else {
-            rc="";
-        }
+			if(!len)rc=NULL;
+		} else rc="";
 		PUTBACK;
 		FREETMPS;
 		LEAVE;
@@ -688,9 +635,7 @@
         PUTBACK;
         FREETMPS;
         LEAVE;
-        if(SvTRUE(ERRSV)) {
-            sub_err(PERL_END_SEND);
-        }
+		if(SvTRUE(ERRSV))sub_err(PERL_END_SEND);
 	}
 }
 
diff -burw ./qico/src/protfm.c ./trunk/src/protfm.c
--- ./qico/src/protfm.c	2024-02-01 18:09:52.569719000 +0300
+++ ./trunk/src/protfm.c	2024-02-01 18:10:34.585917000 +0300
@@ -2,9 +2,12 @@
  * common protocols' file management
  ******************************************************************/
 /*
- * $Id: protfm.c,v 1.18 2005/08/22 17:16:05 mitry Exp $
+ * $Id: protfm.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: protfm.c,v $
+ * Revision 1.19  2006/07/22 13:13:01  mitry
+ * Use file times in GMT on some protocols.
+ *
  * Revision 1.18  2005/08/22 17:16:05  mitry
  * Removed useless static function
  *
@@ -97,13 +100,8 @@
     static char ALLOWED_CHARS[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
     static int CHARS = sizeof(ALLOWED_CHARS) / sizeof(char);
     int i;
-    for(i = 0; i < CHARS; i++) if(*s < ALLOWED_CHARS[i]) {
-            *s = ALLOWED_CHARS[i];
-            break;
-        }
-    if(i == CHARS) {
-        return 1;
-    }
+	for(i = 0; i < CHARS; i++) if(*s < ALLOWED_CHARS[i]) { *s = ALLOWED_CHARS[i]; break; }
+	if(i == CHARS) return 1;
 	return 0;
 }
 
@@ -111,20 +109,12 @@
 {
     static char et[16];
     int h,m,s;
-    if (cps < 1) {
-        cps = baud / 10;
-    }
-    if (!cps) {
-        cps = 1;
-    }
+	if (cps < 1) cps = baud / 10;
+	if (!cps) cps = 1;
     s = size / cps;
-    if (s < 1) {
-        s = 1;
-    }
-    h = s / 3600;
-    s %= 3600;
-    m = s / 60;
-    s %= 60;
+	if (s < 1) s = 1;
+	h = s / 3600; s %= 3600;
+	m = s / 60;   s %= 60;
 	snprintf(et,16,"%02d:%02d:%02d",h,m,s);
 	return et;
 }
@@ -136,29 +126,19 @@
     char p[MAX_PATH + 5], bn[MAX_PATH + 5];
     int prevcps = (recvf.start&&(time(NULL)-recvf.start>2))?recvf.cps:effbaud/10,rc;
 
-    if(!name || !*name) {
-        return FOP_ERROR;
-    }
+	if(!name || !*name) return FOP_ERROR;
     xstrcpy(bn, qbasename(name), MAX_PATH);
     mapname((char*)bn, cfgs(CFG_MAPIN), MAX_PATH);
     recvf.start=time(NULL);
     xfree(recvf.fname);
     recvf.fname=xstrdup(bn);
-    recvf.mtime=rtime-gmtoff(recvf.start);
+	recvf.mtime = rtime - ( ftime_is_gmt ? 0 : gmtoff( recvf.start ));
     recvf.ftot=rsize;
-    if(recvf.toff+rsize > recvf.ttot) {
-        recvf.ttot+=rsize;
-    }
-    recvf.nf++;
-    if(recvf.nf>recvf.allf) {
-        recvf.allf++;
-    }
+	if(recvf.toff+rsize > recvf.ttot) recvf.ttot+=rsize;
+	recvf.nf++;if(recvf.nf>recvf.allf) recvf.allf++;
     IFPerl(if((rc=perl_on_recv())!=FOP_OK)return rc);
-    if(whattype(name)==IS_PKT&&(rsize==60||!rsize)&&cfgi(CFG_KILLBADPKT)) {
-        return FOP_SKIP;
-    }
-    rc=skipiftic;
-    skipiftic=0;
+	if(whattype(name)==IS_PKT&&(rsize==60||!rsize)&&cfgi(CFG_KILLBADPKT))return FOP_SKIP;
+	rc=skipiftic;skipiftic=0;
 	if(rc&&istic(bn)&&cfgi(CFG_AUTOTICSKIP)) {
 		write_log(rc==FOP_SKIP?weskipstr:wesusstr,recvf.fname,"auto");
 		return rc;
@@ -232,42 +212,22 @@
     long cps=time(NULL)-recvf.start;
     int rc,overwrite;
     char *ss, p[MAX_PATH+5], p2[MAX_PATH+5];
-    struct utimbuf ut;
-    struct stat sb;
+	struct utimbuf ut;struct stat sb;
     slist_t *i;
 
-    if(!f || !*f) {
-        return FOP_ERROR;
-    }
-    recvf.toff+=recvf.foff;
-    recvf.stot+=recvf.soff;
+	if(!f || !*f) return FOP_ERROR;
+	recvf.toff+=recvf.foff;recvf.stot+=recvf.soff;
     *p2=0;
-    if(!cps) {
-        cps=1;
-    }
-    cps=(recvf.foff-recvf.soff)/cps;
+	if(!cps) cps=1;cps=(recvf.foff-recvf.soff)/cps;
     IFPerl(if((ss=perl_end_recv(what))) {
-    if(!*ss) {
-            what=FOP_SKIP;
-        } else {
-            xstrcpy(p2,ss,MAX_PATH);
-        }
-    });
+		if(!*ss)what=FOP_SKIP;
+		else xstrcpy(p2,ss,MAX_PATH);});
     switch(what) {
-    case FOP_SUSPEND:
-        ss="suspended";
-        break;
-    case FOP_SKIP:
-        ss="skipped";
-        break;
-    case FOP_ERROR:
-        ss="error";
-        break;
-    case FOP_OK:
-        ss="ok";
-        break;
-    default:
-        ss="";
+		case FOP_SUSPEND: ss="suspended";break;
+		case FOP_SKIP: ss="skipped";break;
+		case FOP_ERROR: ss="error";break;
+		case FOP_OK: ss="ok";break;
+		default: ss="";
 	}
 	if(recvf.soff)
 		write_log("rcvd: %s, %lu bytes (from %lu), %ld cps [%s]",
@@ -275,8 +235,7 @@
     else
         write_log("rcvd: %s, %lu bytes, %ld cps [%s]",
                   recvf.fname, (long) recvf.foff, cps, ss);
-    fclose(*f);
-    *f=NULL;
+	fclose(*f);*f=NULL;
 	snprintf(p, MAX_PATH, "%s/tmp/%s", cfgs(CFG_INBOUND), recvf.fname);
 	if(*p2) {
 		if(*p2!='/'&&*p2=='.')	{
@@ -284,9 +243,7 @@
             snprintf(p2,MAX_PATH,"%s/%s",cfgs(CFG_INBOUND),ss);
             xfree(ss);
         }
-    } else {
-        snprintf(p2, MAX_PATH, "%s/%s", cfgs(CFG_INBOUND), recvf.fname);
-    }
+	} else snprintf(p2, MAX_PATH, "%s/%s", cfgs(CFG_INBOUND), recvf.fname);
 	ut.actime=ut.modtime=recvf.mtime;
 	recvf.foff=0;
 	switch(what) {
@@ -295,29 +252,21 @@
         break;
     case FOP_SUSPEND:
     case FOP_ERROR:
-        if(whattype(p)==IS_PKT&&cfgi(CFG_KILLBADPKT)) {
-            lunlink(p);
-        } else {
-            utime(p,&ut);
-        }
+		if(whattype(p)==IS_PKT&&cfgi(CFG_KILLBADPKT))lunlink(p);
+		    else utime(p,&ut);
         break;
     case FOP_OK:
         rc=receive_callback?receive_callback(p):0;
-        if(rc) {
-            lunlink(p);
-        } else {
-            ss=p2+strlen(p2)-1;
-            overwrite=0;
+		if(rc) lunlink(p);
+		else {
+			ss=p2+strlen(p2)-1;overwrite=0;
             for(i=cfgsl(CFG_ALWAYSOVERWRITE); i; i=i->next)
-                if(!xfnmatch(i->str,recvf.fname,FNM_PATHNAME)) {
+			    if(!xfnmatch(i->str,recvf.fname,FNM_PATHNAME))
                     overwrite=1;
-                }
             while(!overwrite&&!stat(p2, &sb)&&p2[0]) {
                 if(sifname(ss)) {
                     ss--;
-                    while('.' == *ss && ss >= p2) {
-                        ss--;
-                    }
+					while('.' == *ss && ss >= p2) ss--;
 					if(ss < p2) {
 						write_log("can't find suitable name for %s: leaving in temporary directory",p);
 						p2[0] = '\x00';
@@ -325,24 +274,18 @@
                 }
             }
             if(p2[0]) {
-                if(overwrite) {
-                    lunlink(p2);
-                }
+				if(overwrite)lunlink(p2);
                 if(rename(p, p2)) {
                     write_log("can't rename %s to %s: %s",p,p2,strerror(errno));
                 } else {
-                    utime(p2,&ut);
-                    chmod(p2,cfgi(CFG_DEFPERM));
+					utime(p2,&ut);chmod(p2,cfgi(CFG_DEFPERM));
                 }
             }
         }
         break;
     }
-    if(what==FOP_SKIP||what==FOP_SUSPEND) {
-        skipiftic=what;
-    }
-    recvf.start=0;
-    recvf.ftot=0;
+	if(what==FOP_SKIP||what==FOP_SUSPEND)skipiftic=what;
+	recvf.start=0;recvf.ftot=0;
 	rxstatus=0;
 	return what;
 }
@@ -353,36 +296,24 @@
     struct stat sb;
     int prevcps = (sendf.start&&(time(NULL)-sendf.start>2))?sendf.cps:effbaud/10;
 
-    if ( !tosend ) {
+	if ( !tosend )
         return NULL;
-    }
 
     if(stat(tosend, &sb)) {
         write_log("can't find file %s", tosend);
         return NULL;
     }
-    if(whattype(sendas)==IS_PKT&&sb.st_size==60) {
-        return NULL;
-    }
+	if(whattype(sendas)==IS_PKT&&sb.st_size==60)return NULL;
     xfree(sendf.fname);
     sendf.fname=xstrdup(sendas);
     sendf.ftot=sb.st_size;
     sendf.foff=sendf.soff=0;
     sendf.start=time(NULL);
-    sendf.mtime=sb.st_mtime+gmtoff(sendf.start);
-    if(sendf.toff+sb.st_size > sendf.ttot) {
-        sendf.ttot+=sb.st_size;
-    }
-    sendf.nf++;
-    if(sendf.nf>sendf.allf) {
-        sendf.allf++;
-    }
+	sendf.mtime = sb.st_mtime + ( ftime_is_gmt ? 0 : gmtoff( sendf.start ));
+	if(sendf.toff+sb.st_size > sendf.ttot) sendf.ttot+=sb.st_size;
+	sendf.nf++;if(sendf.nf>sendf.allf) sendf.allf++;
     IFPerl({char *p=perl_on_send(tosend); if(p&&!*p)return NULL;
-            if(p)
-    {
-        xfree(sendf.fname);
-            sendf.fname=xstrdup(p);
-        }});
+		if(p){xfree(sendf.fname);sendf.fname=xstrdup(p);}});
 	f=fopen(tosend, "rb");
 	if(!f) {
 		write_log("can't open file %s for reading: %s", tosend,strerror(errno));
@@ -400,50 +331,32 @@
     long cps=time(NULL)-sendf.start;
     char *ss;
 
-    if(!f || !*f) {
-        return FOP_ERROR;
-    }
-    sendf.toff+=sendf.foff;
-    sendf.stot+=sendf.soff;
+	if(!f || !*f) return FOP_ERROR;
+	sendf.toff+=sendf.foff;sendf.stot+=sendf.soff;
 
-    if(!cps) {
-        cps=1;
-    }
-    cps=(sendf.foff-sendf.soff)/cps;
+	if(!cps) cps=1;cps=(sendf.foff-sendf.soff)/cps;
     IFPerl(perl_end_send(what));
     switch(what) {
-    case FOP_SUSPEND:
-        ss="suspended";
-        break;
-    case FOP_SKIP:
-        ss="skipped";
-        break;
-    case FOP_ERROR:
-        ss="error";
-        break;
-    case FOP_OK:
-        ss="ok";
-        break;
-    default:
-        ss="";
+		case FOP_SUSPEND: ss="suspended";break;
+		case FOP_SKIP: ss="skipped";break;
+		case FOP_ERROR: ss="error";break;
+		case FOP_OK: ss="ok";break;
+		default: ss="";
     }
     if(sendf.soff)write_log("sent: %s, %lu bytes (from %lu), %ld cps [%s]",
                                 sendf.fname, (long) sendf.foff, (long) sendf.soff, cps, ss);
     else write_log("sent: %s, %lu bytes, %ld cps [%s]",
                        sendf.fname, (long) sendf.foff, cps, ss);
-    sendf.foff=0;
-    sendf.ftot=0;
+	sendf.foff=0;sendf.ftot=0;
     sendf.start=0;
-    fclose(*f);
-    *f=NULL;
+	fclose(*f);*f=NULL;
     return what;
 }
 
 void chatinit(int prot)
 {
     xstrcpy(hellostr,"\05\05\05",MAX_STRING);
-    strtr(cfgs(CFG_CHATHALLOSTR),'|','\n');
-    strtr(ccs,'$','\a');
+	strtr(cfgs(CFG_CHATHALLOSTR),'|','\n');strtr(ccs,'$','\a');
 	snprintf(hellostr+3,MAX_STRING-7,ccs,rnode->sysop);
 	recode_to_remote(hellostr);
 	xstrcat(hellostr,"\05\05\05",MAX_STRING);
@@ -470,9 +383,7 @@
         break;
 #ifdef WITH_BINKP
     case 0:
-        if(bink) {
-            chatprot=P_BINKP;
-        }
+			if(bink)chatprot=P_BINKP;
 #endif
 	}
 }
@@ -515,12 +426,8 @@
 
 int chatsend(unsigned char *str)
 {
-    if(!str||!*str) {
-        return 0;
-    }
-    if(!c_devfree()) {
-        return 1;
-    }
+	if(!str||!*str)return 0;
+	if(!c_devfree())return 1;
 	if(chattimer<2) {
 		c_devsend((unsigned char*)hellostr,strlen(hellostr)+1);
 		chatlg=chatlog_init(rnode->sysop,&rnode->addrs->addr,0);
@@ -528,15 +435,9 @@
     } else if(*str!=5) {
         xstrcpy( (char*) ubuf, (char*) str, CHAT_BUF);
         recode_to_remote((char*)ubuf);
-        if(!c_devsend(ubuf,strlen((char*)ubuf))) {
-            return 1;
-        }
-        if(chatlg) {
-            chatlog_write((char*)str,0);
-        }
-    } else {
-        write_log("Chat already opened!");
-    }
+		if(!c_devsend(ubuf,strlen((char*)ubuf)))return 1;
+		if(chatlg)chatlog_write((char*)str,0);
+	} else write_log("Chat already opened!");
 	chattimer=time(NULL)+TIM_CHAT;
 	return 0;
 }
@@ -544,29 +445,19 @@
 void c_devrecv(unsigned char *data,unsigned len)
 {
     int i;
-    if(!data||!*data||!len) {
-        return;
-    }
+	if(!data||!*data||!len)return;
     data[len]=0;
     if(chattimer<2) {
         char *p;
-        if(len>5&&data[1]!=5&&(p=strstr((char*)data," * "))&&(strstr(p+3,"lose")||strstr(p+3,"has chat"))) {
-            return;
-        }
+		if(len>5&&data[1]!=5&&(p=strstr((char*)data," * "))&&(strstr(p+3,"lose")||strstr(p+3,"has chat")))return;
         c_devsend((unsigned char*)hellostr,strlen(hellostr));
         chatlg=chatlog_init(rnode->sysop,&rnode->addrs->addr,1);
     }
     recode_to_local((char*)data);
-    if(data[strlen((char*)data)-1]==5) {
-        data[strlen((char*)data)-1]='\n';
-    }
-    for(len=i=0; len<=strlen((char*)data); len++)if(data[len]!=5) {
-            data[i++]=data[len];
-        }
+	if(data[strlen((char*)data)-1]==5)data[strlen((char*)data)-1]='\n';
+	for(len=i=0;len<=strlen((char*)data);len++)if(data[len]!=5)data[i++]=data[len];
     chattimer=time(NULL)+TIM_CHAT;
-    if(chatlg) {
-        chatlog_write((char*)data,1);
-    }
+	if(chatlg)chatlog_write((char*)data,1);
 	qchat((char*)data);
 }
 
@@ -588,23 +479,15 @@
             if(qrcv_buf[3]) {
                 xstrcpy((char*)(qsnd_buf+qsndbuflen),(char*)(qrcv_buf+3),CHAT_BUF-qsndbuflen);
                 qsndbuflen+=strlen((char*)(qrcv_buf+3));
-                if(qsndbuflen>CHAT_BUF-128) {
-                    qsndbuflen=CHAT_BUF-128;
-                }
+					if(qsndbuflen>CHAT_BUF-128)qsndbuflen=CHAT_BUF-128;
             } else {
-                i=chatprot;
-                chatprot=-1;
+					i=chatprot;chatprot=-1;
                 chatsend(qsnd_buf);
-                if(chatlg) {
-                    chatlog_done();
-                }
-                chatlg=0;
-                chatprot=i;
+					if(chatlg)chatlog_done();
+					chatlg=0;chatprot=i;
                 xstrcat((char*)qsnd_buf,"\n * Chat closed\n",CHAT_BUF);
                 chatsend(qsnd_buf);
-                if(chattimer>1) {
-                    qlcerase();
-                }
+					if(chattimer>1)qlcerase();
 					qsndbuflen=0;
 					chattimer=1;
 				}
@@ -612,24 +495,16 @@
         }
         qsnd_buf[qsndbuflen]=0;
     }
-    if(qsndbuflen>0)if(!chatsend(qsnd_buf)) {
-            qsndbuflen=0;
+	if(qsndbuflen>0)if(!chatsend(qsnd_buf))qsndbuflen=0;
         }
-}
 
 void check_cps(void)
 {
     int cpsdelay=cfgi(CFG_MINCPSDELAY),ncps=rnode->realspeed/1000,r=cfgi(CFG_REALMINCPS);
-    if(!(sendf.cps=time(NULL)-sendf.start)) {
-        sendf.cps=1;
-    } else {
-        sendf.cps=(sendf.foff-sendf.soff)/sendf.cps;
-    }
-    if(!(recvf.cps=time(NULL)-recvf.start)) {
-        recvf.cps=1;
-    } else {
-        recvf.cps=(recvf.foff-recvf.soff)/recvf.cps;
-    }
+	if(!(sendf.cps=time(NULL)-sendf.start))sendf.cps=1;
+	    else sendf.cps=(sendf.foff-sendf.soff)/sendf.cps;
+	if(!(recvf.cps=time(NULL)-recvf.start))recvf.cps=1;
+	    else recvf.cps=(recvf.foff-recvf.soff)/recvf.cps;
 	if(sendf.start&&cfgi(CFG_MINCPSOUT)>0&&(time(NULL)-sendf.start)>cpsdelay&&sendf.cps<(r?cci:cci*ncps)) {
 		write_log("mincpsout=%d reached, aborting session",r?cci:cci*ncps);
 		tty_gothup = HUP_CPS;
diff -burw ./qico/src/qcc.c ./trunk/src/qcc.c
--- ./qico/src/qcc.c	2024-02-01 18:09:52.570127000 +0300
+++ ./trunk/src/qcc.c	2024-02-01 18:10:34.596286000 +0300
@@ -2,9 +2,12 @@
  * qico control center.
  **********************************************************/
 /*
- * $Id: qcc.c,v 1.16 2005/08/12 16:40:51 mitry Exp $
+ * $Id: qcc.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: qcc.c,v $
+ * Revision 1.17  2006/07/18 22:30:09  mitry
+ * Delayed cyrillization
+ *
  * Revision 1.16  2005/08/12 16:40:51  mitry
  * Added wktime_str()
  *
@@ -265,25 +268,22 @@
     t = localtime( &tim );
     getyx( wlog, y, x );
     wattron( wlog, A_BOLD );
-    if ( x ) {
+    if ( x )
         waddch( wlog, '\n' );
-    }
     if ( *str != 1 ) {
         snprintf( s, MAX_STRING, "%02d %3s %02d:%02d:%02d: ",
                   t->tm_mday, engms[t->tm_mon], t->tm_hour, t->tm_min, t->tm_sec );
-    } else {
+    } else
         s[0] = '\0';
-    }
 
     va_start( args, str );
     vsnprintf( s + strlen( s ), MAX_STRING - strlen( s ), str, args );
     va_end( args );
     waddnstr( wlog, s + ( *s == 1 ), COL );
     wattroff( wlog, A_BOLD );
-    if ( currslot < 0 ) {
+    if ( currslot < 0 )
         wrefresh( wlog );
     }
-}
 
 
 static void usage(char *ex)
@@ -343,17 +343,12 @@
 
 static void initscreen(void)
 {
-    initscr();
-    start_color();
-    cbreak();
-    noecho();
-    nonl();
+	initscr();start_color();
+	cbreak();noecho();nonl();
     nodelay(stdscr,TRUE);
     keypad(stdscr,TRUE);
     leaveok(stdscr,FALSE);
-    if(LINES<MH*2) {
-        MH=LINES/2-1;
-    }
+	if(LINES<MH*2)MH=LINES/2-1;
 	init_pair(1,COLOR_BLUE,COLOR_BLACK);
 	init_pair(2,COLOR_GREEN,COLOR_BLACK);
 	init_pair(3,COLOR_CYAN,COLOR_BLACK);
@@ -395,9 +390,7 @@
 static void donescreen(void)
 {
     int i;
-    for(i=0; i<allslots; i++) {
-        delwin(slots[i]->wlog);
-    }
+	for(i=0;i<allslots;i++)delwin(slots[i]->wlog);
 	delwin(wlog);
 	delwin(whdr);
 	delwin(wstat);
@@ -414,17 +407,11 @@
     char **hlp=(edm?hi:((currslot<0)?hm:(slots[currslot]->chat?hc:hl)));
     werase(whelp);
     for(i=0; hlp[i]; i++)if(*hlp[i]) {
-            if(i%2) {
-                wattron(whelp,COLOR_PAIR(8));
-            } else {
-                wattron(whelp,COLOR_PAIR(9));
-            }
-            if(*hlp[i]==3&&!slots[currslot]->session) {
-                wattron(whelp,(i%2)?COLOR_PAIR(11):(COLOR_PAIR(10)));
-            }
-            if(*hlp[i]<3&&*hlp[i]!=ins+1) {
-                i++;
-            } else {
+		if(i%2)wattron(whelp,COLOR_PAIR(8));
+		  else wattron(whelp,COLOR_PAIR(9));
+		if(*hlp[i]==3&&!slots[currslot]->session)wattron(whelp,(i%2)?COLOR_PAIR(11):(COLOR_PAIR(10)));
+		if(*hlp[i]<3&&*hlp[i]!=ins+1)i++;
+		    else {
 			mvwaddstr(whelp,0,k,hlp[i]+(*hlp[i]<4));
 			k+=strlen(hlp[i]+(*hlp[i]<4));
 		}
@@ -455,31 +442,23 @@
 {
     static char ts[10];
     long int hr;
-    if(tim<0) {
-        tim=0;
-    }
+	if(tim<0) tim=0;
     hr=tim/3600;
-    snprintf(ts,10,"%02ld:%02ld:%02ld",hr,tim/60-hr*60,tim%60);
+	snprintf(ts,10,"%02ld:%02i:%02i",hr,(int)(tim/60-hr*60),tim%60);
     return ts;
 }
 
 static void bar(int o, int t, int l)
 {
     int i,k=t/l,x=0;
-    for(i=0; i<l; i++,x+=k) {
-        waddch(wmain,(k<o-x+1)?ACS_BLOCK:ACS_CKBOARD);
+	for(i=0;i<l;i++,x+=k)waddch(wmain,(k<o-x+1)?ACS_BLOCK:ACS_CKBOARD);
     }
-}
 
 static void freshpfile(int b, int e, pfile_t *s, int act)
 {
     char bf[20];
-    if(!s->ftot) {
-        return;
-    }
-    if(s->cps<=0) {
-        s->cps=1;
-    }
+	if(!s->ftot)return;
+	if(s->cps<=0)s->cps=1;
 	scrollok(wmain,FALSE);
 	wattrset(wmain,(act?COLOR_PAIR(4):COLOR_PAIR(2))|A_BOLD);
 	mvwprintw(wmain,4,b,"%s file %d of %d",act?"Send":"Receive",s->nf,s->allf);
@@ -491,17 +470,13 @@
     wattroff(wmain,A_BOLD);
     mvwprintw(wmain,6,b,"Current: %ld of %ld bytes",(unsigned long) s->foff,(unsigned long) s->ftot);
     wattron(wmain,A_BOLD);
-    wmove(wmain,7,b);
-    bar(s->foff,s->ftot,e-b-9);
-    waddch(wmain,' ');
+	wmove(wmain,7,b);bar(s->foff,s->ftot,e-b-9);waddch(wmain,' ');
     waddstr(wmain,timestr((s->ftot-s->foff)/s->cps));
     wattrset(wmain,COLOR_PAIR(1));
     mvwprintw(wmain,8,b,"Total: %ld%c of %ld%c",(unsigned long) SIZES(s->toff+s->foff),
               SIZEC(s->toff+s->foff),(unsigned long) SIZES(s->ttot),SIZEC(s->ttot));
     wattron(wmain,A_BOLD);
-    wmove(wmain,9,b);
-    bar(s->toff+s->foff,s->ttot,e-b-9);
-    waddch(wmain,' ');
+	wmove(wmain,9,b);bar(s->toff+s->foff,s->ttot,e-b-9);waddch(wmain,' ');
 	waddstr(wmain,timestr((s->ttot-s->toff-s->foff)/s->cps));
 }
 
@@ -509,17 +484,12 @@
 {
     werase(wmain);
     if(slots[currslot]->chat) {
-        scrollok(wmain,TRUE);
-        wattrset(wmain,COLOR_PAIR(7));
+		scrollok(wmain,TRUE);wattrset(wmain,COLOR_PAIR(7));
         mvwaddnstr(wmain,0,0,slots[currslot]->cl,MH*CHH-1);
-        getyx(wmain,crey,crex);
-        wattron(wmain,A_BOLD|A_BLINK);
-        waddch(wmain,'_');
-        wattroff(wmain,A_BOLD|A_BLINK);
+		getyx(wmain,crey,crex);wattron(wmain,A_BOLD|A_BLINK);
+		waddch(wmain,'_');wattroff(wmain,A_BOLD|A_BLINK);
     } else {
-        if(!slots[currslot]->session) {
-            return;
-        }
+	if(!slots[currslot]->session)return;
 	scrollok(wmain,FALSE);
 	wattrset(wmain,COLOR_PAIR(3)|A_BOLD);
 	mvwprintw(wmain,0,1,"%s // %s",slots[currslot]->name,SS(slots[currslot]->city));
@@ -531,14 +501,12 @@
         mvwaddstr(wmain,2,1,"Addr: ");
         wattroff(wmain,A_BOLD);
         waddnstr(wmain,SS(slots[currslot]->addrs),COL-14);
-        wattrset(wmain,COLOR_PAIR(4));
-        mvwaddch(wmain,2,COL-12,' ');
+	wattrset(wmain,COLOR_PAIR(4));mvwaddch(wmain,2,COL-12,' ');
         mvwaddstr(wmain,2,COL-11,slots[currslot]->options&O_PWD?"[pwd]":"");
         wattrset(wmain,COLOR_PAIR(6));
         mvwaddstr(wmain,2,COLS-8,slots[currslot]->options&O_LST?"[lst]":"");
         wattrset(wmain,COLOR_PAIR(2));
-        mvwhline(wmain,3,0,ACS_HLINE,COL);
-        wattron(wmain,A_BOLD);
+	mvwhline(wmain,3,0,ACS_HLINE,COL);wattron(wmain,A_BOLD);
 	mvwprintw(wmain,3,COLS/2-5,"[%s]",timestr(time(NULL)-slots[currslot]->start));
 	freshpfile(1,COL/2-1,&slots[currslot]->r,0);
 	freshpfile(COL/2+1,COL-1,&slots[currslot]->s,1);
@@ -551,47 +519,36 @@
     int len = 0, y, x = 2, cu = 1;
 
     while( str && *str && x ) {
-        if ( *str == ' ' ) {
+	    if ( *str == ' ' )
             x--;
-        }
         bbf[len++] = *str++;
     }
     while( str && *str && *str++ != ' ' );
-    while( str && *str && *str != ' ' && *str != '.' ) {
+	while( str && *str && *str != ' ' && *str != '.' )
         bbf[len++] = *str++;
-    }
 
     while( str && *str && *str++ != ']' );
     xstrcpy( bbf + len, str, COL - len );
     len = strlen( bbf ) > COL ? COL : strlen( bbf );
 
-    if(s>=0) {
-        cu=(slots[s]->lm==slots[s]->lc);
-    }
+	if(s>=0)cu=(slots[s]->lm==slots[s]->lc);
     getyx(w,y,x);
-    if(cu&&x) {
-        waddch(w,'\n');
-    }
+	if(cu&&x)waddch(w,'\n');
     if(cu) {
         scrollok(w,FALSE);
         waddnstr(w,bbf,COL);
         scrollok(w,TRUE);
     }
-    if(s<0) {
-        return;
-    }
+	if(s<0)return;
     slots[s]->lb[slots[s]->lm]=(char*)xmalloc(len+2);
     if(slots[s]->lb[slots[s]->lm]) {
         xstrcpy(slots[s]->lb[slots[s]->lm],bbf,len+1);
         slots[s]->lm++;
-        if(cu) {
-            slots[s]->lc++;
-        }
+		if(cu)slots[s]->lc++;
         if(slots[s]->lm>=LGMAX) {
             if(!cu) {
-                if(slots[s]->lc) {
-                    slots[s]->lc--;
-                } else {
+				if(slots[s]->lc)slots[s]->lc--;
+				    else {
 					wmove(w,0,0);
 					wdeleteln(w);
 					wmove(w,LOGSIZE-1,0);
@@ -599,13 +556,9 @@
                     waddnstr(w,slots[s]->lb[0],COL);
                     scrollok(w,TRUE);
                 }
-            } else {
-                slots[s]->lc=LGMAX-1;
-            }
+			} else slots[s]->lc=LGMAX-1;
             xfree(slots[s]->lb[0]);
-            for(len=1; len<LGMAX; len++) {
-                slots[s]->lb[len-1]=slots[s]->lb[len];
-            }
+			for(len=1;len<LGMAX;len++)slots[s]->lb[len-1]=slots[s]->lb[len];
 			slots[s]->lm=LGMAX-1;
 			slots[s]->lb[LGMAX-1]=NULL;
 		}
@@ -615,9 +568,7 @@
 static qslot_t *addqueue(qslot_t **l)
 {
     qslot_t **t,*p=NULL;
-    for(t=l; *t; t=&((*t)->next)) {
-        p=*t;
-    }
+	for(t=l;*t;t=&((*t)->next))p=*t;
 	*t=(qslot_t*)xmalloc(sizeof(qslot_t));
 	memset(*t,0,sizeof(qslot_t));
 	(*t)->prev=p;
@@ -653,25 +604,18 @@
     } else for(i=0; q&&i<MH-1; i++,q=q->next) {
             wattrset(wmain,COLOR_PAIR(3)|(q->flags&Q_DIAL?A_BOLD:0));
             current_selector = ( q_pos == q->n );
-            if( current_selector ) {
+		if( current_selector )
                 wattrset(wmain,COLOR_PAIR(16));
-            }
-            for(k=0; k<allslots; k++)if(slots[k]->session&&!strcmp(slots[k]->addrs,q->addr)) {
-                    k=999;
-                }
+		for(k=0;k<allslots;k++)if(slots[k]->session&&!strcmp(slots[k]->addrs,q->addr))k=999;
             mvwaddch(wmain,i+1,0,(k>=999)?'=':' ');
             mvwaddch( wmain, i + 1, 1, current_selector ? '>' : ' ' );
             waddstr(wmain,q->addr);
-            for(k=0; k<COL-24-Q_MAXBIT-strlen(q->addr); k++) {
-                waddch(wmain,' ');
-            }
+		for(k=0;k<COL-24-Q_MAXBIT-strlen(q->addr);k++)waddch(wmain,' ');
             snprintf(str,MAX_STRING," %5lu%c %6lu%c  %3d  ",
                      SIZES(q->mail),SIZEC(q->mail),SIZES(q->files),SIZEC(q->files),q->try);
             waddstr(wmain,str);
             for(k=0,l=1; k<Q_MAXBIT; k++) {
-                if(q_pos!=q->n) {
-                    wattron(wmain,COLOR_PAIR(qclrs[k]));
-                }
+			if(q_pos!=q->n)wattron(wmain,COLOR_PAIR(qclrs[k]));
 			waddch(wmain,(q->flags&l)?qflgs[k]:'.');
 			l<<=1;
 		}
@@ -680,17 +624,11 @@
 
 static void freshall(void)
 {
-    freshhdr();
-    wnoutrefresh(whdr);
-    freshstatus();
-    wnoutrefresh(wstat);
-    freshhelp();
-    wnoutrefresh(whelp);
-    if(currslot>=0) {
-        freshslot();
-    } else {
-        freshqueue();
-    }
+	freshhdr();wnoutrefresh(whdr);
+	freshstatus();wnoutrefresh(wstat);
+	freshhelp();wnoutrefresh(whelp);
+	if(currslot>=0)freshslot();
+	    else freshqueue();
 	wnoutrefresh(wmain);
 	redrawwin(((currslot<0)?wlog:slots[currslot]->wlog));
 	wrefresh((currslot<0)?wlog:slots[currslot]->wlog);
@@ -715,9 +653,7 @@
 static int findslot(char *slt)
 {
     int i;
-    for(i=0; i<allslots; i++)if(!strcmp(slots[i]->tty,slt)) {
-            return i;
-        }
+	for(i=0;i<allslots;i++)if(!strcmp(slots[i]->tty,slt))return i;
 	return -1;
 }
 
@@ -730,22 +666,17 @@
         slots[allslots]->chat=1;
         slots[allslots]->cl=(char*)xcalloc(MH+1,CHH+1);
         restrcpy(&slots[allslots]->header,"Chat");
-        if(d) {
-            beep();
+		if(d)beep();
         }
-    }
     slots[allslots]->wlog=newwin(LOGSIZE,COL,MH+2,1);
-    scrollok(slots[allslots]->wlog,TRUE);
-    flash();
+	scrollok(slots[allslots]->wlog,TRUE);flash();
     return allslots++;
 }
 
 static void delslot(int slt)
 {
     allslots--;
-    if(currslot==allslots||currslot==slt) {
-        currslot--;
-    }
+	if(currslot==allslots||currslot==slt)currslot--;
 	delwin(slots[slt]->wlog);
 	xfree(slots[slt]->cl);
 	while(slots[slt]->lc) {
@@ -753,9 +684,7 @@
         slots[slt]->lc--;
     }
     free(slots[slt]);
-    for(; slt<=allslots; slt++) {
-        slots[slt]=slots[slt+1];
-    }
+	for(;slt<=allslots;slt++)slots[slt]=slots[slt+1];
 	freshall();
 }
 
@@ -763,53 +692,32 @@
 {
     WINDOW *iw;
     int ch,cp=0,sl=0,sp=0,bp=0,vl,i,getkey=0,fr,hstcurr=hstlast,ms,tmp,yp;
-    struct tm *tt;
-    time_t tim;
-    struct timeval tv;
-    fd_set rfds;
+	struct tm *tt;time_t tim;
+	struct timeval tv;fd_set rfds;
     memset(str,0,MAX_STRING);
-    edm=1;
-    freshhelp();
-    wnoutrefresh(whelp);
+	edm=1;freshhelp();wnoutrefresh(whelp);
     ms=mode?(mode==1?40:5):(MAX_STRING-2);
-    if(ms<strlen(name)) {
-        ms=strlen(name)+1;
-    }
-    if((ms+2)>COL) {
-        ms=COL-2;
-    }
-    vl=ms-1;
-    yp=LINES/2-2;
-    if(yp<=MH) {
-        yp=MH+1;
-    }
+	if(ms<strlen(name))ms=strlen(name)+1;
+	if((ms+2)>COL)ms=COL-2;vl=ms-1;
+	yp=LINES/2-2;if(yp<=MH)yp=MH+1;
     iw=newwin(3,ms+2,yp,COL/2-ms/2);
     wbkgd(iw,COLOR_PAIR(8)|' ');
     wattron(iw,COLOR_PAIR(9));
     wborder(iw,ACS_VLINE,ACS_VLINE,ACS_HLINE,ACS_HLINE,ACS_ULCORNER,ACS_URCORNER,ACS_LLCORNER,ACS_LRCORNER);
     wattroff(iw,COLOR_PAIR(8));
-    mvwaddch(iw,0,1,' ');
-    waddstr(iw,name);
-    wnoutrefresh(iw);
-    doupdate();
+	mvwaddch(iw,0,1,' ');waddstr(iw,name);
+	wnoutrefresh(iw);doupdate();
     while(!getkey&&!quitflag) {
-        ch=getch();
-        fr=0;
+		ch=getch();fr=0;
         if(ch>=32&&ch<255) {
-            if(sl>=(mode?(mode==1?40:5):(MAX_STRING-2))||(mode&&!strchr(mode==1?"icdhny:/.@1234567890 ":"1234567890",ch))) {
-                xbeep();
-            } else {
-                if(ins)for(i=sl; i>=sp; i--) {
-                        str[i+1]=str[i];
-                    }
+			if(sl>=(mode?(mode==1?40:5):(MAX_STRING-2))||(mode&&!strchr(mode==1?"icdhny:/.@1234567890 ":"1234567890",ch))){xbeep();}
+			    else {
+				if(ins)for(i=sl;i>=sp;i--)str[i+1]=str[i];
                 str[sp]=(char)ch;
                 sp++;
-                if(ins||sp>sl) {
-                    sl++;
-                }
-                if(cp<vl) {
-                    cp++;
-                } else {
+				if(ins||sp>sl)sl++;
+				if(cp<vl)cp++;
+				    else {
 					bp+=8;
 					cp-=7;
 				}
@@ -819,9 +727,8 @@
             case KEY_LEFT:
                 if(sp) {
                     sp--;
-                    if(cp) {
-                        cp--;
-                    } else if(bp) {
+					if(cp)cp--;
+					    else if(bp) {
 						if(bp<8) {
 							cp=bp-1;
 							bp=0;
@@ -831,48 +738,34 @@
                         }
                         fr=1;
                     }
-                } else {
-                    xbeep();
-                }
+				} else xbeep();
                 break;
             case KEY_RIGHT:
                 if(sp<sl) {
                     sp++;
-                    if(cp<vl) {
-                        cp++;
-                    } else {
+					if(cp<vl)cp++;
+					    else {
                         bp++;
                         fr=1;
                     }
-                } else {
-                    xbeep();
-                }
+				} else xbeep();
                 break;
             case KEY_BACKSPACE:
                 if(sl&&sp) {
-                    sl--;
-                    sp--;
+					sl--;sp--;
                     if(sp==sl) {
                         if(bp) {
-                            if(cp>2) {
-                                cp--;
-                            } else {
+							if(cp>2)cp--;
+							    else {
                                 tmp=bp;
-                                if(bp>(vl/3*2)) {
-                                    bp-=vl/3*2;
-                                } else {
-                                    bp=0;
-                                }
+								if(bp>(vl/3*2))bp-=vl/3*2;
+								    else bp=0;
                                 cp+=tmp-bp-1;
                             }
-                        } else if(cp) {
-                            cp--;
-                        }
+						} else if(cp)cp--;
                     } else {
                         strncpy(str+sp,str+sp+1,sl-sp);
-                        if(cp) {
-                            cp--;
-                        }
+						if(cp)cp--;
 						if(cp<3&&bp) {
 							tmp=vl/3*2;
 							if(bp>tmp) {
@@ -885,20 +778,14 @@
                         }
                     }
                     fr=1;
-                } else {
-                    xbeep();
-                }
+				} else xbeep();
                 break;
             case KEY_DC:
                 if(sp<sl) {
                     sl--;
-                    if(sl) {
-                        strncpy(str+sp,str+sp+1,sl-sp);
-                    }
+					if(sl)strncpy(str+sp,str+sp+1,sl-sp);
                     fr=1;
-                } else {
-                    xbeep();
-                }
+				} else xbeep();
 				break;
 			case KEY_HOME:
 				bp=cp=sp=0;
@@ -919,11 +806,7 @@
                 if(hstcurr&&hstlast) {
                     tmp=hstcurr;
                     for(hstcurr=0; hstcurr<hstlast&&(*hst[hstcurr]!=mode+1); hstcurr++);
-                    if(hstcurr==hstlast) {
-                        hstcurr=tmp;
-                        xbeep();
-                        break;
-                    }
+					if(hstcurr==hstlast){hstcurr=tmp;xbeep();break;}
 					hstcurr++;
 				}
 			case KEY_UP:
@@ -933,11 +816,8 @@
                         strcpy(hst[HSTMAX]+1,str);
                         *hst[HSTMAX]=mode+1;
                     }
-                    tmp=hstcurr;
-                    hstcurr--;
-                    while(hstcurr&&(*hst[hstcurr]!=mode+1)) {
-                        hstcurr--;
-                    }
+					tmp=hstcurr;hstcurr--;
+					while(hstcurr&&(*hst[hstcurr]!=mode+1))hstcurr--;
 					if(*hst[hstcurr]==mode+1) {
 						strcpy(str,hst[hstcurr]+1);
 						sp=sl=strlen(str);
@@ -951,24 +831,17 @@
                         fr=1;
                     } else {
                         hstcurr=tmp;
-                        if(hstcurr==hstlast) {
-                            xfree(hst[HSTMAX]);
-                        }
+						if(hstcurr==hstlast)xfree(hst[HSTMAX]);
                         xbeep();
                     }
-                } else {
-                    xbeep();
-                }
+				} else xbeep();
                 break;
             case KEY_DOWN:
                 if(hstcurr<hstlast) {
                     hstcurr++;
-                    while(hstcurr<hstlast&&hst[hstcurr]&&(*hst[hstcurr]!=mode+1)) {
-                        hstcurr++;
-                    }
-                    if(hst[hstcurr]) {
-                        strcpy(str,hst[hstcurr]+1);
-                    } else {
+					while(hstcurr<hstlast&&hst[hstcurr]&&(*hst[hstcurr]!=mode+1))hstcurr++;
+					if(hst[hstcurr])strcpy(str,hst[hstcurr]+1);
+					    else {
 						strcpy(str,hst[HSTMAX]+1);
 						xfree(hst[HSTMAX]);
 					}
@@ -980,15 +853,12 @@
                         cp=sl;
                         bp=0;
                     }
-                } else {
-                    xbeep();
-                }
+				} else xbeep();
                 fr=1;
                 break;
             case KEY_IC:
                 ins^=1;
-                freshhelp();
-                wnoutrefresh(whelp);
+				freshhelp();wnoutrefresh(whelp);
 				break;
 			case KEY_NPAGE:
 				xfree(hst[HSTMAX]);
@@ -996,13 +866,10 @@
                 hstcurr=hstlast;
                 fr=1;
                 break;
-            case '\r':
-            case '\n':
+			case '\r': case '\n':
                 str[sl]=0;
                 tmp=hstlast?(hstlast-1):0;
-                while(tmp&&(*hst[tmp]!=mode+1)) {
-                    tmp--;
-                }
+				while(tmp&&(*hst[tmp]!=mode+1))tmp--;
 				if(*str&&strlen(str)>1&&(!hst[tmp]||strcmp(str,hst[tmp]+1))) {
 					hst[hstlast]=(char*)xmalloc(strlen(str)+2);
 					if(hst[hstlast]) {
@@ -1011,9 +878,7 @@
                         hstlast++;
                         if(hstlast>=HSTMAX) {
                             xfree(hst[0]);
-                            for(i=1; i<HSTMAX; i++) {
-                                hst[i-1]=hst[i];
-                            }
+							for(i=1;i<HSTMAX;i++)hst[i-1]=hst[i];
 							hstlast=HSTMAX-1;
 							hst[hstlast]=NULL;
 						}
@@ -1023,48 +888,38 @@
                 hstcurr=hstlast;
                 getkey=fr=1;
                 break;
-            case 0x1b:
-            case KEY_F(8):
+			case 0x1b: case KEY_F(8):
                 getkey=fr=1;
                 bp=sp=cp=sl=0;
                 break;
             default:
                 while(getmessages(NULL)>0);
-                tim=time(NULL);
-                tt=localtime(&tim);
+				tim=time(NULL);tt=localtime(&tim);
                 wattron(whdr,COLOR_PAIR(15));
                 mvwprintw(whdr,0,COL-11,"%02d:%02d:%02d",tt->tm_hour,tt->tm_min,tt->tm_sec);
                 wnoutrefresh(whdr);
                 wmove(iw,1,cp+1);
                 wnoutrefresh(iw);
                 doupdate();
-                FD_ZERO(&rfds);
-                FD_SET(0,&rfds);
-                tv.tv_sec=0;
-                tv.tv_usec=5000;
+				FD_ZERO(&rfds);FD_SET(0,&rfds);
+				tv.tv_sec=0;tv.tv_usec=5000;
                 select(1,&rfds,NULL,NULL,&tv);
                 break;
             }
         str[sl]=0;
         if(fr) {
             mvwaddnstr(iw,1,1,"                                                                                                                                                   ",ms);
-            if(str[bp]) {
-                mvwaddnstr(iw,1,1,str+bp,vl);
+			if(str[bp])mvwaddnstr(iw,1,1,str+bp,vl);
+			wnoutrefresh(iw);doupdate();
             }
-            wnoutrefresh(iw);
-            doupdate();
         }
-    }
     delwin(iw);
     if(yp==MH+1) {
         attrset(COLOR_PAIR(2));
         mvhline(MH+1,1,ACS_HLINE,COL);
     }
-    refresh();
-    edm=0;
-    freshall();
-    freshhelp();
-    wnoutrefresh(whelp);
+	refresh();edm=0;freshall();
+	freshhelp();wnoutrefresh(whelp);
 	return(*(char*)str);
 }
 
@@ -1074,60 +929,32 @@
     char buf[MAX_STRING + 5],*nm;
     static char ou[64];
     unsigned long zone,net,node,n,point=0;
-    if(!myaddr) {
-        myaddr="0:0/0";
-    }
-rei:
-    zone=strtoul(myaddr,&nm,10);
+	if(!myaddr)myaddr="0:0/0";
+rei:	zone=strtoul(myaddr,&nm,10);
     net=strtoul(nm+1,&nm,10);
     node=strtoul(nm+1,&nm,10);
-    if(*nm=='.') {
-        point=strtoul(nm+1,NULL,10);
-    }
+	if(*nm=='.')point=strtoul(nm+1,NULL,10);
     inputstr(buf,name,1);
-    *(long*)ou=0;
-    flv='n';
+	*(long*)ou=0;flv='n';
     if(*buf>32) {
         for(i=0,n=0; i<strlen(buf)&&flv!='e'; i++) {
-            if(buf[i]>='0'&&buf[i]<='9') {
-                n=n*10+buf[i]-'0';
-                if(n>32767) {
-                    beep();
-                    goto rei;
+			if(buf[i]>='0'&&buf[i]<='9'){n=n*10+buf[i]-'0';if(n>32767){beep();goto rei;}}
+			  else if(buf[i]==':'){zone=n?n:zone;n=0;}
+			    else if(buf[i]=='/'){net=n?n:net;n=0;}
+			      else if(buf[i]=='.'){node=n?n:node;n=0;}
+				else if(strchr("icdhny",buf[i]))flv=buf[i];
+		    		  else if(buf[i]!=' '&&buf[i]!='@')flv='e';
                 }
-            } else if(buf[i]==':') {
-                zone=n?n:zone;
-                n=0;
-            } else if(buf[i]=='/') {
-                net=n?n:net;
-                n=0;
-            } else if(buf[i]=='.') {
-                node=n?n:node;
-                n=0;
-            } else if(strchr("icdhny",buf[i])) {
-                flv=buf[i];
-            } else if(buf[i]!=' '&&buf[i]!='@') {
-                flv='e';
-            }
-        }
-        if(strchr(buf,'.')) {
-            point=n?n:point;
-        } else {
-            node=n?n:node;
-            point=0;
-        }
+		if(strchr(buf,'.'))point=n?n:point;
+		    else {node=n?n:node;point=0;}
         snprintf(ou,63,"%c%lu:%lu/%lu",flv,zone,net,node);
-        if(point) {
-            snprintf(ou+strlen(ou),63 - strlen(ou),".%lu",point);
-        }
+		if(point)snprintf(ou+strlen(ou),63 - strlen(ou),".%lu",point);
         if(flv=='e') {
             write_log("err: in: '%s', ident as '%s', ignored",buf,ou);
             *(int*)ou=0;
         }
 #if QDEBUG==1
-        else {
-            write_log("in: '%s', ident as '%s'",buf,ou);
-        }
+		else write_log("in: '%s', ident as '%s'",buf,ou);
 #endif
 	}
 	return ou;
@@ -1140,10 +967,8 @@
 #if QDEBUG==1
     write_log("send: [%d] '%s','%s'",buf[2],buf+3,buf+4+strlen(buf+3));
 #endif
-    if(xsend(sock,buf,len)<0) {
-        write_log("can't send to server: %s",strerror(errno));
+	if(xsend(sock,buf,len)<0)write_log("can't send to server: %s",strerror(errno));
     }
-}
 
 static void xcmdslot(char *buf, int cmd, int len)
 {
@@ -1152,41 +977,35 @@
 #if QDEBUG==1
     write_log("sendslot: [%d] '%s','%s'",buf[2],buf+3,buf+4+strlen(buf+3));
 #endif
-    if(xsend(sock,buf,len)<0) {
-        write_log("can't send to server: %s",strerror(errno));
+	if(xsend(sock,buf,len)<0)write_log("can't send to server: %s",strerror(errno));
     }
-}
 
 static void printinfo(char *addr, int what, char *buf)
 {
     int	rc;
     char	*p, *t;
 
-    if ( strchr( "NDICH", toupper( *addr ))) {
+	if ( strchr( "NDICH", toupper( *addr )))
         addr++;
-    } else if( what ) {
+	else if( what )
         return;
-    }
 
-    if ( !addr || !*addr ) {
+	if ( !addr || !*addr )
         return;
-    }
 
     xstrcpy( buf + 3, addr, 64 );
     xcmd( buf, QR_INFO, strlen( addr ) + 4 );
     while( getmessages( buf ) > 0 );
 
     rc = buf[2];
-    if ( rc ) {
+	if ( rc )
         return;
-    }
 
     for( p = buf + 3; strlen( p ); rc++ ) {
         write_log( "%s: %s", infostrs[rc], p );
 
-        if ( rc == 5 && (t = wktime_str( p ))) {
+		if ( rc == 5 && (t = wktime_str( p )))
             write_log( " WkTime: %s", t );
-        }
 
 		p += strlen( p ) + 1;
 	}
@@ -1201,42 +1020,29 @@
     char buf[MSG_BUFFER];
     unsigned char *data,*p;
     rc=xrecv(sock,buf,MSG_BUFFER-1,0);
-    if(!rc) {
-        return -1;
-    }
-    if(rc>0&&rc<MSG_BUFFER) {
-        buf[rc]=0;
-    }
+	if(!rc)return -1;
+	if(rc>0&&rc<MSG_BUFFER)buf[rc]=0;
 #if QDEBUG==1
-    if(rc>0) {
-        write_log("recv: [%d,%d] '%s','%s'",buf[2],rc,buf+3,buf+4+strlen(buf+3));
-    }
+	if(rc>0)write_log("recv: [%d,%d] '%s','%s'",buf[2],rc,buf+3,buf+4+strlen(buf+3));
 #endif
     if(bbx&&rc>=3&&buf[2]<8) {
-        memcpy(bbx,buf,rc);
+		memmove(bbx,buf,rc);
         return 0;
     }
-    if(bbx&&allslots==-9) {
-        return 1;
-    }
+	if(bbx&&allslots==-9)return 1;
     if(rc>=3) {
         id=FETCH16(buf);
         type=buf[2];
-        if(type<8) {
-            return 1;
-        }
+		if(type<8)return 1;
         data=(unsigned char*)(strchr(buf+3,0)+1);
         len=rc-4-strlen(buf+3);
         if(strcmp(buf+3,"master")) {
-            if(!strcasecmp(buf+3,"ipline")) {
-                snprintf(buf+5,5,"%04x",id);
-            }
+			if(!strcasecmp(buf+3,"ipline"))snprintf(buf+5,5,"%04x",id);
             rc=findslot(buf+3);
             if(type==QC_ERASE) {
                 if(rc>=0&&allslots<MAX_SLOTS&&buf[3]=='i'&&buf[4]=='p') {
                     xstrcpy(slots[rc]->tty,"ipline",QCC_TTYLEN);
-                    freshhdr();
-                    wrefresh(whdr);
+					freshhdr();wrefresh(whdr);
 					slots[rc]->session=0;
 					slots[rc]->id=0;
 					rc=-1;
@@ -1251,38 +1057,26 @@
                             xstrcpy(slots[rc]->tty,buf+3,QCC_TTYLEN);
                             break;
                         }
-                    if(rc>=allslots) {
-                        rc=-1;
+					if(rc>=allslots)rc=-1;
 				}
+				if(rc<0&&allslots<MAX_SLOTS)rc=createslot(buf+3,*data);
+				freshhdr();wrefresh(whdr);
                 }
-                if(rc<0&&allslots<MAX_SLOTS) {
-                    rc=createslot(buf+3,*data);
-                }
-                freshhdr();
-                wrefresh(whdr);
-            }
-            if(rc>=0) {
-                slots[rc]->id=id;
-            } else {
-                type=-1;
-            }
+			if(rc>=0)slots[rc]->id=id;
+			    else type=-1;
             switch(type) {
             case QC_SLINE:
                 restrcpy(&slots[rc]->status,(char*)data);
-                freshstatus();
-                wrefresh(wstat);
+				freshstatus();wrefresh(wstat);
                 break;
             case QC_LOGIT:
                 logit((char*)data,slots[rc]->wlog,rc);
-                if(currslot==rc&&!edm) {
-                    wrefresh(slots[rc]->wlog);
-                }
+				if(currslot==rc&&!edm)wrefresh(slots[rc]->wlog);
                 break;
             case QC_TITLE:
                 restrcpy(&slots[rc]->header,(char*)data);
                 if(currslot==rc) {
-                    freshhdr();
-                    wrefresh(whdr);
+					freshhdr();wrefresh(whdr);
 				}
 				break;
 			    case QC_EMSID:
@@ -1296,33 +1090,22 @@
                     slots[rc]->session=0;
                 } else {
                     p=data;
-                    slots[rc]->speed=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->opt=FETCH16(p);
-                    INC16(p);
-                    slots[rc]->options=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->start=FETCH32(p);
-                    INC32(p);
-                    restrcpy(&slots[rc]->name,(char*)p);
-                    p+=strlen((char*)p)+1;
-                    restrcpy(&slots[rc]->sysop,(char*)p);
-                    p+=strlen((char*)p)+1;
-                    restrcpy(&slots[rc]->city,(char*)p);
-                    p+=strlen((char*)p)+1;
-                    restrcpy(&slots[rc]->flags,(char*)p);
-                    p+=strlen((char*)p)+1;
-                    restrcpy(&slots[rc]->phone,(char*)p);
-                    p+=strlen((char*)p)+1;
+					slots[rc]->speed=FETCH32(p);INC32(p);
+					slots[rc]->opt=FETCH16(p);INC16(p);
+					slots[rc]->options=FETCH32(p);INC32(p);
+					slots[rc]->start=FETCH32(p);INC32(p);
+					restrcpy(&slots[rc]->name,(char*)p);p+=strlen((char*)p)+1;
+					restrcpy(&slots[rc]->sysop,(char*)p);p+=strlen((char*)p)+1;
+					restrcpy(&slots[rc]->city,(char*)p);p+=strlen((char*)p)+1;
+					restrcpy(&slots[rc]->flags,(char*)p);p+=strlen((char*)p)+1;
+					restrcpy(&slots[rc]->phone,(char*)p);p+=strlen((char*)p)+1;
                     restrcpy(&slots[rc]->addrs,(char*)p);
                     slots[rc]->session=1;
                 }
                 if(currslot==rc) {
-                    freshslot();
-                    wrefresh(wmain);
+					freshslot();wrefresh(wmain);
                 }
-                freshhelp();
-                wnoutrefresh(whelp);
+				freshhelp();wnoutrefresh(whelp);
 				break;
 			    case QC_LIDLE:
 				if(slots[rc]->session) {
@@ -1330,24 +1113,18 @@
                     memset(&slots[rc]->r,0,sizeof(pfile_t));
                     memset(&slots[rc]->s,0,sizeof(pfile_t));
                     if(currslot==rc) {
-                        freshslot();
-                        wrefresh(wmain);
+						freshslot();wrefresh(wmain);
                     }
-                    freshhelp();
-                    wnoutrefresh(whelp);
+					freshhelp();wnoutrefresh(whelp);
                     if(buf[3]=='i'&&buf[4]=='p') {
-                        buf[3]='I';
-                        buf[4]='P';
+						buf[3]='I';buf[4]='P';
                     } else {
-                        buf[3]='C';
-                        buf[4]='H';
+						buf[3]='C';buf[4]='H';
                         buf[5]='T';
                     }
                     rc=findslot(buf+3);
-                    if(rc>=0&&allslots>0) {
-                        delslot(rc);
+					if(rc>=0&&allslots>0)delslot(rc);
                     }
-                }
 				break;
 			    case QC_SENDD:
 				if(!len) {
@@ -1356,81 +1133,52 @@
                     p=data;
                     slots[rc]->session=1;
                     xfree(slots[rc]->s.fname);
-                    slots[rc]->s.foff=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.ftot=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.toff=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.ttot=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.nf=FETCH16(p);
-                    INC16(p);
-                    slots[rc]->s.allf=FETCH16(p);
-                    INC16(p);
-                    slots[rc]->s.cps=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.soff=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.stot=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.start=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->s.mtime=FETCH32(p);
-                    INC32(p);
+					slots[rc]->s.foff=FETCH32(p);INC32(p);
+					slots[rc]->s.ftot=FETCH32(p);INC32(p);
+					slots[rc]->s.toff=FETCH32(p);INC32(p);
+					slots[rc]->s.ttot=FETCH32(p);INC32(p);
+					slots[rc]->s.nf=FETCH16(p);INC16(p);
+					slots[rc]->s.allf=FETCH16(p);INC16(p);
+					slots[rc]->s.cps=FETCH32(p);INC32(p);
+					slots[rc]->s.soff=FETCH32(p);INC32(p);
+					slots[rc]->s.stot=FETCH32(p);INC32(p);
+					slots[rc]->s.start=FETCH32(p);INC32(p);
+					slots[rc]->s.mtime=FETCH32(p);INC32(p);
                     slots[rc]->s.fname=xstrdup((char*)p);
-                    freshhelp();
-                    wnoutrefresh(whelp);
+					freshhelp();wnoutrefresh(whelp);
                 }
                 if(currslot==rc) {
-                    freshslot();
-                    wrefresh(wmain);
+					freshslot();wrefresh(wmain);
                 }
                 break;
             case QC_RECVD:
-                if(!len) {
-                    memset(&slots[rc]->r,0,sizeof(pfile_t));
-                } else {
+				if(!len)memset(&slots[rc]->r,0,sizeof(pfile_t));
+				    else {
                     p=data;
                     slots[rc]->session=1;
                     xfree(slots[rc]->r.fname);
-                    slots[rc]->r.foff=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.ftot=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.toff=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.ttot=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.nf=FETCH16(p);
-                    INC16(p);
-                    slots[rc]->r.allf=FETCH16(p);
-                    INC16(p);
-                    slots[rc]->r.cps=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.soff=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.stot=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.start=FETCH32(p);
-                    INC32(p);
-                    slots[rc]->r.mtime=FETCH32(p);
-                    INC32(p);
+					slots[rc]->r.foff=FETCH32(p);INC32(p);
+					slots[rc]->r.ftot=FETCH32(p);INC32(p);
+					slots[rc]->r.toff=FETCH32(p);INC32(p);
+					slots[rc]->r.ttot=FETCH32(p);INC32(p);
+					slots[rc]->r.nf=FETCH16(p);INC16(p);
+					slots[rc]->r.allf=FETCH16(p);INC16(p);
+					slots[rc]->r.cps=FETCH32(p);INC32(p);
+					slots[rc]->r.soff=FETCH32(p);INC32(p);
+					slots[rc]->r.stot=FETCH32(p);INC32(p);
+					slots[rc]->r.start=FETCH32(p);INC32(p);
+					slots[rc]->r.mtime=FETCH32(p);INC32(p);
                     slots[rc]->r.fname=xstrdup((char*)p);
-                    freshhelp();
-                    wnoutrefresh(whelp);
+					freshhelp();wnoutrefresh(whelp);
                 }
                 if(currslot==rc) {
-                    freshslot();
-                    wrefresh(wmain);
+					freshslot();wrefresh(wmain);
                 }
                 break;
             case QC_CHAT:
                 while((p=(unsigned char*)strchr((char*)data,7))) {
                     *(char*)p='*';
-                    flash();
-                    beep();
-                    flash();
+					flash();beep();flash();
 				}
 				wattrset(wmain,COLOR_PAIR(7));
 				wmove(wmain,crey,crex);
@@ -1446,18 +1194,14 @@
                     waddch(wmain,'\n');
                     scrollok(wmain,TRUE);
                 }
-                if(currslot==rc&&!edm) {
-                    wrefresh(wmain);
-                }
+				if(currslot==rc&&!edm)wrefresh(wmain);
                 strcat(slots[rc]->cl,(char*)data);
                 if((p=(unsigned char*)strchr(slots[rc]->cl,'\n'))) {
-                    if(slots[rc]->chats>=MH) {
+					if(slots[rc]->chats>=MH)
                         xstrcpy(slots[rc]->cl,(char*)p,MH*CHH-1);
-                    } else {
-                        slots[rc]->chats++;
-                    }
+					else slots[rc]->chats++;
                 } else if(strlen(slots[rc]->cl)>=(MH*(CHH-1))) {
-                    memcpy(slots[rc]->cl,slots[rc]->cl+CHH,strlen(slots[rc]->cl)-(CHH-2));
+					memmove(slots[rc]->cl,slots[rc]->cl+CHH,strlen(slots[rc]->cl)-(CHH-2));
 					slots[rc]->chats=MH;
 				}
 				break;
@@ -1467,22 +1211,18 @@
             case QC_SLINE:
                 restrcpy(&m_status,(char*)data);
                 if(currslot<0) {
-                    freshstatus();
-                    wrefresh(wstat);
+					freshstatus();wrefresh(wstat);
                 }
                 break;
             case QC_TITLE:
                 restrcpy(&m_header,(char*)data);
                 if(currslot<0) {
-                    freshhdr();
-                    wrefresh(whdr);
+					freshhdr();wrefresh(whdr);
                 }
                 break;
             case QC_LOGIT:
                 logit((char*)data,wlog,-1);
-                if(currslot<0&&!edm) {
-                    wrefresh(wlog);
-                }
+				if(currslot<0&&!edm)wrefresh(wlog);
 				break;
 			    case QC_MYDATA:
 				restrcpy(&myaddr,(char*)data);
@@ -1499,25 +1239,16 @@
                     qslot_t *q=addqueue(&queue);
                     p=data;
                     q_max=q->n;
-                    q->mail=FETCH32(p);
-                    INC32(p);
-                    q->files=FETCH32(p);
-                    INC32(p);
-                    q->flags=FETCH32(p);
-                    INC32(p);
-                    q->try=FETCH16(p);
-                    INC16(p);
+					q->mail=FETCH32(p);INC32(p);
+					q->files=FETCH32(p);INC32(p);
+					q->flags=FETCH32(p);INC32(p);
+					q->try=FETCH16(p);INC16(p);
                     q->addr=xstrdup((char*)p);
-                    if(lastfirst>=q->n) {
-                        q_first=q->n;
+					if(lastfirst>=q->n)q_first=q->n;
+					if(lastpos>=q->n)q_pos=q->n;
                     }
-                    if(lastpos>=q->n) {
-                        q_pos=q->n;
-                    }
-                }
                 if(currslot<0) {
-                    freshqueue();
-                    wrefresh(wmain);
+					freshqueue();wrefresh(wmain);
 				}
 				break;
 			    case QC_QUIT:
@@ -1531,9 +1262,9 @@
 
 int main(int argc, char **argv, char **envp)
 {
-    int len,ch,rc,c;
+	int len,ch,rc;
     struct tm *tt;
-    char buf[4096],*bf,*port=NULL,*addr=NULL,*pwd=NULL;
+	char buf[4096],*bf,c,*port=NULL,*addr=NULL,*pwd=NULL;
 	unsigned char digest[16]={0};
 	fd_set rfds;
 	time_t tim;
@@ -1547,19 +1278,13 @@
     while((c=getopt(argc,argv,"hnvP:a:w:"))!=-1) {
         switch(c) {
         case 'P':
-            if(optarg&&*optarg) {
-                port=xstrdup(optarg);
-            }
+			if(optarg&&*optarg)port=xstrdup(optarg);
             break;
         case 'a':
-            if(optarg&&*optarg) {
-                addr=xstrdup(optarg);
-            }
+			if(optarg&&*optarg)addr=xstrdup(optarg);
             break;
         case 'w':
-            if(optarg&&*optarg) {
-                pwd=xstrdup(optarg);
-            }
+			if(optarg&&*optarg)pwd=xstrdup(optarg);
 			break;
 		    case 'n':
 			beepdisable=1;
@@ -1580,11 +1305,10 @@
 		fprintf(stderr,"can't connect to server: %s.\n",strerror(errno));
 		return 1;
 	}
+
 #ifdef HAVE_SETLOCALE
     setlocale(LC_ALL, "C");
 #endif
-    /*cyr*/	printf("\033(K");
-    fflush(stdout);
 
 	signal(SIGALRM, sighup);
 	alarm(6);
@@ -1616,11 +1340,10 @@
     STORE16(buf,0);
     buf[2]=QR_STYPE;
     buf[3]='e';/*events*/
-    memcpy(buf+4,digest,16);
+	memmove(buf+4,digest,16);
     snprintf(buf+20,MSG_BUFFER-21,"qcc-%s",version);
     xcmd(buf,QR_STYPE,strlen(buf+20)+20);
-    tim=time(NULL)+6;
-    buf[2]=1;
+	tim=time(NULL)+6;buf[2]=1;
 	while(getmessages(buf)>0&&time(NULL)<tim);
 	if(buf[2]||time(NULL)>=tim) {
 		fprintf(stderr,"can't connect: %s.\n",buf+3);
@@ -1630,15 +1353,14 @@
 	signal(SIGINT,sighup);
 	signal(SIGKILL,sighup);
 	srand(time(NULL));
+/*cyr*/	printf("\033(K");
+	fflush(stdout);
     initscreen();
     currslot=-1;
     allslots=0;
-    freshhdr();
-    wrefresh(whdr);
+	freshhdr();wrefresh(whdr);
     memset(&slots,0,sizeof(slots));
-    for(ch=0; ch<=HSTMAX; ch++) {
-        hst[ch]=NULL;
-    }
+	for(ch=0;ch<=HSTMAX;ch++)hst[ch]=NULL;
 	hstlast=0;
 	freshall();
 	write_log("I'm, qcc-%s, successfully started! ;)", version );
@@ -1646,36 +1368,22 @@
 #ifdef CURS_HAVE_RESIZETERM
         if (sizechanged) {
             if(!ioctl(fileno(stdout),TIOCGWINSZ,&size)) {
-                LINES=size.ws_row;
-                COLS=size.ws_col;
-                if(LINES<MH*2) {
-                    MH=LINES/2-1;
-                } else {
-                    MH=MAXMH;
+				LINES=size.ws_row;COLS=size.ws_col;
+				if(LINES<MH*2)MH=LINES/2-1; else MH=MAXMH;
+				resizeterm(LINES,COLS);draw_screen();
+				for(ch=0;ch<allslots;ch++)wresize(slots[ch]->wlog,LOGSIZE,COL);
+				wresize(wmain,MH,COL);wresize(wlog,LOGSIZE,COL);
+				mvwin(wstat,LINES-2,2);wresize(wstat,1,COL-2);
+				mvwin(whelp,LINES-1,1);wresize(whelp,1,COL);
+				wresize(whdr,1,COL-2);freshall();
                 }
-                resizeterm(LINES,COLS);
-                draw_screen();
-                for(ch=0; ch<allslots; ch++) {
-                    wresize(slots[ch]->wlog,LOGSIZE,COL);
-                }
-                wresize(wmain,MH,COL);
-                wresize(wlog,LOGSIZE,COL);
-                mvwin(wstat,LINES-2,2);
-                wresize(wstat,1,COL-2);
-                mvwin(whelp,LINES-1,1);
-                wresize(whelp,1,COL);
-                wresize(whdr,1,COL-2);
-                freshall();
-            }
             sizechanged=0;
         }
 #endif
         tim=time(NULL);
-        tt=localtime(&tim);
-        wattron(whdr,COLOR_PAIR(15));
+		tt=localtime(&tim);wattron(whdr,COLOR_PAIR(15));
         mvwprintw(whdr,0,COL-11,"%02d:%02d:%02d",tt->tm_hour,tt->tm_min,tt->tm_sec);
-        wnoutrefresh(whdr);
-        wnoutrefresh(wstat);
+		wnoutrefresh(whdr);wnoutrefresh(wstat);
 		if(currslot>0&&slots[currslot]->chat) {
 			wmove(slots[currslot]->wlog,slots[currslot]->chaty,slots[currslot]->chatx);
 			wnoutrefresh(slots[currslot]->wlog);
@@ -1687,27 +1395,17 @@
         tv.tv_sec=1;
         tv.tv_usec=0;
         rc=select(sock+1,&rfds,NULL,NULL,&tv);
-        if(rc<0&&errno!=EINTR) {
-            write_log("err in select: %s",strerror(errno));
-        }
+		if(rc<0&&errno!=EINTR)write_log("err in select: %s",strerror(errno));
         if(rc>0&&FD_ISSET(sock,&rfds))do {
                 ch=getmessages(NULL);
-                if(ch<0) {
-                    quitflag=1;
-                }
+			if(ch<0)quitflag=1;
             } while(ch>0);
         if(rc>0&&FD_ISSET(0,&rfds)) {
             ch=getch();
-            if(ch==0x1b) {
-                ch=getch();
-            }
-            if(ch==ERR) {
-                continue;
-            }
+		if(ch==0x1b)ch=getch();
+		if(ch==ERR)continue;
 #ifdef KEY_RESIZE
-            if(ch==KEY_RESIZE) {
-                continue;
-            }
+		if(ch==KEY_RESIZE)continue;
 #endif
 		if(ch==('L'-'@')) {
 			draw_screen();
@@ -1721,9 +1419,7 @@
             } else if(allslots&&(ch=='\t'||ch==KEY_RIGHT)) {
                 if(currslot<(allslots-1)||ch=='\t') {
                     currslot++;
-                    if(currslot==allslots) {
-                        currslot=-1;
-                    }
+				if(currslot==allslots)currslot=-1;
 				freshall();
 			}
 		} else if(ch==KEY_LEFT) {
@@ -1731,40 +1427,20 @@
                     currslot--;
                     freshall();
                 }
-            } else if(ch==KEY_F(10)) {
-                quitflag=1;
-            } else if(ch==KEY_F(1)) {
-                for(ch=0; help[ch]; ch++) {
-                    write_log(help[ch],version);
-                }
-            } else if(ch>0&&(unsigned char)ch<255&&currslot>0&&slots[currslot]->chat) {
+		} else if(ch==KEY_F(10))quitflag=1;
+		    else if(ch==KEY_F(1)){for(ch=0;help[ch];ch++)write_log(help[ch],version);}
+			else if(ch>0&&(unsigned char)ch<255&&currslot>0&&slots[currslot]->chat) {
                 if(ch!=KEY_F(2)) {
-                    if(ch==KEY_BACKSPACE||ch==127) {
-                        ch='\b';
-                    }
-                    if(ch==KEY_F(4)) {
-                        ch=7;
-                    }
-                    if(ch=='\r') {
-                        ch='\n';
-                    }
-                    if(ch==0x1b||ch==KEY_F(8)) {
-                        ch=0;
-                    } else if(ch>255) {
-                        ch=' ';
-                    }
+					if(ch==KEY_BACKSPACE||ch==127)ch='\b';
+					if(ch==KEY_F(4))ch=7;
+					if(ch=='\r')ch='\n';
+					if(ch==0x1b||ch==KEY_F(8))ch=0;
+					    else if(ch>255)ch=' ';
                     buf[3]=ch;
-                    if(ch==7) {
-                        ch='*';
-                    }
-                    if(ch=='\b') {
-                        waddstr(slots[currslot]->wlog,"\b ");
-                    }
-                    if(ch) {
-                        waddch(slots[currslot]->wlog,ch);
-                    } else {
-                        waddstr(slots[currslot]->wlog,"\nClosing..\n");
-                    }
+					if(ch==7)ch='*';
+					if(ch=='\b')waddstr(slots[currslot]->wlog,"\b ");
+					if(ch)waddch(slots[currslot]->wlog,ch);
+					    else waddstr(slots[currslot]->wlog,"\nClosing..\n");
 					wrefresh(slots[currslot]->wlog);
 					xcmdslot(buf,QR_CHAT,4);
 				} else if(inputstr(buf+3,"Text: ",0)) {
@@ -1775,9 +1451,8 @@
                 getyx(slots[currslot]->wlog,slots[currslot]->chaty,slots[currslot]->chatx);
             } else {
                 if ( ch == '`' || ( ch >= '0' && ch <= '9' )) {
-                    if ( ch == '`' ) {
+		        if ( ch == '`' )
                         ch = '0';
-                    }
 			ch=ch-'1';
 			if(ch<allslots) {
 				currslot=ch;
@@ -1803,59 +1478,39 @@
                     }
                     if(currslot<0)switch(ch) {
                         case KEY_UP:
-                            if(q_pos>1)if(--q_pos<q_first) {
-                                    q_first--;
-                                }
-                            freshqueue();
-                            wrefresh(wmain);
+				if(q_pos>1)if(--q_pos<q_first)q_first--;
+				freshqueue();wrefresh(wmain);
                             break;
                         case KEY_DOWN:
-                            if(q_pos<q_max)if(++q_pos>=q_first+MH-1) {
-                                    q_first++;
-                                }
-                            freshqueue();
-                            wrefresh(wmain);
+				if(q_pos<q_max)if(++q_pos>=q_first+MH-1)q_first++;
+				freshqueue();wrefresh(wmain);
                             break;
                         case KEY_PPAGE:
                             if(q_pos>1) {
                                 q_pos-=MH-2;
                                 q_first-=MH-2;
-                                if(q_pos<1) {
-                                    q_pos=1;
-                                    q_first=1;
+					if(q_pos<1){q_pos=1;q_first=1;}
+					if(q_first<1)q_first=1;
                                 }
-                                if(q_first<1) {
-                                    q_first=1;
-                                }
-                            }
-                            freshqueue();
-                            wrefresh(wmain);
+				freshqueue();wrefresh(wmain);
                             break;
                         case KEY_NPAGE:
                             if(q_pos<q_max) {
                                 q_pos+=MH-2;
                                 q_first+=MH-2;
-                                if(q_pos>=q_max) {
-                                    q_pos=q_max;
-                                    q_first=q_pos-(MH-2);
+					if(q_pos>=q_max){q_pos=q_max;q_first=q_pos-(MH-2);}
+					if(q_first<1)q_first=1;
                                 }
-                                if(q_first<1) {
-                                    q_first=1;
-                                }
-                            }
-                            freshqueue();
-                            wrefresh(wmain);
+				freshqueue();wrefresh(wmain);
                             break;
                         case KEY_HOME:
                             q_pos=q_first=1;
-                            freshqueue();
-                            wrefresh(wmain);
+				freshqueue();wrefresh(wmain);
                             break;
                         case KEY_END:
                             q_pos=q_max;
                             q_first=(q_max>=MH-1)?(q_max-MH+2):1;
-                            freshqueue();
-                            wrefresh(wmain);
+				freshqueue();wrefresh(wmain);
 				break;
 			case 'r':
 				xcmd(buf,QR_SCAN,3);
@@ -1863,17 +1518,9 @@
                         case 'R':
                             xcmd(buf,QR_CONF,3);
                             break;
-                        case 'w':
-                        case 'W':
-                        case 'u':
-                        case 'U':
-                        case 'i':
-                        case 'I':
-                        case 'h':
-                            for(; que&&que->n!=q_pos; que=que->next);
-                            if(!que) {
-                                break;
-                            }
+			case 'w': case 'W': case 'u': case 'U':
+			case 'i': case 'I': case 'h':
+				for(;que&&que->n!=q_pos;que=que->next);if(!que)break;
 				xstrcpy(buf+3,que->addr,64);
 				len=strlen(buf+3)+4;
 				buf[len]=ch;
@@ -1882,93 +1529,56 @@
                                 if(inputstr(buf+len+4,"Set hold status to node for (minutes): ",2)) {
                                     STORE16(buf+len+2,(unsigned short)strtoul(buf+len+4,NULL,10));
                                     len+=2;
-                                } else {
-                                    break;
+					} else break;
                                 }
-                            }
                             xcmd(buf,QR_STS,len+2);
                             break;
-                        case 'k':
-                        case 'K':
-                            for(; que&&que->n!=q_pos; que=que->next);
-                            if(!que) {
-                                break;
-                            }
+			case 'k': case 'K':
+				for(;que&&que->n!=q_pos;que=que->next);if(!que)break;
                             bf=getnode((ch=='k')?"Kill all files for (addr+'y'): ":"Kill all files for current addr? ('y'=yes, any other=no): ");
                             if(bf&&tolower(*bf)=='y'&&bf[1]) {
                                 xstrcpy(buf+3,(ch=='k')?(bf+1):que->addr,64);
                                 xcmd(buf,QR_KILL,strlen(buf+3)+4);
                             }
                             break;
-                        case 'f':
-                        case 'F':
-                            for(; que&&que->n!=q_pos; que=que->next);
-                            if(!que&&ch=='F') {
-                                break;
-                            }
+			case 'f': case 'F':
+				for(;que&&que->n!=q_pos;que=que->next);if(!que&&ch=='F')break;
                             printinfo(ch=='F'?que->addr:getnode("Get info about address: "),ch=='f',buf);
                             break;
-                        case 'e':
-                        case 'E':
-                            for(; que&&que->n!=q_pos; que=que->next);
-                            if(!que&&ch=='E') {
-                                break;
-                            }
+			case 'e': case 'E':
+				for(;que&&que->n!=q_pos;que=que->next);if(!que&&ch=='E')break;
                             if(ch=='e') {
                                 bf=getnode("Request file(s) from node: ");
-                                if(!bf||*bf!='n'||!bf[1]) {
-                                    break;
-                                }
+					if(!bf||*bf!='n'||!bf[1])break;
                                 bf++;
-                            } else {
-                                bf=que->addr;
-                            }
+				} else bf=que->addr;
                             len=strlen(bf);
                             xstrcpy(buf+3,bf,MSG_BUFFER-3);
                             bf=buf+len+4;
                             if(inputstr(bf,"File(s) for request: ",0)) {
                                 len+=strlen(bf);
                                 while(bf&&*bf) {
-                                    if(*bf=='"') {
-                                        bf=strchr(bf+1,'"');
+						if(*bf=='"')bf=strchr(bf+1,'"');
+						if(bf)bf=strchr(bf,' ');
+						if(bf)*bf++=0;
                                     }
-                                    if(bf) {
-                                        bf=strchr(bf,' ');
-                                    }
-                                    if(bf) {
-                                        *bf++=0;
-                                    }
-                                }
                                 xcmd(buf,QR_REQ,5+len);
                             }
                             break;
-                        case 's':
-                        case 'S':
-                            for(; que&&que->n!=q_pos; que=que->next);
-                            if(!que&&ch=='S') {
-                                break;
-                            }
+			case 's': case 'S':
+				for(;que&&que->n!=q_pos;que=que->next);if(!que&&ch=='S')break;
                             if(ch=='s') {
                                 bf=getnode("Send file to node: ");
-                                if(!bf||!strchr("HDNCI",toupper(*bf))||!bf[1]) {
-                                    break;
-                                }
+					if(!bf||!strchr("HDNCI",toupper(*bf))||!bf[1])break;
                                 ch=*bf++;
-                            } else {
-                                bf=que->addr;
-                            }
+				} else bf=que->addr;
                             len=strlen(bf);
                             xstrcpy(buf+3,bf,MSG_BUFFER-3);
                             bf=buf+len+4;
-                            *bf++=(ch=='S')?'N':ch;
-                            *bf++=0;
+				*bf++=(ch=='S')?'N':ch;*bf++=0;
                             if(inputstr(bf,"Full file name: ",0)) {
-                                if(access(bf,R_OK)==-1) {
-                                    write_log("warn: can't access file '%s'",bf);
-                                }
-                                while(*bf++)if(*bf==' ') {
-                                        *bf='?';
-                                    }
+					if(access(bf,R_OK)==-1)write_log("warn: can't access file '%s'",bf);
+					while(*bf++)if(*bf==' ')*bf='?';
 					xcmd(buf,QR_SEND,7+len+strlen(buf+len+6));
 				}
 				break;
@@ -1976,10 +1586,8 @@
                         case KEY_F(8):
                             delslot(currslot);
                             break;
-                        case KEY_UP:
-                        case KEY_IC:
-                        case KEY_PPAGE:
-                        case KEY_HOME:
+			case KEY_UP: case KEY_IC:
+			case KEY_PPAGE:	case KEY_HOME:
 				if(slots[currslot]->lc>LOGSIZE) {
 					len=(ch==KEY_UP?1:(ch==KEY_HOME?LGMAX:(ch==KEY_IC?2:(LOGSIZE-1))));
 					while(len--&&slots[currslot]->lc>LOGSIZE) {
@@ -1991,14 +1599,10 @@
                                 }
                                 wmove(slots[currslot]->wlog,LOGSIZE-1,0);
                                 wrefresh(slots[currslot]->wlog);
-                            } else {
-                                xbeep();
-                            }
+				} else xbeep();
                             break;
-                        case KEY_DOWN:
-                        case KEY_DC:
-                        case KEY_NPAGE:
-                        case KEY_END:
+			case KEY_DOWN: case KEY_DC:
+			case KEY_NPAGE:	case KEY_END:
 				if(slots[currslot]->lc<slots[currslot]->lm) {
 					len=(ch==KEY_DOWN?1:(ch==KEY_END?LGMAX:(ch==KEY_DC?2:(LOGSIZE-1))));
 					while(len--&&slots[currslot]->lc<slots[currslot]->lm) {
@@ -2012,50 +1616,34 @@
                                     scrollok(slots[currslot]->wlog,TRUE);
                                 }
                                 wrefresh(slots[currslot]->wlog);
-                            } else {
-                                xbeep();
-                            }
+				} else xbeep();
                             break;
                         case 'X':
-                            if(slots[currslot]->session) {
-                                xcmdslot(buf,QR_SKIP,3);
-                            } else {
-                                xbeep();
-                            }
+				if(slots[currslot]->session)xcmdslot(buf,QR_SKIP,3);
+				    else xbeep();
                             break;
                         case 'R':
-                            if(slots[currslot]->session) {
-                                xcmdslot(buf,QR_REFUSE,3);
-                            } else {
-                                xbeep();
-                            }
+				if(slots[currslot]->session)xcmdslot(buf,QR_REFUSE,3);
+				    else xbeep();
                             break;
                         case 'h':
                             xstrcpy(buf+3,slots[currslot]->tty,QCC_TTYLEN);
-                            if(!(slots[currslot]->opt&(MO_IFC|MO_BINKP))) {
+				if(!(slots[currslot]->opt&(MO_IFC|MO_BINKP)))
                                 xcmd(buf,QR_HANGUP,strlen(buf+3)+4);
-                            }
                             xcmdslot(buf,QR_HANGUP,3);
                             break;
                         case 'c':
                             if((slots[currslot]->opt&MO_CHAT||slots[currslot]->opt&MO_BINKP)&&slots[currslot]->session) {
                                 buf[3]=5;
                                 xcmdslot(buf,QR_CHAT,4);
-                            } else {
-                                xbeep();
-                            }
+				} else xbeep();
 				break;
 		    }
+		}}
                 }
             }
-        }
-    }
-    while(allslots) {
-        delslot(allslots-1);
-    }
-    for(ch=0; ch<HSTMAX; ch++) {
-        xfree(hst[ch]);
-    }
+	while(allslots)delslot(allslots-1);
+	for(ch=0;ch<HSTMAX;ch++)xfree(hst[ch]);
 	donescreen();
 	cls_close(sock);
 	signal(SIGHUP,SIG_DFL);
diff -burw ./qico/src/qcconst.h ./trunk/src/qcconst.h
--- ./qico/src/qcconst.h	2024-02-01 18:09:52.570196000 +0300
+++ ./trunk/src/qcconst.h	2024-02-01 18:10:34.582899000 +0300
@@ -1,6 +1,6 @@
 /**********************************************************
  * for exchange with qcc
- * $Id: qcconst.h,v 1.6 2005/05/06 20:46:23 mitry Exp $
+ * $Id: qcconst.h 18 2010-08-23 15:50:49Z semik $
  **********************************************************/
 #ifndef __QCCONST_H__
 #define __QCCONST_H__
Only in ./qico/src: qconf.c
Only in ./qico/src: qconf.h
diff -burw ./qico/src/qconf.x ./trunk/src/qconf.x
--- ./qico/src/qconf.x	2024-02-01 18:09:52.570447000 +0300
+++ ./trunk/src/qconf.x	2024-02-01 18:10:34.587700000 +0300
@@ -1,6 +1,6 @@
 #**********************************************************
 #* config keywords definition
-#* $Id: qconf.x,v 1.11 2005/08/16 19:15:05 mitry Exp $
+#* $Id: qconf.x 18 2010-08-23 15:50:49Z semik $
 #**********************************************************
 address,C_ADDRL,1,NULL
 aftermail,C_STR,0,NULL
diff -burw ./qico/src/qctl.c ./trunk/src/qctl.c
--- ./qico/src/qctl.c	2024-02-01 18:09:52.570565000 +0300
+++ ./trunk/src/qctl.c	2024-02-01 18:10:34.602785000 +0300
@@ -2,7 +2,7 @@
  * command-line qico control tool
  ***************************************************************************/
 /*
- * $Id: qctl.c,v 1.12 2005/08/16 10:36:18 mitry Exp $
+ * $Id: qctl.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: qctl.c,v $
  * Revision 1.12  2005/08/16 10:36:18  mitry
@@ -153,15 +153,9 @@
         write_log("connection to server broken");
         return 1;
     }
-    if(rc>0&&rc<MSG_BUFFER) {
-        buf[rc]=0;
-    }
-    if(rc<3||(FETCH16(buf)&&FETCH16(buf)!=(unsigned short)getpid())) {
-        return 1;
-    }
-    if(buf[2]) {
-        write_log(buf+3);
-    }
+    if(rc>0&&rc<MSG_BUFFER)buf[rc]=0;
+    if(rc<3||(FETCH16(buf)&&FETCH16(buf)!=(unsigned short)getpid()))return 1;
+    if(buf[2])write_log(buf+3);
     alarm(0);
     signal(SIGALRM, SIG_DFL);
     return buf[2];
@@ -176,9 +170,8 @@
         for( p = buf + 3, rc = 0; strlen( p ); rc++ ) {
             printf( "%s: %s\n", infostrs[rc], p );
 
-            if ( rc == 5 && (t = wktime_str( p ))) {
+			if ( rc == 5 && (t = wktime_str( p )))
                 printf( " WkTime: %s\n", t );
-            }
 
 			p += strlen( p ) + 1;
 		}
@@ -203,9 +196,7 @@
                 t = f + strlen(f) + 1;
                 p = t + strlen(t) + 1;
                 sscanf(p,"%ld",&flags);
-                for(k=0; k<Q_MAXBIT; k++) {
-                    cflags[k] = (flags&(1<<k))?qflgs[k]:'.';
-                }
+            for(k=0;k<Q_MAXBIT;k++) cflags[k] = (flags&(1<<k))?qflgs[k]:'.';
             cflags[Q_MAXBIT] = '\x00';
             printf("%-20s %10s %10s %10s %11s\n",a,m,f,t,cflags);
         }
@@ -221,10 +212,10 @@
 
 int main(int argc, char **argv,char **envp)
 {
-    int action=-1, kfs=0, len=0,lkfs,rc=1,c;
+    int action=-1, kfs=0, len=0,lkfs,rc=1;
     char filename[MAX_PATH];
     unsigned char digest[16]= {0};
-    char *str=NULL,flv='?',*port=NULL,*addr=NULL,*tty=NULL,*pwd=NULL;
+    char c,*str=NULL,flv='?',*port=NULL,*addr=NULL,*tty=NULL,*pwd=NULL;
     struct stat filestat;
 #ifdef HAVE_SETLOCALE
      setlocale(LC_ALL, "C");
@@ -232,19 +223,13 @@
     while((c=getopt(argc, argv, "Khqovrp:fkRQH:s:x:P:a:w:"))!=EOF) {
         switch(c) {
         case 'P':
-            if(optarg&&*optarg) {
-                port=xstrdup(optarg);
-            }
+            if(optarg&&*optarg)port=xstrdup(optarg);
             break;
         case 'a':
-            if(optarg&&*optarg) {
-                addr=xstrdup(optarg);
-            }
+            if(optarg&&*optarg)addr=xstrdup(optarg);
             break;
         case 'w':
-            if(optarg&&*optarg) {
-                pwd=xstrdup(optarg);
-            }
+            if(optarg&&*optarg)pwd=xstrdup(optarg);
             break;
         case 'k':
             kfs=1;
@@ -291,9 +276,7 @@
             action=QR_SCAN;
             break;
         case 'H':
-            if(optarg&&*optarg) {
-                tty=xstrdup(optarg);
-            }
+            if(optarg&&*optarg)tty=xstrdup(optarg);
             action=QR_HANGUP;
             break;
         case 'v':
@@ -306,9 +289,7 @@
             &&action!=QR_SCAN
             &&action!=QR_CONF
             &&action!=QR_QUEUE
-            &&optind>=argc) {
-        usage(argv[0]);
-    }
+     &&optind>=argc)usage(argv[0]);
 
     signal(SIGPIPE,SIG_IGN);
     sock=cls_conn(CLS_UI,port,addr);
@@ -370,8 +351,7 @@
     case QR_KILL:
     case QR_POLL:
         do {
-            STORE16(buf,0);
-            buf[2]=action;
+            STORE16(buf,0);buf[2]=action;
             xstrcpy(buf+3, argv[optind], MSG_BUFFER-3);
               buf[4+strlen(buf+3)]=flv;
             rc=xsendget(sock,buf,strlen(argv[optind++])+8);
@@ -381,9 +361,7 @@
         if(tty) {
             strncpy(buf+3,tty,16);
             rc=xsendget(sock,buf,strlen(buf+3));
-        } else {
-            usage(argv[0]);
-        }
+        } else usage(argv[0]);
         break;
         case QR_STS:
         xstrcpy(buf+3, argv[optind], MSG_BUFFER-3);
@@ -396,8 +374,7 @@
             xstrcpy(str, argv[optind], MSG_BUFFER-(str-(char*)buf));
             str+=strlen(str)+1;
         }
-        xstrcpy(str, "", 2);
-        str+=2;
+        xstrcpy(str, "", 2);str+=2;
         rc=xsendget(sock,buf,str-buf);
         break;
         case QR_SEND: {
@@ -405,14 +382,12 @@
         str=buf+3;
         xstrcpy(str, argv[optind++], MSG_BUFFER-3);
         str+=strlen(str)+1;
-        *str++=flv;
-        *str++=0;
+        *str++=flv;*str++=0;
         for(; optind<argc; optind++) {
             lkfs=kfs;
             memset(filename,0,MAX_PATH);
             if(argv[optind][0]!='/') {
-                getcwd(filename, MAX_PATH-1);
-                xstrcat(filename, "/", MAX_PATH);
+                getcwd(filename, MAX_PATH-1);xstrcat(filename, "/", MAX_PATH);
             }
             xstrcat(filename, argv[optind], MAX_PATH);
             if(access(filename,R_OK) == -1) {
@@ -431,21 +406,15 @@
                 write_log("have no write access to %s. file wouldn't be removed",filename);
                 lkfs=0;
             }
-            str[0]=lkfs?'^':0;
-            str[1]=0;
+            str[0]=lkfs?'^':0;str[1]=0;
             xstrcat(str, filename, MSG_BUFFER-(str-(char*)buf));
-            str+=strlen(str)+1;
-            nf++;
+            str+=strlen(str)+1;nf++;
         }
         if(nf) {
-            xstrcpy(str, "", 2);
-            str+=2;
+            xstrcpy(str, "", 2);str+=2;
             rc=xsendget(sock,buf,str-buf);
-        } else {
-            write_log("no files to send");
-        }
-    }
-    break;
+        } else write_log("no files to send");
+          } break;
         case QR_QUEUE:
         xsend(sock,buf,3);
         rc=getqueueinfo();
diff -burw ./qico/src/qipc.c ./trunk/src/qipc.c
--- ./qico/src/qipc.c	2024-02-01 18:09:52.570679000 +0300
+++ ./trunk/src/qipc.c	2024-02-01 18:10:34.596619000 +0300
@@ -2,7 +2,7 @@
  * helper stuff for client/server iface.
  **********************************************************/
 /*
- * $Id: qipc.c,v 1.4 2005/05/16 11:17:30 mitry Exp $
+ * $Id: qipc.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: qipc.c,v $
  * Revision 1.4  2005/05/16 11:17:30  mitry
@@ -27,17 +27,15 @@
     char	buf[MSG_BUFFER + 5];
     size_t	linelen;
 
-    if ( !xsend_cb ) {
+	if ( !xsend_cb )
         return;
-    }
 
     len = MIN( len, MSG_BUFFER );
     linelen = MIN( strlen( line ), QCC_TTYLEN );
     STORE16( buf, (unsigned short) getpid()); /* Hm, what about pids > 64K ??? */
     buf[2] = what;
-    if ( buf[2] == QC_CERASE ) {
+	if ( buf[2] == QC_CERASE )
         buf[2] = QC_ERASE;
-    }
 	xstrcpy( buf + 3, line, linelen + 3 );
 	buf[3 + linelen] = '\0';
 	if ( what == QC_CHAT || what == QC_CERASE ) {
@@ -50,11 +48,10 @@
             buf[5] = 'T';
         }
     }
-    memcpy( buf + 4 + linelen, buff, len );
+	memmove( buf + 4 + linelen, buff, len );
     if ( xsend_cb( ssock, buf, 4 + linelen + len ) < 0 ) {
-        if ( errno == ECONNREFUSED ) {
+		if ( errno == ECONNREFUSED )
             xsend_cb = NULL;
-        }
 		DEBUG(('I',1,"can't send_cb (fd=%d): %s",ssock,strerror(errno)));
 	}
 }
@@ -64,19 +61,16 @@
 {
     int rc;
 
-    if ( !xsend_cb ) {
+	if ( !xsend_cb )
         return 0;
-    }
     rc = xrecv( ssock, str, MSG_BUFFER - 1, 0 );
     if ( rc < 0 && errno != EAGAIN ) {
-        if ( errno == ECONNREFUSED ) {
+		if ( errno == ECONNREFUSED )
             xsend_cb = NULL;
-        }
         DEBUG(('I',1,"can't recv (fd=%d): %s",ssock,strerror(errno)));
     }
-    if ( rc < 3 || !str[2] ) {
+	if ( rc < 3 || !str[2] )
         return 0;
-    }
 	str[rc] = '\0';
 	return rc;
 }
@@ -113,10 +107,9 @@
     rc = vsnprintf( buf + 3, MSG_BUFFER - 3, fmt, args );
     va_end( args );
 
-    if ( xsend( sock, buf, rc + 4 ) < 0 ) {
+	if ( xsend( sock, buf, rc + 4 ) < 0 )
         DEBUG(('I',1,"can't send (fd=%d): %s",sock,strerror(errno)));
     }
-}
 
 
 void sline(const char *str, ...)
@@ -142,10 +135,9 @@
     va_end( args );
 
     qsendpkt( QC_TITLE, QLNAME, lin, strlen( lin ) + 1 );
-    if ( cfgi( CFG_USEPROCTITLE )) {
+	if ( cfgi( CFG_USEPROCTITLE ))
         setproctitle( lin );
     }
-}
 
 
 #define ST16I(_b_,_d_)	STORE16( _b_, _d_ ); INC16( _b_ )
@@ -175,9 +167,8 @@
     for ( a = e->addrs; a; a = a->next ) {
         char *as;
 
-        if ( p + strlen(( as = ftnaddrtoa( &a->addr ))) + 1 > buf + MSG_BUFFER ) {
+		if ( p + strlen(( as = ftnaddrtoa( &a->addr ))) + 1 > buf + MSG_BUFFER )
             break;
-        }
 		xstrcat((char *) p, as, MSG_BUFFER - ( p - buf ));
 		xstrcat((char *) p, " ", MSG_BUFFER - ( p - buf ));
 	}
diff -burw ./qico/src/qipc.h ./trunk/src/qipc.h
--- ./qico/src/qipc.h	2024-02-01 18:09:52.570741000 +0300
+++ ./trunk/src/qipc.h	2024-02-01 18:10:34.587420000 +0300
@@ -1,5 +1,5 @@
 /*
- * $Id: qipc.h,v 1.3 2005/05/16 11:17:30 mitry Exp $
+ * $Id: qipc.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: qipc.h,v $
  * Revision 1.3  2005/05/16 11:17:30  mitry
Only in ./qico/src: qipc_common.c
Only in ./qico/src: qipc_server.c
Only in ./qico/src: qipcng.h
diff -burw ./qico/src/qslib.c ./trunk/src/qslib.c
--- ./qico/src/qslib.c	2024-02-01 18:09:52.571385000 +0300
+++ ./trunk/src/qslib.c	2024-02-01 18:10:34.596942000 +0300
@@ -2,7 +2,7 @@
  * functions for all qico related programs
  **********************************************************/
 /*
- * $Id: qslib.c,v 1.12 2005/08/12 16:40:51 mitry Exp $
+ * $Id: qslib.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: qslib.c,v $
  * Revision 1.12  2005/08/12 16:40:51  mitry
@@ -54,8 +54,7 @@
 
 char *engms[13] = {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Any"
-};
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Any"};
 
 char *infostrs[] = {
 	"Address",
@@ -74,9 +73,8 @@
 {
     void	*p = malloc( size );
 
-    if ( p ) {
+	if ( p )
         return p;
-    }
 
 	write_log( "!!! xmalloc(): could not allocate %d bytes of memory", size );
 	abort();
@@ -87,9 +85,8 @@
 {
     void	*p = calloc( number, size );
 
-    if ( p ) {
+	if ( p )
         return p;
-    }
 
 	write_log( "!!! xcalloc(): could not allocate %dx%d bytes of memory", number, size );
 	abort();
@@ -100,15 +97,13 @@
 {
     void *p;
 
-    if ( ptr ) {
+	if ( ptr )
         p = realloc( ptr, size );
-    } else {
+	else
         p = ptr = malloc( size );
-    }
 
-    if ( p ) {
+	if ( p )
         return p;
-    }
 
 	write_log( "!!! xrealloc(): could not allocate %d bytes of memory", size );
 	abort();
@@ -136,9 +131,8 @@
 void strtr(char *s, char a, char b)
 {
     while( s && *s ) {
-        if( *s == a ) {
+		if( *s == a )
             *s = b;
-        }
 		s++;
 	}
 }
@@ -150,20 +144,18 @@
 
     if ( str ) {
         p = strchr( str, 0 );
-        while( p && n-- ) {
+		while( p && n-- )
             *--p = 0;
         }
     }
-}
 
 
 size_t chopc(char *str, char ch)
 {
     size_t	slen = strlen ( str ) - 1;
 
-    while( slen && str[slen] == ch ) {
+	while( slen && str[slen] == ch )
         str[slen--] = '\0';
-    }
 
 	return slen;
 }
@@ -175,9 +167,8 @@
 char *skip_blanks(char *str)
 {
     if ( str != NULL )
-        while( XBLANK( str )) {
+        	while( XBLANK( str ))
             str++;
-        }
 	return str;
 }
 
@@ -210,27 +201,23 @@
     register const char	*s = src;
     register size_t		n = siz;
 
-    if ( !src ) {
+	if ( !src )
         return dst;
-    }
-    if ( !dst ) {
+	if ( !dst )
         return NULL;
-    }
 
     /* Copy as many bytes as will fit */
     if ( n != 0 && --n != 0 ) {
         do {
-            if ((*d++ = *s++) == 0) {
+			if ((*d++ = *s++) == 0)
                 break;
-            }
         } while (--n != 0);
     }
 
     if (n == 0) {
-        if (siz != 0) {
+		if (siz != 0)
             *d = '\0';
         }
-    }
 
 	return dst;
 }
@@ -249,17 +236,14 @@
     register size_t		n = siz;
     size_t			dlen;
 
-    if ( !src ) {
+	if ( !src )
         return dst;
-    }
-    if ( !dst ) {
+	if ( !dst )
         return NULL;
-    }
 
     /* Find the end of dst and adjust bytes left but don't go past end */
-    while (n-- != 0 && *d != '\0') {
+	while (n-- != 0 && *d != '\0')
         d++;
-    }
 	dlen = d - dst;
 	n = siz - dlen;
 
@@ -280,15 +264,13 @@
     char	*s;
     size_t	len;
 
-    if ( !str ) {
+	if ( !str )
         return NULL;
-    }
 
     len = strlen( str ) + 1;
     s = xmalloc( len );
-    if ( s ) {
+	if ( s )
         return xstrcpy( s, str, len );
-    }
 
 	write_log( "!!! xstrdup(): could not duplicate string");
 	abort();
@@ -299,9 +281,8 @@
 {
     xfree( *dst );
 
-    if ( !src ) {
+	if ( !src )
         return NULL;
-    }
 
 	return *dst = xstrdup( src );
 }
@@ -311,12 +292,10 @@
 {
     size_t	len;
 
-    if ( !src ) {
+	if ( !src )
         return *dst;
-    }
-    if ( !*dst ) {
+	if ( !*dst )
         return *dst = xstrdup( src );
-    }
 
 	len = strlen( *dst ) + strlen( src ) + 1;
 	*dst = xrealloc( *dst, len );
@@ -343,9 +322,8 @@
     register const unsigned char	*s = str;
     register const char		*p;
 
-    if ( str == NULL ) {
+	if ( str == NULL )
         return 0;
-    }
 
 	while( *s && *(s + 1)) {
 		if (( p = strchr( hexdigitsall, *(s++)))) {
@@ -353,13 +331,11 @@
             if (( p = strchr( hexdigitsall, *(s++)))) {
                 *dest <<= 4;
                 *dest++ |= (byte) ( p - hexdigitsall );
-            } else {
+			} else
                 return 0;
-            }
-        } else {
+		} else
             return 0;
         }
-    }
 
 	return ( dest - (unsigned char *) binstr );
 }
@@ -370,10 +346,10 @@
     struct tm	gt;
     time_t		gmt;
 
-    memcpy( &gt, gmtime( &tt ), sizeof( struct tm ));
+	memmove( &gt, gmtime( &tt ), sizeof( struct tm ));
     gt.tm_isdst = 0;
     gmt = mktime( &gt );
-    memcpy( &gt, localtime( &tt ), sizeof( struct tm ));
+	memmove( &gt, localtime( &tt ), sizeof( struct tm ));
 	gt.tm_isdst = 0;
 	return mktime( &gt ) - gmt;
 }
@@ -515,14 +491,13 @@
     **  the top of memory.
     */
 
-    if (envp != NULL) {
-        for (i = 0; envp[i] != NULL; i++) {
+	if (envp != NULL)
+	{
+		for (i = 0; envp[i] != NULL; i++)
             continue;
-        }
         environ = (char **) xmalloc(sizeof (char *) * (i + 1));
-        for (i = 0; envp[i] != NULL; i++) {
+		for (i = 0; envp[i] != NULL; i++)
             environ[i] = xstrdup(envp[i]);
-        }
 		environ[i] = NULL;
 	}
 
@@ -537,17 +512,17 @@
     **  Use all contiguous argv and envp pointers starting at argv[0]
     */
 
-    for (i = 0; i < argc; i++) {
-        if (i == 0 || LastArgv + 1 == argv[i]) {
+	for (i = 0; i < argc; i++)
+	{
+		if (i == 0 || LastArgv + 1 == argv[i])
             LastArgv = argv[i] + strlen(argv[i]);
         }
-    }
-    for (i = 0; LastArgv != NULL && envp != NULL && envp[i] != NULL; i++) {
-        if (LastArgv + 1 == envp[i]) {
+	for (i = 0; LastArgv != NULL && envp != NULL && envp[i] != NULL; i++)
+	{
+		if (LastArgv + 1 == envp[i])
             LastArgv = envp[i] + strlen(envp[i]);
         }
     }
-}
 
 #if SPT_TYPE != SPT_BUILTIN
 
@@ -581,9 +556,8 @@
     va_end( ap );
 
     i = (int) strlen(buf);
-    if (i < 0) {
+	if (i < 0)
         return;
-    }
 
 #  if SPT_TYPE == SPT_PSTAT
 	pst.pst_command = buf;
@@ -597,16 +571,16 @@
     sysmips(SONY_SYSNEWS, NEWS_SETPSARGS, buf);
 #  endif /* SPT_TYPE == SPT_SYSMIPS */
 #  if SPT_TYPE == SPT_SCO
-    if (kmem < 0 || kmempid != CurrentPid) {
-        if (kmem >= 0) {
+	if (kmem < 0 || kmempid != CurrentPid)
+	{
+		if (kmem >= 0)
             (void) close(kmem);
-        }
         kmem = open(_PATH_KMEM, O_RDWR, 0);
-        if (kmem < 0) {
+		if (kmem < 0)
             return;
-        }
         if ((j = fcntl(kmem, F_GETFD, 0)) < 0 ||
-                fcntl(kmem, F_SETFD, j | FD_CLOEXEC) < 0) {
+		    fcntl(kmem, F_SETFD, j | FD_CLOEXEC) < 0)
+		{
 			(void) close(kmem);
 			kmem = -1;
 			return;
@@ -615,24 +589,22 @@
     }
     buf[PSARGSZ - 1] = '\0';
     seek_off = UVUBLK + (off_t) u.u_psargs - (off_t) &u;
-    if (lseek(kmem, (off_t) seek_off, SEEK_SET) == seek_off) {
+	if (lseek(kmem, (off_t) seek_off, SEEK_SET) == seek_off)
         (void) write(kmem, buf, PSARGSZ);
-    }
 #  endif /* SPT_TYPE == SPT_SCO */
 #  if SPT_TYPE == SPT_REUSEARGV
-    if (LastArgv == NULL) {
+	if (LastArgv == NULL)
         return;
-    }
 
-    if (i > LastArgv - Argv[0] - 2) {
+	if (i > LastArgv - Argv[0] - 2)
+	{
         i = LastArgv - Argv[0] - 2;
         buf[i] = '\0';
     }
     (void) xstrcpy(Argv[0], buf, i + 1);
     p = &Argv[0][i];
-    while (p < LastArgv) {
+	while (p < LastArgv)
         *p++ = SPT_PADCHAR;
-    }
 	Argv[1] = NULL;
 #  endif /* SPT_TYPE == SPT_REUSEARGV */
 #  if SPT_TYPE == SPT_CHANGEARGV
@@ -649,9 +621,7 @@
 {
     int i=0;
     cmdstr=argv[0];
-    while(envp[i]) {
-        i++;
-    }
+    while(envp[i])i++;
     environ=xmalloc(sizeof(char*)*(i+1));
     i=0;
     while(envp[i]) {
@@ -660,29 +630,18 @@
     }
     environ[i]=NULL;
     cmdstrend=argv[0]+strlen(argv[0]);
-    for(i=1; i<argc; i++)if(cmdstrend+1==argv[i]) {
-            cmdstrend=argv[i]+strlen(argv[i]);
+    for(i=1;i<argc;i++)if(cmdstrend+1==argv[i])cmdstrend=argv[i]+strlen(argv[i]);
+    for(i=0;envp[i];i++)if(cmdstrend+1==envp[i])cmdstrend=envp[i]+strlen(envp[i]);
         }
-    for(i=0; envp[i]; i++)if(cmdstrend+1==envp[i]) {
-            cmdstrend=envp[i]+strlen(envp[i]);
-        }
-}
 
 
 void setproctitle(char *str)
 {
     char *p;
-    if(!cmdstr) {
-        return;
+    if(!cmdstr)return;
+    for(p=cmdstr;p<cmdstrend&&*str;p++,str++)*p=*str;
+    *p++=0;while(p<cmdstrend)*p++=' ';
     }
-    for(p=cmdstr; p<cmdstrend&&*str; p++,str++) {
-        *p=*str;
-    }
-    *p++=0;
-    while(p<cmdstrend) {
-        *p++=' ';
-    }
-}
 #endif /* 0 */
 
 #endif
@@ -694,9 +653,8 @@
 
     printf( "%s v%s [%s]\n", progn, version, cvsdate );
 
-    if( !uname( &uts )) {
+	if( !uname( &uts ))
         printf( "%s %s (%s), ", uts.sysname, uts.release, uts.machine );
-    }
 	printf(
 #ifdef __GNUC__
 		"g"
diff -burw ./qico/src/qslib.h ./trunk/src/qslib.h
--- ./qico/src/qslib.h	2024-02-01 18:09:52.571457000 +0300
+++ ./trunk/src/qslib.h	2024-02-01 18:10:34.590110000 +0300
@@ -1,5 +1,5 @@
 /*
- * $Id: qslib.h,v 1.14 2005/08/12 16:40:51 mitry Exp $
+ * $Id: qslib.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: qslib.h,v $
  * Revision 1.14  2005/08/12 16:40:51  mitry
diff -burw ./qico/src/queue.c ./trunk/src/queue.c
--- ./qico/src/queue.c	2024-02-01 18:09:52.571604000 +0300
+++ ./trunk/src/queue.c	2024-02-01 18:10:34.589566000 +0300
@@ -2,7 +2,7 @@
  * Queue operations
  **********************************************************/
 /*
- * $Id: queue.c,v 1.12 2005/08/18 16:11:22 mitry Exp $
+ * $Id: queue.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: queue.c,v $
  * Revision 1.12  2005/08/18 16:11:22  mitry
@@ -34,15 +34,9 @@
 #define _Z(x) ((qitem_t *)x)
 int q_cmp(const void *q1, const void *q2)
 {
-    if(_Z(q1)->addr.z!=_Z(q2)->addr.z) {
-        return _Z(q1)->addr.z-_Z(q2)->addr.z;
-    }
-    if(_Z(q1)->addr.n!=_Z(q2)->addr.n) {
-        return _Z(q1)->addr.n-_Z(q2)->addr.n;
-    }
-    if(_Z(q1)->addr.f!=_Z(q2)->addr.f) {
-        return _Z(q1)->addr.f-_Z(q2)->addr.f;
-    }
+	if(_Z(q1)->addr.z!=_Z(q2)->addr.z)return _Z(q1)->addr.z-_Z(q2)->addr.z;
+	if(_Z(q1)->addr.n!=_Z(q2)->addr.n)return _Z(q1)->addr.n-_Z(q2)->addr.n;
+	if(_Z(q1)->addr.f!=_Z(q2)->addr.f)return _Z(q1)->addr.f-_Z(q2)->addr.f;
 	return _Z(q1)->addr.p-_Z(q2)->addr.p;
 }
 
@@ -64,9 +58,8 @@
 
     for( i = &q_queue; *i && ( r = q_cmp( &(*i)->addr, fa )) < 0 ; i = &((*i)->next ));
 
-    if ( !r ) {
+	if ( !r )
         return *i;
-    }
 
 	q = xcalloc( 1, sizeof( qitem_t ));
 	q->next = *i;
@@ -96,29 +89,23 @@
                 fcount = 0;
                 while( fgets( s, MAX_STRING - 1, f )) {
                     DEBUG(('Q',5,"scan lo -> '%s'",s));
-                    if ( *s == '~' ) {
+					if ( *s == '~' )
                         continue;
-                    }
 
                     p = strrchr( s, '\r' );
-                    if ( p ) {
+					if ( p )
                         *p = '\0';
-                    }
                     p = strrchr( s, '\n' );
-                    if ( p ) {
+					if ( p )
                         *p = '\0';
-                    }
                     p = s;
-                    if ( *p == '^' || *p == '#' ) {
+					if ( *p == '^' || *p == '#' )
                         p++;
-                    }
                     m = mappath( p );
-                    if ( *m ) {
+					if ( *m )
                         p = m;
-                    }
-                    if ( !stat( p, &sb )) {
+					if ( !stat( p, &sb ))
                         total += sb.st_size;
-                    }
 					fcount++;
                                         DEBUG(('Q',5,"%10lu '%s'",(unsigned long) sb.st_size,p));
 				}
@@ -149,16 +136,16 @@
 
     if ( !stat( name, &sb )
             && (( sb.st_mode & S_IFMT ) == S_IFDIR
-                || ( sb.st_mode & S_IFMT ) == S_IFLNK )) {
+			|| ( sb.st_mode & S_IFMT ) == S_IFLNK ))
+	{
         if ( sb.st_mtime != *mtime || rslow ) {
             DEBUG(('Q',4,"scan box '%s'",name));
             *mtime = sb.st_mtime;
             d = opendir( name );
             if ( d ) {
                 while(( de = readdir( d ))) {
-                    if ( de->d_name[0] == '.' ) {
+					if ( de->d_name[0] == '.' )
                         continue;
-                    }
 					snprintf( p, MAX_PATH, "%s/%s", name, de->d_name );
 					if ( !stat( p, &sb ) && S_ISREG( sb.st_mode )) {
 						DEBUG(('Q',6,"add file '%s'",p));
@@ -166,9 +153,8 @@
                     }
                 }
                 closedir( d );
-            } else {
+			} else
                 write_log("can't open %s: %s",name,strerror(errno));
-            }
 
 			*size = total;
 		}
@@ -199,9 +185,8 @@
 
     switch( type ) {
     case T_REQ:
-        if ( !stat( fname, &sb )) {
+		if ( !stat( fname, &sb ))
             q->reqs = sb.st_size;
-        }
 		break;
 
 	case T_NETMAIL:
@@ -228,9 +213,8 @@
     off_t total = 0;
 
     for( i = 0; i < 6; i++ )
-        if ( q->times[i] ) {
+		if ( q->times[i] )
             total += q->sizes[i];
-        }
 	return total;
 }
 
@@ -257,19 +241,13 @@
     if(cfgs(CFG_LONGBOXPATH)) {
         if((d=opendir(ccs))!=0) {
             while((de=readdir(d))) {
-                if ( de->d_name[0] == '.' ) {
+				if ( de->d_name[0] == '.' )
                     continue;
-                }
                 n=sscanf(de->d_name,"%d.%d.%d.%d.%c",&a.z,&a.n,&a.f,&a.p,&flv);
-                if(n) {
-                    DEBUG(('Q',4,"found lbox '%s', parse: %d:%d/%d.%d (%c) rc=%d",de->d_name,a.z,a.n,a.f,a.p,n==5?flv:'*',n));
-                }
+				if(n)DEBUG(('Q',4,"found lbox '%s', parse: %d:%d/%d.%d (%c) rc=%d",de->d_name,a.z,a.n,a.f,a.p,n==5?flv:'*',n));
                 if(n==4||n==5) {
-                    if(n==4) {
-                        snprintf(rev,40,"%d.%d.%d.%d",a.z,a.n,a.f,a.p);
-                    } else {
-                        snprintf(rev,40,"%d.%d.%d.%d.%c",a.z,a.n,a.f,a.p,flv);
-                    }
+					if(n==4)snprintf(rev,40,"%d.%d.%d.%d",a.z,a.n,a.f,a.p);
+					    else snprintf(rev,40,"%d.%d.%d.%d.%c",a.z,a.n,a.f,a.p,flv);
 					if(!strcmp(de->d_name,rev)) {
 						len=strlen(cfgs(CFG_LONGBOXPATH))+2+strlen(de->d_name);
 						p=xmalloc(len);
@@ -280,44 +258,25 @@
                             q->touched=1;
                             q->what|=T_ARCMAIL;
                             cfgs(CFG_DEFBOXFLV);
-                            if(n==4) {
-                                flv=(ccs&&*ccs)?(*ccs):'h';
-                            }
+							if(n==4)flv=(ccs&&*ccs)?(*ccs):'h';
                             switch(tolower(flv)) {
-                            case 'h':
-                                q->flv|=Q_HOLD;
-                                break;
+							    case 'h': q->flv|=Q_HOLD;break;
                             case 'n':
-                            case 'f':
-                                q->flv|=Q_NORM;
-                                break;
-                            case 'd':
-                                q->flv|=Q_DIR;
-                                break;
-                            case 'c':
-                                q->flv|=Q_CRASH;
-                                break;
-                            case 'i':
-                                q->flv|=Q_IMM;
-                                break;
-                            default :
-                                write_log("unknown longbox flavour '%c' for dir %s",flv,de->d_name);
+							    case 'f': q->flv|=Q_NORM;break;
+							    case 'd': q->flv|=Q_DIR;break;
+							    case 'c': q->flv|=Q_CRASH;break;
+							    case 'i': q->flv|=Q_IMM;break;
+							    default : write_log("unknown longbox flavour '%c' for dir %s",flv,de->d_name);
                             }
                         }
                         xfree(p);
-                    } else {
-                        DEBUG(('Q',1,"strange: find: '%s', calc: '%s'",de->d_name,rev));
+					} else DEBUG(('Q',1,"strange: find: '%s', calc: '%s'",de->d_name,rev));
+				} else if(*de->d_name!='.')DEBUG(('Q',2,"bad longbox name %s",de->d_name));
                     }
-                } else if(*de->d_name!='.') {
-                    DEBUG(('Q',2,"bad longbox name %s",de->d_name));
-                }
-            }
             closedir(d);
-        } else {
-            write_log("can't open %s: %s",ccs,strerror(errno));
+		} else write_log("can't open %s: %s",ccs,strerror(errno));
         }
     }
-}
 
 
 int q_rescan(qitem_t **curr, int rslow)
@@ -334,9 +293,8 @@
         q->what = q->touched = q->canpoll = 0;
     }
 
-    if ( outbound_rescan( q_each, rslow ) == 0 ) {
+    if ( outbound_rescan( q_each, rslow ) == 0 )
         return 0;
-    }
 
     rescan_boxes( rslow );
     p = &q_queue;
@@ -344,28 +302,25 @@
     while(( q = *p )) {
         if ( !q->touched ) {
             *p = q->next;
-            if ( q == *curr ) {
+            if ( q == *curr )
                 *curr = *p;
-            }
             xfree( q );
         } else {
             outbound_getstatus( &q->addr, &sts );
             q->flv |= sts.flags;
             q->try = sts.try;
-            if ( sts.htime > time(NULL) ) {
+            if ( sts.htime > time(NULL) )
                 q->onhold = sts.htime;
-            } else {
+            else
                 q->flv &= ~Q_ANYWAIT;
-            }
 
             qpqueue( &q->addr, q->pkts, q_sum( q ) + q->reqs, q->try, q->flv );
             p = &( (*p)->next );
         }
     }
 
-    if ( !*curr ) {
+    if ( !*curr )
         *curr = q_queue;
-    }
 
     rescan_time = time( NULL ) - rescan_time;
 
@@ -380,7 +335,6 @@
 
     qqreset();
 
-    for( q = q_queue; q ; q = q->next ) {
+	for( q = q_queue; q ; q = q->next )
         qpqueue( &q->addr, q->pkts, q_sum( q ) + q->reqs, q->try, q->flv );
-    }
 }
diff -burw ./qico/src/replace.h ./trunk/src/replace.h
--- ./qico/src/replace.h	2024-02-01 18:09:52.571666000 +0300
+++ ./trunk/src/replace.h	2024-02-01 18:10:34.588643000 +0300
@@ -1,6 +1,6 @@
 /***************************************************************************
  * Replace functions declarations
- * $Id: replace.h,v 1.5 2005/05/17 18:17:42 mitry Exp $
+ * $Id: replace.h 18 2010-08-23 15:50:49Z semik $
  ***************************************************************************/
 #ifndef __REPLACE_H__
 #define __REPLACE_H__
diff -burw ./qico/src/session.c ./trunk/src/session.c
--- ./qico/src/session.c	2024-02-01 18:09:52.571947000 +0300
+++ ./trunk/src/session.c	2024-02-01 18:10:34.591045000 +0300
@@ -2,9 +2,18 @@
  * Session control.
  **********************************************************/
 /*
- * $Id: session.c,v 1.25 2005/08/11 19:06:53 mitry Exp $
+ * $Id: session.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: session.c,v $
+ * Revision 1.28  2006/07/22 13:13:01  mitry
+ * Use file times in GMT on some protocols.
+ *
+ * Revision 1.27  2006/07/10 16:16:30  mitry
+ * Binkp: prevent infinite calling system if some files were suspended
+ *
+ * Revision 1.26  2005/09/06 20:42:04  mitry
+ * Added macros to qpreset() calls
+ *
  * Revision 1.25  2005/08/11 19:06:53  mitry
  * Added new macro MAILHOURS
  *
@@ -76,34 +85,28 @@
 
     type = ( off == -1 ) ? IS_FLO : whattype( rem );
 
-    if ( type == IS_PKT && fromlo ) {
+	if ( type == IS_PKT && fromlo )
         type = IS_FILE;
-    }
 
     DEBUG(('S',2,"Add file: '%s', sendas: '%s', kill: '%c', fromLO: %s, offset: %ld, type: %ld",
            loc, rem ? rem : "(null)", kill, lo ? "yes" : "no", (long) off, (long) type));
 
-    if ( !bink && MAILHOURS	&& type != IS_PKT && type != IS_FLO ) {
+	if ( !bink && MAILHOURS	&& type != IS_PKT && type != IS_FLO )
         return;
-    }
 
     for( i = cfgsl( CFG_AUTOHOLD ); i; i = i->next )
-        if ( !xfnmatch( i->str, loc, FNM_PATHNAME )) {
+		if ( !xfnmatch( i->str, loc, FNM_PATHNAME ))
             return;
-        }
 
-    if ( rnode && rnode->options & O_HAT && type != IS_FLO ) {
+	if ( rnode && rnode->options & O_HAT && type != IS_FLO )
         return;
-    }
 
     switch( type ) {
     case IS_REQ:
-        if ( rnode && rnode->options & O_HRQ ) {
+		if ( rnode && rnode->options & O_HRQ )
             return;
-        }
-        if ( rnode && rnode->options & O_NRQ && !cfgi( CFG_IGNORENRQ )) {
+		if ( rnode && rnode->options & O_NRQ && !cfgi( CFG_IGNORENRQ ))
             return;
-        }
 		break;
         
 	case IS_PKT:
@@ -114,9 +117,8 @@
         break;
 
     default:
-        if ( rnode && rnode->options & ( O_HXT ) && rem ) {
+		if ( rnode && rnode->options & ( O_HXT ) && rem )
             return;
-        }
 		break;
 	}
 
@@ -145,14 +147,13 @@
     int		len, pathlen;
 
     DEBUG(('S',2,"Add filebox '%s'",path));
-    if ( !( d = opendir( path ))) {
+	if ( !( d = opendir( path )))
         return 0;
-    } else {
+	else {
         pathlen = strlen( path ) + 2;
         while(( de = readdir( d ))) {
-            if ( de->d_name[0] == '.' ) {
+			if ( de->d_name[0] == '.' )
                 continue;
-            }
 			len = pathlen + strlen( de->d_name );
 			p = xmalloc( len );
 			snprintf( p, len, "%s/%s", path, de->d_name );
@@ -164,10 +165,9 @@
                 addflist( fl, p, xstrdup( mn ), '^', 0, NULL, 0 );
                 totalf += sb.st_size;
                 totaln++;
-            } else {
+			} else
                 xfree( p );
             }
-        }
 		closedir( d );
 	}
 	return 1;
@@ -182,9 +182,7 @@
     asoflist(fl,fa,mode);
     for(j=cfgfasl(CFG_FILEBOX); j; j=j->next)
         if(addr_cmp(fa,&j->addr)) {
-            if(!boxflist(fl,j->str)) {
-                write_log("can't open filebox '%s'",j->str);
-            }
+            if(!boxflist(fl,j->str))write_log("can't open filebox '%s'",j->str);
             break;
         }
 
@@ -213,11 +211,10 @@
 
         case '#':				/* Trunc sent file */
             f = fopen( ktfl->tosend, "w" );
-            if ( f ) {
+			if ( f )
                 fclose( f );
-            } else {
+			else
                 write_log( "can't truncate %s: %s", ktfl->tosend, strerror( errno ));
-            }
 			break;
 		}
 	}
@@ -249,9 +246,8 @@
             fclose( fl->lo );
             fl->lo = NULL;
 
-            if ( !keep ) {
+			if ( !keep )
                 lunlink( fl->tosend );
-            }
 
 		} else if ( fl->sendas ) {
 			killtrunc( fl );
@@ -297,9 +293,8 @@
         }
 
         /* Unlink successfully sent REQ file */
-        if ( l1->type == IS_REQ && rc && !l1->sendas ) {
+		if ( l1->type == IS_REQ && rc && !l1->sendas )
             lunlink( l1->tosend );
-        }
 		
 		xfree( l1->sendas );
 		xfree( l1->tosend );
@@ -314,30 +309,26 @@
     flist_t *fl = NULL, *l = NULL;
 
     makeflist( &fl, fa, 0 );
-    for( l = fl; l; l = l->next ) {
+	for( l = fl; l; l = l->next )
         flexecute( l );
-    }
     flkill( &fl, 1 );
 }
 
 int receivecb(char *fn)
 {
     char *p = strrchr( fn, '.' );
-    if ( !p ) {
+    if ( !p )
         return 0;
-    } else {
+    else
         p++;
-    }
-    if ( !strcasecmp( p, "pkt" ) && cfgi( CFG_SHOWPKT )) {
+    if ( !strcasecmp( p, "pkt" ) && cfgi( CFG_SHOWPKT ))
         return( showpkt( fn ));
-    }
     if ( !strcasecmp( p, "req" )) {
-        if ( emsi_lo & O_NOFREQS ) {
+        if ( emsi_lo & O_NOFREQS )
             return 1;
-        } else {
+        else
             return( freq_recv( fn ));
         }
-    }
     return 0;
 }
 
@@ -349,41 +340,27 @@
     write_log("wazoo send");
     sline("Init zsend...");
     rc=zmodem_sendinit(zap);
-    sendf.cps=1;
-    sendf.allf=totaln;
-    sendf.ttot=totalf;
+    sendf.cps=1;sendf.allf=totaln;sendf.ttot=totalf;
     if(!rc)for(l=fl; l; l=l->next) {
             if(l->sendas) {
-                rc=cfgi(CFG_AUTOTICSKIP)?ticskip:0;
-                ticskip=0;
-                if(!rc||!istic(l->tosend)) {
-                    rc=zmodem_sendfile(l->tosend,l->sendas,&total,&totaln);
-                } else {
-                    write_log("tic file '%s' auto%sed",l->tosend,rc==ZSKIP?"skipp":"refus");
-                }
-                if(rc<0) {
-                    break;
-                }
+            rc=cfgi(CFG_AUTOTICSKIP)?ticskip:0;ticskip=0;
+            if(!rc||!istic(l->tosend))rc=zmodem_sendfile(l->tosend,l->sendas,&total,&totaln);
+                else write_log("tic file '%s' auto%sed",l->tosend,rc==ZSKIP?"skipp":"refus");
+            if(rc<0)break;
                 l->suspend = (rc == ZFERR);
                 /*
                 if(!rc||rc==ZSKIP) {
                 */
-                if(l->type==IS_REQ) {
-                    was_req=1;
-                }
+                if(l->type==IS_REQ)was_req=1;
                 flexecute(l);
                 /*}*/
-                if(rc==ZSKIP||rc==ZFERR) {
-                    ticskip=rc;
+            if(rc==ZSKIP||rc==ZFERR)ticskip=rc;
+        } else flexecute(l);
                 }
-            } else {
-                flexecute(l);
-            }
-        }
 
     sline("Done zsend...");
     rc=zmodem_senddone();
-    qpreset(1);
+    qpreset( QPR_SEND );
     return(rc<0);
 }
 
@@ -392,7 +369,7 @@
     int rc;
     write_log("wazoo receive");
     rc=zmodem_receive(cfgs(CFG_INBOUND),zap);
-    qpreset(0);
+    qpreset( QPR_RECV );
     return(rc==RCDO||rc==ERROR);
 }
 
@@ -411,9 +388,8 @@
         if ( l->type == IS_REQ ) {
             DEBUG(('S',1,"Transmitting request(s)"));
             rc = hydra_send( l->tosend, l->sendas );
-            if ( rc == XFER_ABORT) {
+            if ( rc == XFER_ABORT)
                 break;
-            }
             l->suspend = (rc == XFER_SUSPEND);
 
             /*
@@ -443,21 +419,19 @@
             ticskip = 0;
 
             if ( file_count == 0 && !rh1 ) {
-                if ( hydra_send( NULL, NULL ) == XFER_ABORT ) {
+                if ( hydra_send( NULL, NULL ) == XFER_ABORT )
                     break;
-                }
                 file_count--;
             }
 
-            if ( !rc || !istic( l->tosend )) {
+            if ( !rc || !istic( l->tosend ))
                 rc = hydra_send( l->tosend, l->sendas );
-            } else
+            else
                 write_log( "tic file '%s' auto%sed", l->tosend,
                            ( rc == XFER_SKIP ) ? "skipp" : "suspend" );
 
-            if ( rc == XFER_ABORT ) {
+            if ( rc == XFER_ABORT )
                 break;
-            }
 
             l->suspend = (rc == XFER_SUSPEND);
             /*
@@ -467,13 +441,11 @@
             file_count--;
             /*}*/
 
-            if ( rc == XFER_SKIP || rc == XFER_SUSPEND ) {
+            if ( rc == XFER_SKIP || rc == XFER_SUSPEND )
                 ticskip = rc;
-            }
 
-        } else {
+        } else
             flexecute( l );
-        }
 
     if ( rc == XFER_ABORT ) {
         hydra_deinit();
@@ -506,32 +478,24 @@
         i=i->next;
     }
     for(*s=0; i; i=i->next) {
-        if(k) {
-            xstrcat(s," ",MAX_STRING);
-        }
+        if(k)xstrcat(s," ",MAX_STRING);
         xstrcat(s,ftnaddrtoda(&i->addr),MAX_STRING);
-        k++;
-        if(k==2) {
+        k++;if(k==2) {
             write_log("    aka: %s",s);
-            k=0;
-            *s=0;
+            k=0;*s=0;
         }
     }
-    if(k) {
-        write_log("    aka: %s",s);
-    }
+    if(k)write_log("    aka: %s",s);
     write_log(" system: %s",e->name);
     write_log("   from: %s",e->place);
     write_log("  sysop: %s",e->sysop);
     write_log("  phone: %s",e->phone);
     write_log("  flags: [%d] %s",e->speed,e->flags);
     write_log(" mailer: %s",e->mailer);
-    mt=*localtime(&tt);
-    t=gmtime(&e->time);
+    mt=*localtime(&tt);t=gmtime(&e->time);
     write_log("   time: %02d:%02d:%02d, %s",t->tm_hour,t->tm_min,t->tm_sec,e->wtime?e->wtime:"unknown");
-    if(t->tm_mday!=mt.tm_mday||t->tm_mon!=mt.tm_mon||t->tm_year!=mt.tm_year) {
+    if(t->tm_mday!=mt.tm_mday||t->tm_mon!=mt.tm_mon||t->tm_year!=mt.tm_year)
         write_log("   date: %02d/%02d/%04d",t->tm_mday,t->tm_mon+1,t->tm_year+1900);
-    }
     if(e->holded&&!e->files&&!e->netmail)write_log(" for us: %d%c on hold",
         SIZES(e->holded),SIZEC(e->holded));
     else if(e->files||e->netmail)write_log(" for us: %d%c mail, %d%c files",
@@ -581,14 +545,12 @@
                       cfgs( CFG_PROTORDER ), NULL, TRUE );
         rc = emsi_send();
 
-        if ( rc < 0 ) {
+        if ( rc < 0 )
             return S_REDIAL | S_ADDTRY;
-        }
 
         rc = emsi_recv( SM_OUTBOUND, rnode );
-        if ( rc < 0) {
+        if ( rc < 0)
             return S_REDIAL | S_ADDTRY;
-        }
 
         title( "Outbound session %s", ftnaddrtoa( &rnode->addrs->addr ));
 
@@ -602,17 +564,14 @@
         flkill( &fl, 0 );
         totalf = totalm = 0;
 
-        for( pp = rnode->addrs; pp; pp = pp->next) {
+        for( pp = rnode->addrs; pp; pp = pp->next)
             makeflist( &fl, &pp->addr, originator );
-        }
 
-        if ( rnode->pwd && strlen( rnode->pwd )) {
+        if ( rnode->pwd && strlen( rnode->pwd ))
             rnode->options |= O_PWD;
-        }
 
-        if ( nodelist_listed( rnode->addrs, cfgi( CFG_NEEDALLLISTED ))) {
+        if ( nodelist_listed( rnode->addrs, cfgi( CFG_NEEDALLLISTED )))
             rnode->options |= O_LST;
-        }
 
     } else {
     /*
@@ -626,11 +585,10 @@
 
         write_log( "starting inbound EMSI session" );
 
-        if (( t = getenv( "CALLER_ID" )) && strcasecmp( t, "none" ) && strlen( t ) > 3 ) {
+        if (( t = getenv( "CALLER_ID" )) && strcasecmp( t, "none" ) && strlen( t ) > 3 )
             title( "Inbound session %s (CID %s)", ftnaddrtoa( &rnode->addrs->addr ), t );
-        } else {
+        else
             title( "Inbound session %s", ftnaddrtoa( &rnode->addrs->addr ));
-        }
 
         LOG_LOCK_NODE
 
@@ -681,9 +639,8 @@
                 /* Or we and remote have equal passwords */
             {
                 makeflist( &fl, &pp->addr, originator );
-                if ( t ) {
+                if ( t )
                     rnode->options |= O_PWD;
-                }
             } else {
                 write_log( "password not matched for %s", ftnaddrtoa( &pp->addr ));
                 write_log( "  (got '%s' instead of '%s')", rnode->pwd, t );
@@ -696,13 +653,10 @@
             flkill( &fl, 0 );
         }
 
-        if ( nodelist_listed( rnode->addrs, cfgi( CFG_NEEDALLLISTED ))) {
+        if ( nodelist_listed( rnode->addrs, cfgi( CFG_NEEDALLLISTED )))
             rnode->options |= O_LST;
-        }
 
-        pr[2] = 0;
-        pr[1] = 0;
-        pr[0] = 0;
+        pr[2] = 0; pr[1] = 0; pr[0] = 0;
 
         if ( rc ) {                          /* Bad password - abort session */
             emsi_lo |= O_BAD;
@@ -715,13 +669,10 @@
                 /*            emsi_lo |= O_NRQ;
 
                         if ( xproto == FR_NOTAVAILABLE || rc ) */
-            {
                 emsi_lo |= O_HRQ;
-            }
 
-            if ( MAILHOURS ) {
+            if ( MAILHOURS )
                 emsi_lo |= O_HXT | O_HRQ;
-            }
 
             if ( cfgi( CFG_SENDONLY )) {
                 emsi_lo |= O_HAT;
@@ -775,16 +726,14 @@
                 }
             }
 
-            if ( cfgs( CFG_PROTORDER ) && strchr( ccs, 'C' )) {
+            if ( cfgs( CFG_PROTORDER ) && strchr( ccs, 'C' ))
                 pr[1] = 'C';
-            } else {
+            else
                 rnode->opt &= ~MO_CHAT;
             }
-        }
 
-        if ( !*pr ) {
+        if ( !*pr )
             emsi_lo |= P_NCP;
-        }
 
         emsi_makedat( &rnode->addrs->addr, totalm, totalf, emsi_lo,
             pr, NULL, !(emsi_lo & O_BAD));
@@ -810,9 +759,8 @@
 
     rnode->starttime = time( NULL );
 
-    if ( cfgi( CFG_MAXSESSION )) {
+    if ( cfgi( CFG_MAXSESSION ))
         alarm( cci * 60 );
-    }
 
     DEBUG(('S',1,"Maxsession: %d",cci));
 
@@ -885,14 +833,11 @@
     chatinit( rnode->opt & MO_CHAT ? proto : -1 );
 
     IFPerl( rc = perl_on_session( s );
-    if( rc != S_OK ) {
-    flkill( &fl, 0 );
-        return rc;
-    } );
+        if( rc != S_OK ) { flkill( &fl, 0 ); return rc; } );
 
     qemsisend( rnode );
-    qpreset( 0 );
-    qpreset( 1 );
+    qpreset( QPR_RECV );
+    qpreset( QPR_SEND );
 
     switch ( proto ) {
         case P_ZEDZAP:
@@ -903,22 +848,18 @@
         xproto = ( proto & P_ZEDZAP ) ? CZ_ZEDZAP : (( proto & P_DIRZAP ) ? CZ_DIRZAP : CZ_ZEDZIP );
         if ( originator ) {
             rc = wazoosend( xproto );
-            if ( !rc ) {
+                if ( !rc )
                 rc = wazoorecv( xproto );
-            }
-            if( got_req && !rc ) {
+                if( got_req && !rc )
                 rc = wazoosend( xproto );
-            }
         } else {
             rc = wazoorecv( xproto | 0x0100 );
-            if ( rc ) {
+                if ( rc )
                 return S_REDIAL;
-            }
             rc = wazoosend( xproto );
-            if ( was_req ) {
+                if ( was_req )
                 rc = wazoorecv( xproto );
             }
-        }
             break;
 
         case P_HYDRA:
@@ -932,19 +873,11 @@
         recvf.ttot = rnode->netmail + rnode->files;
         rc = 1;
         switch ( proto ) {
-        case P_HYDRA:
-            rc = 1;
-            break;
+                case P_HYDRA: rc = 1; break;
 #ifdef HYDRA8K16K
-        case P_HYDRA4:
-            rc = 2;
-            break;
-        case P_HYDRA8:
-            rc = 4;
-            break;
-        case P_HYDRA16:
-            rc = 8;
-            break;
+                case P_HYDRA4: rc = 2; break;
+                case P_HYDRA8: rc = 4; break;
+                case P_HYDRA16: rc = 8; break;
 #endif/*HYDRA8K16K*/
             }
             rc = hydra( originator, rc, xproto );
@@ -986,19 +919,16 @@
     rnode->starttime = 0;
     rnode->realspeed = effbaud = speed;
 
-    if ( !originator ) {
+    if ( !originator )
         rnode->options |= O_INB;
-    }
 
-    if ( is_ip ) {
+    if ( is_ip )
         rnode->options |= O_TCP;
-    }
 
     memset( &ndefaddr, 0, sizeof( ndefaddr ));
 
-    if ( calladdr ) {
+    if ( calladdr )
         addr_cpy( &ndefaddr, calladdr);
-    }
 
     if ( cfgi( CFG_MINSPEED ) && speed < cci ) {
         write_log( "connection speed is too slow (min %d required)", cci );
@@ -1015,6 +945,8 @@
     signal( SIGINT, tty_sighup );
     signal( SIGCHLD, SIG_DFL );
 
+    ftime_is_gmt = ( type == SESSION_BINKP );
+
     switch ( type ) {
         case SESSION_AUTO:
             write_log( "trying EMSI..." );
@@ -1045,22 +977,18 @@
 
     signal( SIGALRM, SIG_DFL );
 
-    for( pp = rnode->addrs; pp; pp = pp->next ) {
+    for( pp = rnode->addrs; pp; pp = pp->next )
         outbound_unlocknode( &pp->addr, LCK_x );
-    }
 
     if (( rnode->options & O_NRQ && !cfgi( CFG_IGNORENRQ ))
-            || rnode->options & O_HRQ ) {
+        || rnode->options & O_HRQ )
         rc |= S_HOLDR;
-    }
 
-    if ( rnode->options & O_HXT ) {
+    if ( rnode->options & O_HXT )
         rc |= S_HOLDX;
-    }
 
-    if( rnode->options & O_HAT ) {
+    if( rnode->options & O_HAT )
         rc |= S_HOLDA;
-    }
 
     sest = rnode->starttime ? time( NULL ) - rnode->starttime : 0;
 
@@ -1084,9 +1012,9 @@
 
     if ( rnode->starttime && cfgs( CFG_HISTORY )) {
         h = fopen( ccs, "at" );
-        if ( !h ) {
+        if ( !h )
             write_log( "can't open '%s' for writing: %s", ccs, strerror( errno ));
-        } else {
+        else {
             fprintf( h, "%s,%ld,%ld,%s,%s%s%c%d,%lu,%lu\n",
                 rnode->tty, rnode->starttime, sest,
                 remote_id,
@@ -1101,14 +1029,12 @@
 
     while( freq_pktcount ) {
         snprintf( s, MAX_STRING, "/tmp/qpkt.%04lx%02x", (long)getpid(), freq_pktcount-- );
-        if ( fexist( s )) {
+        if ( fexist( s ))
             lunlink( s );
         }
-    }
 
-    if ( chatlg ) {
+    if ( chatlg )
         chatlog_done();
-    }
 
     if ( cfgs( CFG_AFTERSESSION )) {
         write_log( "starting %s %s %c %d", ccs,
@@ -1126,5 +1052,6 @@
 
     xfree( remote_id );
 
-    return ( rc & ~S_ADDTRY );
+    /* return ( rc & ~S_ADDTRY ); */
+    return rc;
 }
diff -burw ./qico/src/slists.c ./trunk/src/slists.c
--- ./qico/src/slists.c	2024-02-01 18:09:52.572020000 +0300
+++ ./trunk/src/slists.c	2024-02-01 18:10:34.606691000 +0300
@@ -2,9 +2,12 @@
  * work with various lists.
  **********************************************************/
 /*
- * $Id: slists.c,v 1.3 2005/05/16 11:17:30 mitry Exp $
+ * $Id: slists.c 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: slists.c,v $
+ * Revision 1.4  2006/04/14 18:49:03  mitry
+ * Changed return types.
+ *
  * Revision 1.3  2005/05/16 11:17:30  mitry
  * Updated function prototypes. Changed code a bit.
  *
@@ -45,9 +48,9 @@
 
     for( t = *l; t && t->next; cc = t, p = t->next->str, t = t->next );
 
-    if ( cc ) {
+	if ( cc )
         xfree( cc->next );
-    } else {
+	else {
 		xfree( t );
 		*l = NULL;
 	}
@@ -97,9 +100,8 @@
 aslist_t *aslist_find(aslist_t *l, const char *s)
 {
     for(; l; l = l->next )
-        if ( !strcmp( l->str, s )) {
+		if ( !strcmp( l->str, s ))
             return l;
-        }
 	return NULL;
 }
 
@@ -118,7 +120,7 @@
 }
 
 
-void falist_add(falist_t **l, const ftnaddr_t *a)
+falist_t *falist_add(falist_t **l, const ftnaddr_t *a)
 {
 	falist_t **t;
 
@@ -127,15 +129,16 @@
 	*t = (falist_t *) xmalloc( sizeof( falist_t ));
 	(*t)->next = NULL;
 	addr_cpy( &(*t)->addr, a );
+
+	return *t;
 }
 
 
 falist_t *falist_find(falist_t *l, const ftnaddr_t *a)
 {
     for(; l; l = l->next )
-        if ( addr_cmp( &l->addr, a )) {
+		if ( addr_cmp( &l->addr, a ))
             return l;
-        }
 	return NULL;
 }
 
@@ -153,7 +156,7 @@
 }
 
 
-void faslist_add(faslist_t **l, const char *s, const ftnaddr_t *a)
+faslist_t *faslist_add(faslist_t **l, const char *s, const ftnaddr_t *a)
 {
 	faslist_t **t;
 
@@ -163,6 +166,8 @@
 	(*t)->next = NULL;
 	(*t)->str = xstrdup( s );
 	addr_cpy( &(*t)->addr, a );
+
+	return *t;
 }
 
 
diff -burw ./qico/src/slists.h ./trunk/src/slists.h
--- ./qico/src/slists.h	2024-02-01 18:09:52.572087000 +0300
+++ ./trunk/src/slists.h	2024-02-01 18:10:34.591317000 +0300
@@ -2,9 +2,12 @@
  * for work with various lists.
  **********************************************************/
 /*
- * $Id: slists.h,v 1.3 2005/05/16 11:17:30 mitry Exp $
+ * $Id: slists.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: slists.h,v $
+ * Revision 1.4  2006/04/14 18:49:03  mitry
+ * Changed return types.
+ *
  * Revision 1.3  2005/05/16 11:17:30  mitry
  * Updated function prototypes. Changed code a bit.
  *
@@ -52,10 +55,10 @@
 aslist_t	*aslist_add(aslist_t **, const char *, const char *);
 aslist_t	*aslist_find(aslist_t *, const char *);
 void		aslist_kill(aslist_t **);
-void		falist_add(falist_t **, const ftnaddr_t *);
+falist_t	*falist_add(falist_t **, const ftnaddr_t *);
 falist_t	*falist_find(falist_t *, const ftnaddr_t *);
 void		falist_kill(falist_t **);
-void		faslist_add(faslist_t **, const char *, const ftnaddr_t *);
+faslist_t	*faslist_add(faslist_t **, const char *, const ftnaddr_t *);
 void		faslist_kill(faslist_t **);
 
 #endif
diff -burw ./qico/src/strcasestr.c ./trunk/src/strcasestr.c
--- ./qico/src/strcasestr.c	2024-02-01 18:09:52.572165000 +0300
+++ ./trunk/src/strcasestr.c	2024-02-01 18:10:34.583459000 +0300
@@ -1,4 +1,4 @@
-/* $Id: strcasestr.c,v 1.2 2005/03/29 20:39:46 mitry Exp $ */
+/* $Id: strcasestr.c 18 2010-08-23 15:50:49Z semik $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -58,9 +58,8 @@
         len = strlen(find);
         do {
             do {
-                if ((sc = *s++) == 0) {
+				if ((sc = *s++) == 0)
                     return (NULL);
-                }
 			} while ((char)tolower((unsigned char)sc) != c);
 		} while (strncasecmp(s, find, len) != 0);
 		s--;
diff -burw ./qico/src/strcspn.c ./trunk/src/strcspn.c
--- ./qico/src/strcspn.c	2024-02-01 18:09:52.572233000 +0300
+++ ./trunk/src/strcspn.c	2024-02-01 18:10:34.603793000 +0300
@@ -1,4 +1,4 @@
-/* $Id: strcspn.c,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+/* $Id: strcspn.c 18 2010-08-23 15:50:49Z semik $
  *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -60,9 +60,8 @@
         c = *p++;
         spanp = s2;
         do {
-            if ((sc = *spanp++) == c) {
+			if ((sc = *spanp++) == c)
                 return (p - 1 - s1);
-            }
 		} while (sc != 0);
 	}
 	/* NOTREACHED */
diff -burw ./qico/src/strsep.c ./trunk/src/strsep.c
--- ./qico/src/strsep.c	2024-02-01 18:09:52.572325000 +0300
+++ ./trunk/src/strsep.c	2024-02-01 18:10:34.580841000 +0300
@@ -1,4 +1,4 @@
-/* $Id: strsep.c,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+/* $Id: strsep.c 18 2010-08-23 15:50:49Z semik $
  *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -60,19 +60,17 @@
     register int c, sc;
     char *tok;
 
-    if ((s = *stringp) == NULL) {
+	if ((s = *stringp) == NULL)
         return (NULL);
-    }
     for (tok = s;;) {
         c = *s++;
         spanp = delim;
         do {
             if ((sc = *spanp++) == c) {
-                if (c == 0) {
+				if (c == 0)
                     s = NULL;
-                } else {
+				else
                     s[-1] = 0;
-                }
 				*stringp = s;
 				return (tok);
 			}
diff -burw ./qico/src/tcp.c ./trunk/src/tcp.c
--- ./qico/src/tcp.c	2024-02-01 18:09:52.572450000 +0300
+++ ./trunk/src/tcp.c	2024-02-01 18:10:34.597246000 +0300
@@ -2,9 +2,15 @@
  * ip routines
  **********************************************************/
 /*
- * $Id: tcp.c,v 1.13 2005/08/16 10:32:19 mitry Exp $
+ * $Id: tcp.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: tcp.c,v $
+ * Revision 1.15  2007/01/28 17:55:00  mitry
+ * Add support for INA flag and IBN/IFC optional port number.
+ *
+ * Revision 1.14  2005/12/03 02:25:03  mitry
+ * Fixed socks5 authentication
+ *
  * Revision 1.13  2005/08/16 10:32:19  mitry
  * Fixed broken calls of loginscript
  *
@@ -71,15 +77,13 @@
     int niErr = 1;
 
     getnameinfo( addr, salen, ipaddr, sizeof(ipaddr), NULL, 0, NI_NUMERICHOST );
-    if ( cfgi( CFG_RESOLVEHOSTNAME )) {
+	if ( cfgi( CFG_RESOLVEHOSTNAME ))
         niErr = getnameinfo( addr, salen, hostbuf, sizeof(hostbuf), NULL, 0, NI_NAMEREQD );
-    }
 
-    if ( niErr == 0 ) {
+	if ( niErr == 0 )
         snprintf( host, len, "%s (%s)", hostbuf, ipaddr );
-    } else {
+	else
         xstrcpy( host, ipaddr, len );
-    }
 
 	return host;
 }
@@ -99,7 +103,8 @@
     lopt.l_linger = 200; /* 2 seconds */
 
     if ( setsockopt( fd, SOL_SOCKET, SO_LINGER,
-                     (char*) &lopt, sizeof( struct linger )) == -1 ) {
+	    (char*) &lopt, sizeof( struct linger )) == -1 )
+	{
 		rc--;
 		DEBUG(('I',1,"can't set SO_LINGER socket option on stdout: %s", strerror( errno )));
 	}
@@ -119,19 +124,16 @@
     char	buf[H_BUF];
     char	*n, *p = NULL, *dp = "";
 
-    if ( cfgs( CFG_PROXY ) && ( p = strchr( ccs, ' ' ))) {
+	if ( cfgs( CFG_PROXY ) && ( p = strchr( ccs, ' ' )))
         *p++ = 0;
-    }
 
-    if ( !strchr( name, ':' )) {
+	if ( !strchr( name, ':' ))
         dp = bink ? ":24554" : ":60179";
-    }
 
     i = snprintf( buf, H_BUF, "CONNECT %s%s HTTP/1.0\r\n", name, dp );
     if ( p ) {
-        if (( n = strchr( p,' ' ))) {
+		if (( n = strchr( p,' ' )))
             *n = ':';
-        }
 		i += snprintf( buf + i, H_BUF - i, "Proxy-Authorization: basic " );
 		i += base64( p, strlen( p ), buf + i );
 		buf[i++] = '\r';
@@ -145,9 +147,8 @@
     t1 = timer_set( cfgi( CFG_HSTIMEOUT ));
 
     for( i = 0; i < H_BUF; i++ ) {
-        while(( rc = GETCHAR(1)) == TIMEOUT && !timer_expired( t1 )) {
+		while(( rc = GETCHAR(1)) == TIMEOUT && !timer_expired( t1 ))
             getevt();
-        }
 
 		if ( rc == RCDO || tty_gothup ) {
 			write_log( "got hangup" );
@@ -168,19 +169,16 @@
         if (( i >= H_BUF ) || (( p = strstr( buf, "\r\n\r\n" )))) {
             if (( p = strchr( buf, '\n' ))) {
                 *p-- = '\0';
-                if ( *p == '\r' ) {
+				if ( *p == '\r' )
                     *p = '\0';
                 }
-            }
 
             p = buf;
-            if ( strstr( buf, " 200 " )) {
+			if ( strstr( buf, " 200 " ))
                 break;
-            }
 
-            if ( !strncasecmp( buf, "HTTP", 4 )) {
+			if ( !strncasecmp( buf, "HTTP", 4 ))
                 p = strchr( buf, ' ' ) + 1;
-            }
 			write_log( "connect rejected by proxy (%s)", p );
 			return (FALSE);
 		}
@@ -201,15 +199,13 @@
     struct in_addr	da;
     struct hostent	*he;
 
-    if ( cfgs( CFG_SOCKS ) && ( p = strchr( ccs, ' ' ))) {
+	if ( cfgs( CFG_SOCKS ) && ( p = strchr( ccs, ' ' )))
         *p++ = 0;
-    }
 
-    if ( !( n = strchr( name, ':' ))) {
+	if ( !( n = strchr( name, ':' )))
         port = bink ? 24554 : 60179;
-    } else {
+	else
         port = atoi( n + 1 );
-    }
 
 	if ( p ) {
 		auth = xstrdup( p );
@@ -244,22 +240,22 @@
 
         if ( buf[1] == 2) {
             *buf = 1;
-            if ( !n ) {
+			if ( !n )
                 i = strlen( auth );
-            } else {
+			else
                 i = n - auth;
-            }
 
             buf[1] = i;
-            memcpy( buf + 2, auth, i );
+			memmove( buf + 2, auth, i );
             i += 2;
             if ( !n ) {
                 buf[i++] = '\0';
             } else {
-                n++;
-                buf[i] = strlen( n );
-                xstrcpy( buf + i + 1, n, buf[i] );
-                i += buf[i] + 1;
+				n = skip_blanks( n );
+				rc = strlen( n );
+				buf[i++] = rc;
+				memmove( buf + i, n, rc );
+				i += rc;
 			}
 
 			PUTBLK( (unsigned char*) buf, i );
@@ -295,7 +291,7 @@
             return (FALSE);
         }
 
-        memcpy( buf + 4, he->h_addr, 4 );
+		memmove( buf + 4, he->h_addr, 4 );
 		buf[8] = '\0';
 		PUTBLK( (unsigned char*) buf, 9);
 	} else {
@@ -305,13 +301,13 @@
 
         if ( isdigit( *name ) && (da.s_addr = inet_addr( name )) != -1 ) {
             buf[3] = 1;
-            memcpy( buf + 4, &da, 4 );
+			memmove( buf + 4, &da, 4 );
             n = buf + 8;
         } else {
             buf[3] = 3;
             i = strlen( name );
             buf[4] = (unsigned char) i;
-            memcpy( buf + 5, name, i );
+			memmove( buf + 5, name, i );
 			n = buf + 5 + i;
 		}
 
@@ -349,9 +345,8 @@
 
             if (( buf[3] == 1 && i < 9 )
                     || ( buf[3] == 3 && i < ( 6 + (unsigned char) buf[4] ))
-                    || ( buf[3] == 4 && i < 21 )) {
+			    || ( buf[3] == 4 && i < 21 ))
                 continue;
-            }
 
 			if ( !buf[1] ) {
 				xfree( auth );
@@ -397,9 +392,8 @@
                            (unsigned char) buf[1] );
             }
 
-            if ( p ) {
+			if ( p )
                 write_log( p );
-            }
 			xfree( auth );
 			return (FALSE);
 		}
@@ -428,16 +422,14 @@
     char			*portname, *p;
     struct addrinfo		hints =	      { .ai_family = PF_UNSPEC,
                   .ai_socktype = SOCK_STREAM,
-                  .ai_protocol = IPPROTO_TCP
-    };
+						.ai_protocol = IPPROTO_TCP };
     struct addrinfo		*ai, *aiHead;
     int			aiErr;
 
     if (( portname = strchr( proxy ? proxy : name, ':' ))) {
         *portname++ = '\0';
-        if (( p = strchr( portname, ' ' ))) {
+		if (( p = strchr( portname, ' ' )))
             *p = '\0';
-        }
 	} else {
 		portname = (proxy ? ( sp ? "socks" : "proxy" ) :
                     ( bink ? "binkp" : "fido" ) );
@@ -535,31 +527,29 @@
 int tcp_dial(ftnaddr_t *fa, char *host)
 {
     int	fd, s = 0;
-    char	*p = NULL, *t = NULL;
+	char	*proxy = NULL, *t = NULL;
 
-    if ( cfgs( CFG_PROXY )) {
-        p = xstrdup( ccs );
-    } else if( cfgs( CFG_SOCKS )) {
-        p = xstrdup( ccs );
+	if ( cfgs( CFG_PROXY ))
+		proxy = xstrdup( ccs );
+	else if( cfgs( CFG_SOCKS )) {
+		proxy = xstrdup( ccs );
         s = 1;
     }
 
-    if ( p && ( t = strchr( p, ' ' ))) {
+	if ( proxy && ( t = strchr( proxy, ' ' )))
         *t = '\0';
-    }
 
     write_log("connecting to %s at %s%s%s%s [%s]",
               ftnaddrtoa( fa ), host,
-              p ? " via " : "",
-              p ? ( s ? "socks " : "proxy " ) : "",
-              SS( p ),
+		proxy ? " via " : "",
+		proxy ? ( s ? "socks " : "proxy " ) : "",
+		SS( proxy ),
               bink ? "binkp" : "ifcico" );
-    if ( t ) {
+	if ( t )
         *t = ' ';
-    }
 
-    fd = tcp_connect( host, p, s );
-    xfree( p );
+	fd = tcp_connect( host, proxy, s );
+	xfree( proxy );
 	return fd;
 }
 
diff -burw ./qico/src/tcp.h ./trunk/src/tcp.h
--- ./qico/src/tcp.h	2024-02-01 18:09:52.572515000 +0300
+++ ./trunk/src/tcp.h	2024-02-01 18:10:34.598872000 +0300
@@ -2,7 +2,7 @@
  * IP tools defines.
  ******************************************************************/
 /*
- * $Id: tcp.h,v 1.2 2005/05/06 20:47:37 mitry Exp $
+ * $Id: tcp.h 30 2012-11-20 09:29:34Z semik $
  *
  * $Log: tcp.h,v $
  * Revision 1.2  2005/05/06 20:47:37  mitry
Only in ./qico/src: tcpp.c
diff -burw ./qico/src/timer.h ./trunk/src/timer.h
--- ./qico/src/timer.h	2024-02-01 18:09:52.572659000 +0300
+++ ./trunk/src/timer.h	2024-02-01 18:10:34.606962000 +0300
@@ -2,7 +2,7 @@
  * timer math
  **********************************************************/
 /*
- * $Id: timer.h,v 1.4 2005/06/03 14:13:49 mitry Exp $
+ * $Id: timer.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: timer.h,v $
  * Revision 1.4  2005/06/03 14:13:49  mitry
diff -burw ./qico/src/tools.c ./trunk/src/tools.c
--- ./qico/src/tools.c	2024-02-01 18:09:52.572896000 +0300
+++ ./trunk/src/tools.c	2024-02-01 18:10:34.597580000 +0300
@@ -2,9 +2,12 @@
  * Misc stuff.
  **********************************************************/
 /*
- * $Id: tools.c,v 1.12 2005/08/10 19:45:50 mitry Exp $
+ * $Id: tools.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: tools.c,v $
+ * Revision 1.13  2006/03/31 19:41:37  mitry
+ * Don't ignore return value of unlink()
+ *
  * Revision 1.12  2005/08/10 19:45:50  mitry
  * Added param to qscandir() to return full path with file name
  *
@@ -71,53 +74,30 @@
     int rev=0,n;
     unsigned i,c;
     char buf[MAX_STRING];
-    if(!name||!strcasecmp(name,"none")) {
-        return -1;
-    }
-    if(!strcasecmp(name,"internal")) {
-        return 1;
-    }
+    if(!name||!strcasecmp(name,"none"))return -1;
+    if(!strcasecmp(name,"internal"))return 1;
     if(!strncasecmp(name,"revert",6)) {
-        rev=1;
-        name+=6;
-        while(*name==' '||*name=='\t') {
-            name++;
+        rev=1;name+=6;
+        while(*name==' '||*name=='\t')name++;
+        if(!*name)return -1;
         }
-        if(!*name) {
-            return -1;
-        }
-    }
     if(!(f=fopen(name,"r"))) {
         write_log("can't open recode file '%s': %s",name,strerror(errno));
         return -1;
     }
     memset(tab,0,128);
     while(fgets(buf,MAX_STRING,f)) {
-        if(!isdigit(*buf)) {
-            continue;
-        }
+        if(!isdigit(*buf))continue;
         if(*buf=='0'&&buf[1]=='x') {
-            if(sscanf(buf,"0x%x 0x%x",&i,&c)!=2) {
-                continue;
-            }
+            if(sscanf(buf,"0x%x 0x%x",&i,&c)!=2)continue;
         } else {
-            if(sscanf(buf,"%u %u",&i,&c)!=2) {
-                continue;
+            if(sscanf(buf,"%u %u",&i,&c)!=2)continue;
             }
-        }
-        if(rev) {
-            n=i;
-            i=c;
-            c=n;
-        }
-        if(c>255||i<128||i>255) {
-            continue;
-        }
+        if(rev) { n=i;i=c;c=n; }
+        if(c>255||i<128||i>255)continue;
         tab[i-128]=c;
     }
-    for(n=0; n<128; n++)if(!tab[n]) {
-            tab[n]=n+128;
-        }
+    for(n=0;n<128;n++)if(!tab[n])tab[n]=n+128;
     fclose(f);
     return 1;
 }
@@ -127,15 +107,11 @@
 {
     static int loaded=0;
     register unsigned char c;
-    if(!loaded||!s) {
-        loaded=initcharset(cfgs(CFG_REMOTECP),ctab_remote);
-    }
+    if(!loaded||!s)loaded=initcharset(cfgs(CFG_REMOTECP),ctab_remote);
     if(loaded==1&&s) {
         while(*s) {
             c=*(unsigned char*)s;
-            if(c>=128) {
-                *(unsigned char*)s=ctab_remote[c-128];
-            }
+            if(c>=128)*(unsigned char*)s=ctab_remote[c-128];
             s++;
         }
     }
@@ -146,15 +122,11 @@
 {
     static int loaded=0;
     register unsigned char c;
-    if(!loaded||!s) {
-        loaded=initcharset(cfgs(CFG_LOCALCP),ctab_local);
-    }
+    if(!loaded||!s)loaded=initcharset(cfgs(CFG_LOCALCP),ctab_local);
     if(loaded==1&&s) {
         while(*s) {
             c=*(unsigned char*)s;
-            if(c>=128) {
-                *(unsigned char*)s=ctab_local[c-128];
-            }
+            if(c>=128)*(unsigned char*)s=ctab_local[c-128];
             s++;
         }
     }
@@ -175,25 +147,24 @@
 
         for( mapto = mapfrom; *mapto == ' '; mapto++ );
 
-        if ( !*mapfrom || !*mapto) {
+		if ( !*mapfrom || !*mapto)
             write_log( "bad mapping '%s'", mappath->str );
-        } else {
+		else {
             size_t lenf = mapfrom - mappath->str;
 
             if ( !strncasecmp( mappath->str, fname, lenf )) {
                 size_t lent = strlen( mapto );
 
-                memcpy( newfn, mapto, lent );
-                memcpy( newfn + lent, fname + lenf,
+				memmove( newfn, mapto, lent );
+				memmove( newfn + lent, fname + lenf,
                         MAX_PATH - lent - strlen( fname + lenf ));
                 break;
             }
         }
     }
 
-    if ( mapout && strchr( mapout, 'S' )) {
+	if ( mapout && strchr( mapout, 'S' ))
         strtr( newfn, '\\', '/' );
-    }
 
 	DEBUG(('S',5,"mappath: out '%s'",newfn));
 
@@ -206,18 +177,15 @@
     int	t;
     char	*l;
 
-    if ( !map ) {
+	if ( !map )
         return fn;
-    }
 
     DEBUG(('S',5,"mapname: '%s', fn: '%s'",map,fn));
 
-    if ( strchr( map, 'c' )) {
+	if ( strchr( map, 'c' ))
         recode_to_remote( fn );
-    }
-    if ( strchr( map, 'k' )) {
+	if ( strchr( map, 'k' ))
         recode_to_local( fn );
-    }
 	if ( strchr( map, 'd' )) {
 		if (( l = strrchr( fn, '.' ))) {
 			strtr( fn, '.', '_' );
@@ -231,55 +199,47 @@
         snprintf( fn, 14, "%08lx%s", crc32s( fn ), l );
     }
 
-    if ( strchr( map, 'u' )) {
+	if ( strchr( map, 'u' ))
         strupr( fn );
-    }
-    if ( strchr( map, 'l' )) {
+	if ( strchr( map, 'l' ))
         strlwr( fn );
-    }
-    if ( strchr( map, 'f' )) {
+	if ( strchr( map, 'f' ))
         xstrcpy( fn, fnc( fn ), size );
-    }
 
     switch( t ) {
     case IS_PKT:
-        if ( strchr( map, 'p' )) {
+		if ( strchr( map, 'p' ))
             strlwr( fn );
-        } else if ( strchr( map, 'P' )) {
+		else if ( strchr( map, 'P' ))
             strupr( fn );
-        }
         break;
 
     case IS_ARC:
-        if ( strchr( map, 'a' )) {
+		if ( strchr( map, 'a' ))
             strlwr( fn );
-        } else if ( strchr( map, 'A' )) {
+		else if ( strchr( map, 'A' ))
             strupr( fn );
-        }
         break;
 
     case IS_FILE:
         if ( istic( fn )) {
-            if ( strchr( map, 't' )) {
+			if ( strchr( map, 't' ))
                 strlwr( fn );
-            } else if ( strchr( map, 'T' )) {
+			else if ( strchr( map, 'T' ))
                 strupr( fn );
-            }
         } else {
             if ( isdos83name( fn )) {
-                if ( strchr( map, 'o' )) {
+				if ( strchr( map, 'o' ))
                     strlwr( fn );
-                } else if ( strchr( map, 'O' )) {
+				else if ( strchr( map, 'O' ))
                     strupr( fn );
                 }
             }
-        }
         break;
     }
 
-    if ( bink ) {
+	if ( bink )
         strtr( fn, ' ', '_' );
-    }
 
 	DEBUG(('S',5,"mapname: out '%s'",fn));
 
@@ -299,17 +259,15 @@
 {
     l = tolower( l );
     h = tolower( h );
-    if ( l >= 'a' && l <= 'f' ) {
+	if ( l >= 'a' && l <= 'f' )
         l -= ( 'a' - 10 );
-    } else {
+        else
         l -= '0';
-    }
 
-    if ( h >= 'a' && h <= 'f' ) {
+	if ( h >= 'a' && h <= 'f' )
         h -= ( 'a' - 10 );
-    } else {
+        else
         h -= '0';
-    }
 	return ( h * 16 + l );
 }
 
@@ -320,16 +278,14 @@
 
     switch( w ) {
     case 0:
-        if ( ccs && strncasecmp( ccs, progname, 4 )) {
+		if ( ccs && strncasecmp( ccs, progname, 4 ))
             return ccs;
-        }
         return progname;
 
     case 1:
         if ( ccs && strncasecmp( ccs, progname, 4 ))
-            if ( cfgs( CFG_VERSION )) {
+			if ( cfgs( CFG_VERSION ))
                 return ccs;
-            }
 		return version;
 
 	default:
@@ -340,11 +296,10 @@
 
 unsigned long sequencer(void)
 {
-    if ( seq == 0xFFFFFFFFUL || time( NULL ) > seq ) {
+	if ( seq == 0xFFFFFFFFUL || time( NULL ) > seq )
         seq = time( NULL );
-    } else {
+        else
         seq++;
-    }
 	return seq;
 }
 
@@ -353,9 +308,8 @@
 {
     struct stat sb;
 
-    if ( stat( fname, &sb ) == 0 ) {
+	if ( stat( fname, &sb ) == 0 )
         return sb.st_size;
-    }
 
 	return -1;
 }
@@ -367,19 +321,17 @@
     long pid;
 
     if (( f = fopen( pidfn, "rt" ))) {
-        if ( filesize( pidfn ) == 0 ) {
+		if ( filesize( pidfn ) == 0 )
             return 1;    /* File exists with zero size */
-        }
 
         fseeko( f, (off_t) 0, SEEK_SET );
         fscanf( f, "%ld", &pid );
         fclose( f );
-        if ( kill( (pid_t) pid, 0) && ( errno == ESRCH )) {
+		if ( kill( (pid_t) pid, 0) && ( errno == ESRCH ))
             lunlink( pidfn );
-        } else {
+		else
             return ( (int) pid );
         }
-    }
 	return 0;
 }
 
@@ -392,26 +344,23 @@
     char	*p;
 #endif
 
-    if ( islocked( pidfn )) {
+	if ( islocked( pidfn ))
         return 0;
-    }
 
     xstrcpy( tmpname, pidfn, MAX_PATH );
 
 #ifndef LOCKSTYLE_OPEN
     p = strrchr( tmpname, '/' );
-    if ( !p ) {
+	if ( !p )
         p = tmpname;
-    }
 
     snprintf( tmpname + ( p - tmpname ), MAX_PATH - ( p - tmpname + 1 ),
               "/QTEMP.%ld", (long) getpid());
 #endif
 
     rc = open( tmpname, O_WRONLY | O_CREAT | O_EXCL, 0644 );
-    if ( rc < 0 ) {
+	if ( rc < 0 )
         return 0;
-    }
 
 	snprintf( pidbuf, 12, "%10d\n", getpid());
 	write( rc, pidbuf, 11);
@@ -420,9 +369,8 @@
 #ifndef LOCKSTYLE_OPEN
     rc = link( tmpname, pidfn );
     lunlink( tmpname );
-    if ( rc ) {
+	if ( rc )
         return 0;
-    }
 #endif
 	return 1;
 }
@@ -435,9 +383,8 @@
     if ( f ) {
         fclose( f );
         return 1;
-    } else {
+	} else
         write_log( "can't touch '%s': %s", fn, strerror( errno ));
-    }
 	return 0;
 }
 
@@ -446,13 +393,11 @@
 {
     int rc = 0;
 
-    if ( fname && *fname ) {
-        unlink( fname );
-    }
+	if ( fname && *fname )
+		rc = unlink( fname );
 
-    if ( rc < 0 && errno != ENOENT ) {
+	if ( rc < 0 && errno != ENOENT )
         write_log("can't delete file %s: %s", fname, strerror( errno ));
-    }
 	return rc;
 }
 
@@ -464,17 +409,15 @@
     int		nf = ( stat( fn, &sb )) ? 1 : 0;
 
     if (( f = fopen( fn, pr ))) {
-        if ( nf ) {
+		if ( nf )
             fchmod( fileno( f ), cfgi( CFG_DEFPERM ));
-        }
         return f;
     }
     if ( errno == ENOENT ) {
         mkdirs( fn );
         f = fopen( fn, pr );
-        if ( f && nf) {
+		if ( f && nf)
             fchmod( fileno( f ), cfgi( CFG_DEFPERM ));
-        }
 		return f;
 	}
 	return NULL;
@@ -544,13 +487,11 @@
     DIR			*dirp;
     char			_dirname[MAX_PATH + 5] = {'\0'};
 
-    if ( dirname == NULL || *dirname == '\0' ) {
+	if ( dirname == NULL || *dirname == '\0' )
         return(-1);
-    }
 
-    if (( dirp = opendir( dirname )) == NULL ) {
+	if (( dirp = opendir( dirname )) == NULL )
         return(-1);
-    }
 
 	if ( !nodir ) {
 		xstrcpy( _dirname, dirname, MAX_PATH );
@@ -563,22 +504,19 @@
 
     while(( d = readdir( dirp )) != NULL ) {
         DEBUG(('S',5,"qscandir: '%s'",d->d_name));
-        if ( nselect != NULL && !(*nselect)( d->d_name )) {
+		if ( nselect != NULL && !(*nselect)( d->d_name ))
             continue;    /* just selected names */
-        }
         /*
          * Make a minimum size copy of the data
          */
         l = strlen( d->d_name ) + dlen;
         p = (char *) xmalloc( l );
-        if ( p == NULL ) {
+		if ( p == NULL )
             goto fail;
-        }
-        if ( !nodir ) {
+		if ( !nodir )
             xstrcpy( p, _dirname, l );
-        } else {
+		else
             *p = '\0';
-        }
 
 		xstrcat( p, d->d_name, l );
 		/*
@@ -601,17 +539,15 @@
         names[nitems++] = p;
     }
     closedir( dirp );
-    if ( nitems && ndcomp != NULL ) {
+	if ( nitems && ndcomp != NULL )
         qsort( names, nitems, sizeof(char *), ndcomp );
-    }
     *namelist = names;
     return( nitems );
 
 fail:
     closedir( dirp );
-    while( nitems > 0 ) {
+	while( nitems > 0 )
         xfree( names[--nitems] );
-    }
 	xfree( names );
 	*namelist = NULL;
 	return (-1);
@@ -620,9 +556,8 @@
 
 static int qfmcselect(const char *d_name)
 {
-    if ( d_name == NULL || *d_name == '\0' ) {
+	if ( d_name == NULL || *d_name == '\0' )
         return 0;
-    }
 	return ( strncasecmp( d_name, _qfmc, sizeof( _qfmc )) == 0 );
 }
 
@@ -639,23 +574,20 @@
     int	gotcha;
 
     DEBUG(('S',5,"fmatchcase: '%s'",fname));
-    if ( fname == NULL || *fname == '\0' ) {
+	if ( fname == NULL || *fname == '\0' )
         return 0;
-    }
 
     xstrcpy( path, fname, MAX_PATH );
     p = qbasename( path );
 
-    if ( p == NULL || *p == '\0' ) {
+	if ( p == NULL || *p == '\0' )
         return (-1);
-    }
 
     xstrcpy( _qfmc, p, MAX_PATH );
-    if ( p == path ) {
+	if ( p == path )
         xstrcpy( path, "./", MAX_PATH );
-    } else {
+	else
         *p = '\0';
-    }
 
 	DEBUG(('S',5,"fmatchcase: path '%s'",path));
 	DEBUG(('S',5,"fmatchcase: _qfmc '%s'",_qfmc));
@@ -684,42 +616,38 @@
     char		*p, *q;
     size_t		i = 0;
 
-    if ( !s ) {
+	if ( !s )
         return NULL;
-    }
-    if ( !( p = strrchr( s, '/' ))) {
+	if ( !( p = strrchr( s, '/' )))
         p = s;
-    } else {
+	else
         s = p;
-    }
 
     while( *p && *p != '.' && i < 8 ) {
-        if ( dosallowin83( *p )) {
+		if ( dosallowin83( *p ))
             s8[i++] = tolower( *p );
-        }
         p++;
     }
     s8[i] = '\0';
 
-    if ( strstr( s, ".tar.gz" )) {
+	if ( strstr( s, ".tar.gz" ))
         xstrcat( s8, ".tgz", LEN83 );
-    } else if ( strstr( s, ".tar.bz2" )) {
+	else if ( strstr( s, ".tar.bz2" ))
         xstrcat( s8, ".tb2", LEN83 );
-    } else if ( strstr( s, ".html" )) {
+	else if ( strstr( s, ".html" ))
         xstrcat( s8, ".htm", LEN83 );
-    } else if ( strstr( s, ".jpeg" )) {
+	else if ( strstr( s, ".jpeg" ))
         xstrcat( s8, ".jpg", LEN83 );
-    } else if ( strstr( s, ".desc" )) {
+	else if ( strstr( s, ".desc" ))
         xstrcat( s8, ".dsc", LEN83 );
-    } else {
+	else {
         if (( p = strrchr( s, '.' ))) {
             xstrcat( s8, ".", LEN83);
             q = p + 4;
             i = strlen( s8 );
             while( *p && q > p ) {
-                if ( dosallowin83( *p )) {
+				if ( dosallowin83( *p ))
                     s8[i++] = tolower( *p );
-                }
 				p++;
 			}
 			s8[i] = '\0';
@@ -740,22 +668,19 @@
             break;
         }
 
-        if ( *fn == '.' ) {
+		if ( *fn == '.' )
             ec++;
-        } else {
-            if ( !ec ) {
+		else {
+			if ( !ec )
                 nl++;
-            } else {
+			else
                 el++;
-            }
             if ( isalpha((int) *fn )) {
-                if ( isupper((int) *fn )) {
+				if ( isupper((int) *fn ))
                     uc++;
-                } else {
-                    lc++;
+				else lc++;
                 }
             }
-        }
 		fn++;
 	}
 
@@ -780,14 +705,12 @@
     struct STAT_V_FS sfs;
 
     if ( !STAT_V_FS( path, &sfs )) {
-        if ( sfs.f_bsize >= 1024 ) {
+		if ( sfs.f_bsize >= 1024 )
             return(( sfs.f_bsize / 1024L ) * sfs.f_bavail );
-        } else {
+		else
             return( sfs.f_bavail / ( 1024L / sfs.f_bsize ));
-        }
-    } else {
+	} else
         write_log("can't statfs '%s': %s", path, strerror( errno ));
-    }
 #endif
 	return (~0UL);
 }
@@ -806,28 +729,25 @@
         write_log("reopening of stdin is failed: %s", strerror( errno ));
         exit (-1);
     }
-    if ( fd != STDIN_FILENO ) {
+	if ( fd != STDIN_FILENO )
         close( fd );
-    }
 
     fd = open( devnull, O_WRONLY | O_APPEND | O_CREAT, 0600 );
     if ( dup2( fd, STDOUT_FILENO ) != STDOUT_FILENO ) {
         write_log("reopening of stdout is failed: %s", strerror( errno ));
         exit (-1);
     }
-    if ( fd != STDOUT_FILENO ) {
+	if ( fd != STDOUT_FILENO )
         close( fd );
-    }
 
     fd = open( devnull, O_WRONLY | O_APPEND | O_CREAT, 0600 );
     if ( dup2( fd, STDERR_FILENO ) != STDERR_FILENO ) {
         write_log("reopening of stderr is failed: %s", strerror( errno ));
         exit (-1);
     }
-    if ( fd != STDERR_FILENO ) {
+	if ( fd != STDERR_FILENO )
         close( fd );
     }
-}
 
 
 int randper(int base, int diff)
@@ -856,9 +776,8 @@
         to_dev_null();
         setsid();
         rc = execl( cmd, cmd, p1, p2, p3, NULL );
-        if ( rc < 0 ) {
+		if ( rc < 0 )
             write_log("can't exec %s: %s", cmd, strerror( errno ));
-        }
 		exit (-1);
 	}
 
diff -burw ./qico/src/tools.h ./trunk/src/tools.h
--- ./qico/src/tools.h	2024-02-01 18:09:52.572984000 +0300
+++ ./trunk/src/tools.h	2024-02-01 18:10:34.580543000 +0300
@@ -1,5 +1,5 @@
 /*
- * $Id: tools.h,v 1.12 2005/08/10 19:45:50 mitry Exp $
+ * $Id: tools.h 18 2010-08-23 15:50:49Z semik $
  *
  * $Log: tools.h,v $
  * Revision 1.12  2005/08/10 19:45:50  mitry
diff -burw ./qico/src/tty.c ./trunk/src/tty.c
--- ./qico/src/tty.c	2024-02-01 18:09:52.573362000 +0300
+++ ./trunk/src/tty.c	2024-02-01 18:10:34.597976000 +0300
@@ -10,9 +10,12 @@
  **********************************************************/
 
 /*
- * $Id: tty.c,v 1.27 2005/08/16 20:23:23 mitry Exp $
+ * $Id: tty.c 48 2014-11-29 09:03:48Z semik $
  *
  * $Log: tty.c,v $
+ * Revision 1.28  2006/04/24 15:04:21  mitry
+ * Fixed typo error.
+ *
  * Revision 1.27  2005/08/16 20:23:23  mitry
  * Pre 0.57.1: minor changes
  *
@@ -297,19 +300,16 @@
         } else if ( errno == EPIPE ) {
             tty_gothup = HUP_LINE;
             tty_status = TTY_HANGUP;
-        } else {
+        } else
             tty_status = TTY_ERROR;
-        }
-    } else if ( rc == 0 ) {
+	} else if ( rc == 0 )
         tty_status = TTY_TIMEOUT;
-    } else {
-        if ( rd && FD_ISSET( tty_fd, &rfd )) {
+	else {
+		if ( rd && FD_ISSET( tty_fd, &rfd ))
             *rd = TRUE;
-        }
-        if ( wd && FD_ISSET( tty_fd, &wfd )) {
+		if ( wd && FD_ISSET( tty_fd, &wfd ))
             *wd = TRUE;
         }
-    }
 
 	DEBUG(('T',2,"tty_select: fd=%d rc=%i (rd=%s, wd=%s)", tty_fd, rc, FDS( rd ), FDS( wd )));
 
@@ -336,9 +336,8 @@
 
     DEBUG(('T',5,"tty_hasdata"));
 
-    if ( tty_hasinbuf() ) {
+	if ( tty_hasinbuf() )
         return 1;
-    }
 
 	tv.tv_sec = sec;
 	tv.tv_usec = usec;
@@ -380,9 +379,8 @@
 
     IFGOTHUP;
 
-    if ( nbytes == 0 ) {
+	if ( nbytes == 0 )
         return 0;
-    }
 
 	rc = write( tty_fd, buf, nbytes );
 
@@ -393,30 +391,26 @@
         if ( EWBOEA() ) {
             tty_status = TTY_TIMEOUT;
         } else if ( errno == EINTR ) {
-            if ( tty_online && tty_gothup ) {
+			if ( tty_online && tty_gothup )
                 tty_status = TTY_HANGUP;
-            } else {
+			else
                 tty_status = TTY_TIMEOUT;
-            }
         } else if ( errno == EPIPE ) {
             tty_gothup = HUP_LINE;
             tty_status = TTY_HANGUP;
-        } else {
+		} else
             tty_status = TTY_ERROR;
-        }
     } else if ( rc == 0 ) {
         tty_status = TTY_ERROR;
-    } else { /* rc > 0 */
+	} else /* rc > 0 */
         tty_status = TTY_SUCCESS;
-    }
 
     DEBUG(('T',6,"tty_write: rc = %d", rc));
 
 #ifdef NEED_DEBUG
     if ( rc > 0 )
-        for( i = 0; i < rc; i++ ) {
+		for( i = 0; i < rc; i++ )
             DEBUG(('T',9,"tty_write: '%c' (%d)", C0(bbuf[i]), bbuf[i]));
-        }
 #endif
 
 	return ( tty_status == TTY_SUCCESS ? rc : tty_status );
@@ -453,30 +447,26 @@
         if ( EWBOEA() ) {
             tty_status = TTY_TIMEOUT;
         } else if ( errno == EINTR ) {
-            if ( tty_online && tty_gothup ) {
+			if ( tty_online && tty_gothup )
                 tty_status = TTY_HANGUP;
-            } else {
+			else
                 tty_status = TTY_TIMEOUT;
-            }
         } else if ( errno == EPIPE ) {
             tty_gothup = HUP_LINE;
             tty_status = TTY_HANGUP;
-        } else {
+		} else
             tty_status = TTY_ERROR;
-        }
     } else if ( rc == 0 ) {
         tty_status = TTY_ERROR;
-    } else { /* rc > 0 */
+	} else /* rc > 0 */
         tty_status = TTY_SUCCESS;
-    }
 
     DEBUG(('T',6,"tty_read: rc = %d", rc));
 
 #ifdef NEED_DEBUG
     if ( rc > 0 )
-        for( i = 0; i < rc; i++ ) {
+		for( i = 0; i < rc; i++ )
             DEBUG(('T',9,"tty_read: '%c' (%d)", C0(bbuf[i]), bbuf[i]));
-        }
 #endif
 
 	return ( tty_status == TTY_SUCCESS ? rc : tty_status );
@@ -489,12 +479,11 @@
 
     getevt();
     DEBUG(('T',2,"tty_sighup: %d", tty_gothup));
-    if (( is_ip && sig == SIGPIPE ) || ( !is_ip && !tty_dcd( tty_fd ))) {
+	if (( is_ip && sig == SIGPIPE ) || ( !is_ip && !tty_dcd( tty_fd )))
         tty_gothup = HUP_LINE;
-    } else {
+	else
         tty_gothup = HUP_OPERATOR;
     }
-}
 
 
 char *baseport(const char *p)
@@ -503,14 +492,12 @@
     static char	pn[MAX_PATH + 5];
 
     q = qbasename( p );
-    if ( !q || !*q ) {
+	if ( !q || !*q )
         return NULL;
-    }
 
     xstrcpy( pn, q, MAX_PATH );
-    if (( q = strrchr( pn, ':' ))) {
+	if (( q = strrchr( pn, ':' )))
         *q = 0;
-    }
 	return pn;
 }
 
@@ -522,16 +509,14 @@
     struct stat	s;
     char		lckname[MAX_PATH + 5];
 
-    if ( !port ) {
+	if ( !port )
         return 0;
-    }
 
     if ( nodial ) {
         snprintf( lckname, MAX_PATH, "%s.%s", nodial, port );
-        if ( !stat( lckname, &s )) {
+		if ( !stat( lckname, &s ))
             return 0;
         }
-    }
 
 	LCK_NAME(lckname, port);
 	if (( f = fopen( lckname, "r" ))) {
@@ -550,9 +535,8 @@
 char *tty_findport(slist_t *ports, const char *nodial)
 {
     for(; ports; ports = ports->next )
-        if( tty_isfree( baseport( ports->str ), nodial )) {
+		if( tty_isfree( baseport( ports->str ), nodial ))
             return ports->str;
-        }
 	return NULL;
 }
 
@@ -564,11 +548,10 @@
     const char	*p;
 
     DEBUG(('M',1,"tty_lock"));
-    if ( !( p = strrchr( port, '/' ))) {
+	if ( !( p = strrchr( port, '/' )))
         p = port;
-    } else {
+	else
         p++;
-    }
 
 	LCK_NAME(lckname, p);
 	rc = lockpid( lckname );
@@ -584,11 +567,10 @@
     FILE		*f;
 
     DEBUG(('M',1,"tty_unlock"));
-    if ( !( p = strrchr( port, '/' ))) {
+	if ( !( p = strrchr( port, '/' )))
         p = port;
-    } else {
+	else
         p++;
-    }
 
 	LCK_NAME(lckname, p);
 	if (( f = fopen( lckname, "r" ))) {
@@ -596,17 +578,15 @@
         fclose( f );
     }
 
-    if ( pid == getpid()) {
+	if ( pid == getpid())
         lunlink( lckname );
     }
-}
 
 
 int tty_close(void)
 {
-    if ( !tty_port ) {
+	if ( !tty_port )
         return ME_CLOSE;
-    }
 
 	DEBUG(('M',2,"tty_close"));
 
@@ -628,16 +608,14 @@
     signal( SIGHUP, local ? SIG_IGN : tty_sighup );
     signal( SIGPIPE, local ? SIG_IGN : tty_sighup );
 
-    if ( !isatty( tty_fd )) {
+	if ( !isatty( tty_fd ))
         return ME_NOTATT;
-    }
 
     tio_local_mode( tio, local );
     tio_set_flow_control( tty_fd, tio, local ? FLOW_NONE : FLOW_HARD );
 
-    if ( local ) {
+	if ( local )
         tty_gothup = FALSE;
-    }
 	return 1;
 }
 
@@ -670,17 +648,14 @@
             } else if ( rc > 0 ) {
                 tty_tx_ptr += rc;
                 restsize -= rc;
-            } else if ( rc < 0 && tty_status != TTY_TIMEOUT ) {
+			} else if ( rc < 0 && tty_status != TTY_TIMEOUT )
                 return ERROR;
-            }
-        } else {
+		} else
             return rc;
-        }
 
-        if ( timer_expired( tm )) {
+		if ( timer_expired( tm ))
             return ERROR;
         }
-    }
 	return rc;
 }
 
@@ -701,14 +676,14 @@
                 tty_bufflush( 5 );
                 if ( tty_status == TTY_SUCCESS ) {
                     size_t n = MIN( (size_t) tty_tx_free, nbytes);
-                    memcpy( tty_tx_buf, nptr, n );
+					memmove( tty_tx_buf, nptr, n );
                     tty_tx_free -= n;
                     nbytes -= n;
                     nptr += n;
                 }
             } while ( tty_status != TTY_SUCCESS );
         } else {
-            memcpy( (void *) (tty_tx_buf + txptr), nptr, nbytes );
+			memmove( (void *) (tty_tx_buf + txptr), nptr, nbytes );
 			tty_tx_free -= nbytes;
 			nbytes = 0;
 		}
@@ -746,15 +721,13 @@
             if (( rc = tty_read( tty_rx_buf, RX_BUF_SIZE )) < 0 ) {
                 IFGOTHUP;
                 return ( EWBOEA()) ? TTY_TIMEOUT : ERROR;
-            } else if ( rc == 0 ) {
+			} else if ( rc == 0 )
                 return ERROR;
-            }
             tty_rx_ptr = 0;
             tty_rx_left = rc;
-        } else {
+		} else
             return ( tty_gothup ? TTY_HANGUP : TTY_TIMEOUT );
         }
-    }
 
 	tty_rx_left--;
 	return tty_rx_buf[tty_rx_ptr++];
@@ -772,26 +745,22 @@
 }
 
 
-void tty_purge(void)
-{
+void tty_purge(void) {
     DEBUG(('M',3,"tty_purge"));
 
     tty_rx_ptr = tty_rx_left = 0;
-    if ( isatty( tty_fd )) {
+	if ( isatty( tty_fd ))
         tio_flush_queue( tty_fd, TIO_Q_IN );
     }
-}
 
 
-void tty_purgeout(void)
-{
+void tty_purgeout(void) {
     DEBUG(('M',3,"tty_purgeout"));
 
     tty_bufclear();
-    if ( isatty( tty_fd )) {
+	if ( isatty( tty_fd ))
         tio_flush_queue( tty_fd, TIO_Q_OUT );
     }
-}
 
 
 int tty_send_break(void)
@@ -851,10 +820,9 @@
 {
     int fdlimit = sysconf(_SC_OPEN_MAX);
 
-    while( startfd < fdlimit ) {
+	while( startfd < fdlimit )
         close( startfd++ );
     }
-}
 
 
 /*
@@ -929,11 +897,10 @@
         return -1;
     }
 
-    if ( mode ) {
+	if ( mode )
         misc |= O_NONBLOCK;
-    } else {
+	else
         misc &= ~O_NONBLOCK;
-    }
 
 	if (( misc = fcntl( fd, F_SETFL, misc )) == -1 ) {
 		DEBUG(('T',1,"fnctl: can't set %sblocking mode on fd %d: %s",
@@ -952,19 +919,22 @@
 int tio_get(int fd, TIO *t)
 {
 #ifdef SYSV_TERMIO
-    if ( ioctl( fd, TCGETA, t ) < 0 ) {
+    if ( ioctl( fd, TCGETA, t ) < 0 )
+    {
         DEBUG(('T',3,"TCGETA failed"));
         return ERROR;
     }
 #endif
 #ifdef POSIX_TERMIOS
-    if ( tcgetattr( fd, t ) < 0 ) {
+    if ( tcgetattr( fd, t ) < 0 )
+    {
         DEBUG(('T',3,"tcgetattr failed"));
         return ERROR;
     }
 #endif
 #ifdef BSD_SGTTY
-    if ( gtty( fd, t ) < 0 ) {
+    if ( gtty( fd, t ) < 0 )
+    {
         DEBUG(('T',3,"gtty failed"));
         return ERROR;
     }
@@ -979,20 +949,23 @@
 int tio_set(int fd, TIO *t)
 {
 #ifdef SYSV_TERMIO
-    if ( ioctl( fd, TCSETA, t ) < 0 ) {
+    if ( ioctl( fd, TCSETA, t ) < 0 )
+    {
         DEBUG(('T',3,"ioctl TCSETA failed"));
         return ERROR;
     }
 #endif
 #ifdef POSIX_TERMIOS
-    if ( tcsetattr( fd, TCSANOW, t ) < 0 ) {
+    if ( tcsetattr( fd, TCSANOW, t ) < 0 )
+    {
         DEBUG(('T',3,"tcsetattr failed"));
         return ERROR;
     }
 #endif /* posix_termios */
 
 #ifdef BSD_SGTTY
-    if ( stty( fd, t ) < 0 ) {
+    if ( stty( fd, t ) < 0 )
+    {
         DEBUG(('T',3,"stty failed"));
         return ERROR;
     }
@@ -1011,12 +984,11 @@
 {
     int i, symspeed = 0;
 
-    for( i = 0; speedtab[i].cbaud != 0; i++ ) {
-        if ( speedtab[i].nspeed == speed ) {
-            symspeed = speedtab[i].cbaud;
-            break;
+    for( i = 0; speedtab[i].cbaud != 0; i++ )
+    {
+	if ( speedtab[i].nspeed == speed ) 
+		{ symspeed = speedtab[i].cbaud; break; }
         }
-    }
 
     if ( symspeed == 0 ) {
         errno = EINVAL;
@@ -1056,10 +1028,9 @@
     struct speedtab *st;
 
     for( st = speedtab; st->nspeed != 0; st++ ) {
-        if ( st->cbaud == cbaud ) {
+        if ( st->cbaud == cbaud )
             break;
         }
-    }
     return st->nspeed;
 }
  
@@ -1073,14 +1044,12 @@
     if ( local )
 #if defined(SYSV_TERMIO) || defined( POSIX_TERMIOS )
         t->c_cflag |= CLOCAL;
-    else {
+	else
         t->c_cflag &= ~CLOCAL;
-    }
 #else		/* BSD_SGTTY (tested only on NeXT yet, but should work) */
         t->sg_flags &= ~LNOHANG;
-    else {
+	else
         t->sg_flags |= LNOHANG ;
-    }
 #endif
 }
 
@@ -1201,18 +1170,15 @@
     t->c_cflag &= ~HARDW_HS;
     t->c_iflag &= ~( IXON | IXOFF | IXANY );
 
-    if ( type & FLOW_HARD ) {
+    if ( type & FLOW_HARD )
         t->c_cflag |= HARDW_HS;
-    }
-    if ( type & FLOW_XON_IN ) {
+    if ( type & FLOW_XON_IN )
         t->c_iflag |= IXOFF;
-    }
     if ( type & FLOW_XON_OUT ) {
         t->c_iflag |= IXON;
-        if ( type & FLOW_XON_IXANY ) {
+        if ( type & FLOW_XON_IXANY )
             t->c_iflag |= IXANY;
         }
-    }
 #else
 # ifdef NEXTSGTTY
     DEBUG(('T',3,"tio_set_flow_control: not yet implemented"));
@@ -1229,11 +1195,10 @@
         DEBUG(('T',3,"ioctl TCGETX"));
         return ERROR;
     }
-    if ( type & FLOW_HARD ) {
+    if ( type & FLOW_HARD )
         tix.x_hflag |= (RTSXOFF | CTSXON);
-    } else {
+    else
         tix.x_hflag &= ~(RTSXOFF | CTSXON);
-    }
     
     if ( ioctl( fd, TCSETX, &tix ) < 0 ) {
         DEBUG(('T',3,"ioctl TCSETX" ));
@@ -1254,10 +1219,9 @@
     struct speedtab *st;
 
     for( st = speedtab; st->nspeed != 0; st++ ) {
-        if ( st->nspeed == speed ) {
+        if ( st->nspeed == speed )
             break;
         }
-    }
     return st->cbaud;
 }
 
@@ -1369,15 +1333,9 @@
     int r = OK;
 #ifdef POSIX_TERMIOS
     switch( queue ) {
-    case TIO_Q_IN:
-        r = tcflush( fd, TCIFLUSH );
-        break;
-    case TIO_Q_OUT:
-        r = tcflush( fd, TCOFLUSH );
-        break;
-    case TIO_Q_BOTH:
-        r = tcflush( fd, TCIOFLUSH );
-        break;
+        case TIO_Q_IN:   r = tcflush( fd, TCIFLUSH ); break;
+        case TIO_Q_OUT:  r = tcflush( fd, TCOFLUSH ); break;
+        case TIO_Q_BOTH: r = tcflush( fd, TCIOFLUSH );break;
         default:
             DEBUG(('T',2,"tio_flush_queue: invalid ``queue'' argument (%d)", queue ));
             return ERROR;
@@ -1385,15 +1343,9 @@
 #endif
 #ifdef SYSV_TERMIO
     switch ( queue ) {
-    case TIO_Q_IN:
-        r = ioctl( fd, TCFLSH, 0 );
-        break;
-    case TIO_Q_OUT:
-        r = ioctl( fd, TCFLSH, 1 );
-        break;
-    case TIO_Q_BOTH:
-        r = ioctl( fd, TCFLSH, 2 );
-        break;
+        case TIO_Q_IN:   r = ioctl( fd, TCFLSH, 0 ); break;
+        case TIO_Q_OUT:  r = ioctl( fd, TCFLSH, 1 ); break;
+        case TIO_Q_BOTH: r = ioctl( fd, TCFLSH, 2 ); break;
         default:
             DEBUG(('T',2,"tio_flush_queue: invalid ``queue'' argument (%d)", queue ));
             return ERROR;
@@ -1403,24 +1355,17 @@
     int arg;
 
     switch ( queue ) {
-    case TIO_Q_IN:
-        arg = FREAD;
-        break;
-    case TIO_Q_OUT:
-        arg = FWRITE;
-        break;
-    case TIO_Q_BOTH:
-        arg = FREAD | FWRITE;
-        break;
+        case TIO_Q_IN:   arg = FREAD; break;
+        case TIO_Q_OUT:  arg = FWRITE; break;
+        case TIO_Q_BOTH: arg = FREAD | FWRITE; break;
     default:
         DEBUG(('T',2,"tio_flush_queue: invalid ``queue'' argument (%d)", queue ));
         return ERROR;
     }
     r = ioctl( fd, TIOCFLUSH, (char *) &arg );
 #endif
-    if ( r != 0 ) {
+    if ( r != 0 )
         DEBUG(('T',2,"tio: cannot flush queue" ));
-    }
 
     return r;
 }
@@ -1462,15 +1407,15 @@
 {
     int flags;
 #ifdef TIO_F_SYSTEM_DEFS
-    if ( ioctl(fd, TIOCMGET, &flags ) < 0 ) {
+    if ( ioctl(fd, TIOCMGET, &flags ) < 0 )
         DEBUG(('M',3,"tio_get_rs232_lines: TIOCMGET failed"));
-    }
 
 #else /* !TIO_F_SYSTEM_DEFS */
     flags=-1;
 #endif
 
-    if ( flags != -1 ) {
+    if ( flags != -1 )
+    {
         DEBUG(('M',3,"tio_get_rs232_lines: status: [%s][%s][%s][%s][%s][%s]",
             ( flags & TIO_F_RTS ) ? "RTS" : "rts",
             ( flags & TIO_F_CTS ) ? "CTS" : "cts",
diff -burw ./qico/src/tty.h ./trunk/src/tty.h
--- ./qico/src/tty.h	2024-02-01 18:09:52.573460000 +0300
+++ ./trunk/src/tty.h	2024-02-01 18:10:34.590672000 +0300
@@ -1,4 +1,4 @@
-/* $Id: tty.h,v 1.16 2005/05/16 20:33:46 mitry Exp $ */
+/* $Id: tty.h 18 2010-08-23 15:50:49Z semik $ */
 /*
  * $Log: tty.h,v $
  * Revision 1.16  2005/05/16 20:33:46  mitry
@@ -47,7 +47,7 @@
 #if !defined( POSIX_TERMIOS ) && !defined( BSD_SGTTY ) && !defined( SYSV_TERMIO)
 # if defined(linux) || defined(sunos4) || defined(_AIX) || defined(BSD) || \
      defined(SVR4) || defined(solaris2) || defined(m88k) || defined(M_UNIX) ||\
-     defined(__sgi) || defined(__FreeBSD__)
+     defined(__sgi)
 #  define POSIX_TERMIOS
 # else
 #  define SYSV_TERMIO
diff -burw ./qico/src/types.h ./trunk/src/types.h
--- ./qico/src/types.h	2024-02-01 18:09:52.573531000 +0300
+++ ./trunk/src/types.h	2024-02-01 18:10:34.605560000 +0300
@@ -1,11 +1,11 @@
 /**********************************************************
  * common types
- * $Id: types.h,v 1.8 2005/08/23 16:23:09 mitry Exp $
+ * $Id: types.h 18 2010-08-23 15:50:49Z semik $
  **********************************************************/
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
-#include <config.h>
+#include "config.h"
 
 #if SIZEOF_CHAR==1
 typedef signed char	SINT8;
@@ -13,6 +13,7 @@
 typedef signed char	CHAR;
 typedef unsigned char	UINT8;
 typedef unsigned char	BYTE;
+#define _8BIT_DECLARED
 #else
 #	error "There is no 8-bit integer type in your compiler, sorry"
 #endif
@@ -22,12 +23,14 @@
 typedef signed short	INT16;
 typedef unsigned short	UINT16;
 typedef unsigned short	WORD;
+#define _16BIT_DECLARED
 #else
 #    if SIZEOF_INT==2
 typedef signed int	SINT16;
 typedef signed int	INT16;
 typedef unsigned int	UINT16;
 typedef unsigned int	WORD;
+#define _16BIT_DECLARED
 #    else
 #        error "There is no 16-bit integer type in your compiler, sorry"
 #    endif
@@ -37,19 +40,21 @@
 typedef signed long	SINT32;
 typedef signed long	INT32;
 typedef unsigned long	UINT32;
-typedef unsigned long	DWORD;
+#define _32BIT_DECLARED
 #define LONGx1	( SIZEOF_LONG )
 #else
 #    if SIZEOF_INT==4
 typedef signed int	SINT32;
 typedef signed int	INT32;
 typedef unsigned int	UINT32;
-typedef unsigned int	DWORD;
+#define _32BIT_DECLARED
 #define LONGx1	( SIZEOF_INT )
 #    else
 #        error "There is no 32-bit integer type in your compiler, sorry"
 #    endif
 #endif
+
+typedef UINT32	DWORD;
 
 #ifndef false
 #define false 0
Only in ./qico/src: vartree.h
diff -burw ./qico/src/x2c.awk ./trunk/src/x2c.awk
--- ./qico/src/x2c.awk	2024-02-01 18:09:52.573659000 +0300
+++ ./trunk/src/x2c.awk	2024-02-01 18:10:34.581712000 +0300
@@ -1,4 +1,4 @@
-# $Id: x2c.awk,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# $Id: x2c.awk 18 2010-08-23 15:50:49Z semik $
 BEGIN {
     C="qconf.c"; H="qconf.h"
     A="/* this file autogenerated from qconf.x, do not edit! */\n"
Only in ./trunk: stamp-h.in
Only in ./qico/stuff: .gitignore
diff -burw ./qico/stuff/Makefile.am ./trunk/stuff/Makefile.am
--- ./qico/stuff/Makefile.am	2024-02-01 18:09:52.573795000 +0300
+++ ./trunk/stuff/Makefile.am	2024-02-01 18:10:34.604900000 +0300
@@ -1,3 +1,3 @@
-# $Id: Makefile.am,v 1.2 2005/08/21 04:14:01 mitry Exp $
+# $Id: Makefile.am 18 2010-08-23 15:50:49Z semik $
 EXTRA_DIST = ftn qico.xpm sfreq onchat synctime tossing \
 	     qhistory qlinks stat.run koi8r_866.cp test.pl
diff -burw ./qico/stuff/ftn ./trunk/stuff/ftn
--- ./qico/stuff/ftn	2024-02-01 18:09:52.573849000 +0300
+++ ./trunk/stuff/ftn	2024-02-01 18:10:34.637049000 +0300
@@ -4,7 +4,7 @@
 #
 # This is a script for RedHat's startup process.
 #
-# $Id: ftn,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# $Id: ftn 18 2010-08-23 15:50:49Z semik $
 # chkconfig: 345 86 14
 # description: FTN services
 #
diff -burw ./qico/stuff/koi8r_866.cp ./trunk/stuff/koi8r_866.cp
--- ./qico/stuff/koi8r_866.cp	2024-02-01 18:09:52.573905000 +0300
+++ ./trunk/stuff/koi8r_866.cp	2024-02-01 18:10:34.604068000 +0300
@@ -1,5 +1,5 @@
 # Recode table for convert KOI8-R codepage to CP866. (Russian language).
-# $Id: koi8r_866.cp,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# $Id: koi8r_866.cp 18 2010-08-23 15:50:49Z semik $
 #in  out
 0x80 0xC4
 0x81 0xB3
diff -burw ./qico/stuff/onchat ./trunk/stuff/onchat
--- ./qico/stuff/onchat	2024-02-01 18:09:52.573957000 +0300
+++ ./trunk/stuff/onchat	2024-02-01 18:10:34.637321000 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 # sample of script for run in `runonchat'
-# $Id: onchat,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# $Id: onchat 18 2010-08-23 15:50:49Z semik $
 for a in 1 2 3 6 5 4 8 6 20 10; do
     echo -en "\033[11;300]\033[10;${a}00]\a\033[10]\033[11]" >/dev/tty12
     echo -n|cat
diff -burw ./qico/stuff/synctime ./trunk/stuff/synctime
--- ./qico/stuff/synctime	2024-02-01 18:09:52.574320000 +0300
+++ ./trunk/stuff/synctime	2024-02-01 18:10:34.638391000 +0300
@@ -1,5 +1,5 @@
 #!/bin/awk -f
-# $Id: synctime,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# $Id: synctime 18 2010-08-23 15:50:49Z semik $
 # script to qico for synchronize local and remote time by sisoft\\trg'2OO2
 # exec: synctime qico_log
 
diff -burw ./qico/stuff/test.pl ./trunk/stuff/test.pl
--- ./qico/stuff/test.pl	2024-02-01 18:09:52.574404000 +0300
+++ ./trunk/stuff/test.pl	2024-02-01 18:10:34.604365000 +0300
@@ -1,5 +1,5 @@
-# test and info perl script for qico.
-# $Id: test.pl,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# test and info perl script for qicosi.
+# $Id: test.pl 18 2010-08-23 15:50:49Z semik $
 
 # available qico functions:
 #  sub wlog([level,]string): write string to log.
diff -burw ./qico/stuff/tossing ./trunk/stuff/tossing
--- ./qico/stuff/tossing	2024-02-01 18:09:52.574455000 +0300
+++ ./trunk/stuff/tossing	2024-02-01 18:10:34.638100000 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 # script for tossing mail by sisoft\trg'2002
-# $Id: tossing,v 1.1.1.1 2004/12/29 21:23:34 mitry Exp $
+# $Id: tossing 18 2010-08-23 15:50:49Z semik $
 
 # netmail
 find /var/spool/ftn/inb/*.[pP][kK][tT] >/dev/null 2>&1 &&
Only in ./qico: tests