Import patches from pkgsrc

* Adjust paths to modern conventions.
* Avoid opening /dev/console.
* Consistently provide lowercase and MixedCase options.
* Don't abuse an int as a pointer (optarg).
* Fix compilation errors on NetBSD and DragonFly BSD.
* Fix documentation.
* Import headers and remove redundant declarations.

Signed-off-by: Masanori Ogino <mogino@acm.org>
This commit is contained in:
Masanori Ogino 2023-11-27 10:29:45 +09:00
commit 381c676eda
26 changed files with 143 additions and 98 deletions

View file

@ -70,7 +70,15 @@
#define ProtoName "tcp"
#define PortNumber "3000"
#else
/*
* Change the default Port number of sj3 for FreeBSD.
* Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20
*/
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#define PortNumber 3086
#else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
#define PortNumber 3000
#endif /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
#endif
#define DirectryMode 0755
#define DictFileMode 0644

View file

@ -33,7 +33,22 @@
* $SonyDate: 1997/01/23 11:20:55 $
*/
#define ErrorOutFile "/dev/console"
/*
* Change ErrotOutFile variable.
* Because suppress a error when sj3serv start up, change to "/dev/stderr".
* This error is "Cannot Open "/dev/console".".
* Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10
*
* Change ErrotOutFile variable.
* This default value is "/dev/null" in document.
* Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/11
*/
#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
#define ErrorOutFile "/dev/console"
#else
/* #define ErrorOutFile "/dev/stderr" */ /* for test */
#define ErrorOutFile "/dev/null"
#endif
#define SocketName "/tmp/sj3sock"
#define LockFile "/tmp/SJ3SERV.EXIST"