Fix Pack 003: LUNATIC FORCE [Stage Final]

.gitignore

@@ -35,6 +35,9 @@
 make_export.conf
 maple/make_export.conf
 
+# git version info
+verinfo_export.conf
+
 # add split-out build directory for cmake
 build/
 
@@ -89,6 +92,9 @@ util/match
 util/msgall
 util/outgo
 util/poststat
+util/readBENZ
+util/readFRIENZ
+util/readUSR
 util/reaper
 util/redir
 util/resetvmail

CMakeLists.txt

@@ -31,6 +31,7 @@ if(NOT USE_CXX)
 else()
     # specify the C++ standard
     add_compile_options(-x c++ --std=gnu++14)
+    link_libraries(stdc++)
     set(USE_CXX ON CACHE BOOL "Compile C code using C++ mode")
 endif()
 
@@ -66,15 +67,30 @@ function(LOADVALUE conf default hdr output)
     set("${output}" "${${output}}" PARENT_SCOPE)
 endfunction(LOADVALUE)
 
-function(GETID options name output)
+set(ID_DEFAULT 9999)
+
+function(GETUID name output)
     execute_process(
-        COMMAND sh -c "id ${options} ${name} || echo 9999"
+        COMMAND sh -c "id -u ${name} || echo ${ID_DEFAULT}"
         OUTPUT_VARIABLE "${output}"
         OUTPUT_STRIP_TRAILING_WHITESPACE
         ERROR_QUIET
     )
     set("${output}" "${${output}}" PARENT_SCOPE)
-endfunction(GETID)
+endfunction(GETUID)
+
+function(GETGID name output)
+    execute_process(
+        COMMAND getent group ${name}
+        COMMAND cut -d: -f3 -
+        OUTPUT_VARIABLE "${output}"
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if ("${${output}}" STREQUAL "")
+        set("${output}" ${ID_DEFAULT})
+    endif()
+    set("${output}" "${${output}}" PARENT_SCOPE)
+endfunction(GETGID)
 
 function(DEF_TEST conf hdr output)
     if("${hdr}" IS_NEWER_THAN ${CMAKE_CACHEFILE_DIR}/CMakeCache.txt)
@@ -91,6 +107,7 @@ set(BBSCONF "${PROJECT_SOURCE_DIR}/dreambbs.conf")
 set(BBSCONF_ORIGIN "${PROJECT_SOURCE_DIR}/include/config.h")
 set(EXPORT_PROJECT "${PROJECT_SOURCE_DIR}/make_export.conf")
 set(EXPORT_MAPLE "${PROJECT_SOURCE_DIR}/maple/make_export.conf")
+set(EXPORT_VERINFO "${PROJECT_SOURCE_DIR}/verinfo_export.conf")
 
 if(NOT EXISTS ${EXPORT_PROJECT})
     execute_process(COMMAND touch ${EXPORT_PROJECT})
@@ -107,9 +124,9 @@ LOADVALUE(BBSGROUP "${BBSGROUP_DEFAULT}" ${BBSCONF_ORIGIN} BBSGROUP)
 LOADVALUE(WWWGROUP "www-data" ${BBSCONF_ORIGIN} WWWGROUP)
 
 # UIDs and GIDs
-GETID(-u "${BBSUSR}" BBSUID_DEFAULT)
-GETID(-g "${BBSGROUP}" BBSGID_DEFAULT)
-GETID(-g "${WWWGROUP}" WWWGID_DEFAULT)
+GETUID("${BBSUSR}" BBSUID_DEFAULT)
+GETGID("${BBSGROUP}" BBSGID_DEFAULT)
+GETGID("${WWWGROUP}" WWWGID_DEFAULT)
 LOADVALUE(BBSUID "${BBSUID_DEFAULT}" ${BBSCONF_ORIGIN} BBSUID)
 LOADVALUE(BBSGID "${BBSGID_DEFAULT}" ${BBSCONF_ORIGIN} BBSGID)
 LOADVALUE(WWWGID "${WWWGID_DEFAULT}" ${BBSCONF_ORIGIN} WWWGID)
@@ -124,12 +141,21 @@ execute_process(
 )
 LOADVALUE(BBSHOME "${BBSUSR_HOME}" ${BBSCONF_ORIGIN} BBSHOME)
 
+## Numeric local timezone
+execute_process(
+    COMMAND date %z
+    OUTPUT_VARIABLE BBSUTCZONE_DEFAULT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+LOADVALUE(BBSUTCZONE "${BBSUTCZONE_DEFAULT}" ${BBSCONF_ORIGIN} BBSUTCZONE)
+
 # Flags for enabling modules
 DEF_TEST(M3_USE_PMORE ${BBSCONF} USE_PMORE)
 DEF_TEST(M3_USE_PFTERM ${BBSCONF} USE_PFTERM)
 DEF_TEST(M3_USE_BBSLUA ${BBSCONF} USE_BBSLUA)
 DEF_TEST(M3_USE_BBSRUBY ${BBSCONF} USE_BBSRUBY)
 DEF_TEST(BBSLUA_USE_LUAJIT ${BBSCONF} USE_LUAJIT)
+DEF_TEST(BBSRUBY_USE_MRUBY ${BBSCONF} USE_MRUBY)
 
 # Flags for disabling shared objects
 if(DEFINED ENV{NO_SO})
@@ -223,7 +249,12 @@ if(USE_BBSRUBY)
     if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
         link_libraries(-Wl,--no-as-needed)
     endif()
+    if(USE_MRUBY)
+        set(RUBY_CFLAGS)
+        set(RUBY_LDFLAGS mruby m)
+    else()
     pkg_search_module(RUBY REQUIRED ruby<=2.2 ruby-2.2)
+    endif()
 endif()
 
 ## Generate configure file
@@ -239,6 +270,13 @@ endfunction()
 
 EXPORT_CONF(${CMAKE_CURRENT_SOURCE_DIR}/make_export.conf)
 
+add_custom_target(verinfo
+    ALL
+    sh scripts/verinfo.sh CMake ${MULTIARCH}
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+)
+add_compile_options(-imacros "${EXPORT_VERINFO}")
+
 set(CMAKE_INSTALL_PREFIX ${BBSHOME})
 
 add_subdirectory(lib)

Makefile

@@ -20,7 +20,7 @@ EXPORT_FILE	:= "$(REALSRCROOT)/make_export.conf"
 # some directories need to be compiled:
 # lib innbbsd maple so util test
 
-all:
+all: verinfo
 	@(cd lib; $(MAKE) all)
 	@(cd maple; $(MAKE) all)
 	@(cd util; $(MAKE) all)
@@ -30,7 +30,7 @@ all:
 .endif
 	@(cd test; $(MAKE) all)
 
-njob:
+njob: verinfo
 	@(cd lib; $(MAKE) -j$(NPROC) all)
 	@(cd maple; $(MAKE) -j$(NPROC) all)
 	@(cd util; $(MAKE) -j$(NPROC) all)
@@ -49,6 +49,7 @@ export:
 	@$(EXPORTVAR$(exconf::= BBSGID))
 	@$(EXPORTVAR$(exconf::= WWWGID))
 	@$(EXPORTCONF$(exconf::= BBSHOME)$(exvalue::= \"$(BBSHOME)\"))
+	@$(EXPORTCONF$(exconf::= BBSUTCZONE)$(exvalue::= \"$(BBSUTCZONE)\"))
 	@$("$(ARCHI)" == "64" :? $(EXPORTCONF$(exconf::= _FILE_OFFSET_BITS)$(exvalue::= 64)) :)
 
 configure:
@@ -63,6 +64,9 @@ configure:
 	# Continue execution with a new `bmake` instace and stop current `bmake` instance
 	@if [ "$(TARGETS_REST)" ]; then sh -c "$(MAKE) $(TARGETS_REST) $(MAKEFLAGS)"; printf "\033[1;36mJob done. Force stop.\033[m\n" >&2; false; fi
 
+verinfo: .PHONY
+	@sh scripts/verinfo.sh "BSD-make" "$(MULTIARCH)"
+
 runtest:
 	@(cd test; $(MAKE) runtest)
 

dreambbs.mk

@@ -39,7 +39,7 @@ VALUEIF = "\#ifdef $(conf)$(.newline)$(conf:M*)$(.newline)\#else$(.newline)$(def
 DEFVAR = "\#undef $(exconf:M*)$(.newline)\#define $(exconf:M*) $($(exconf:M*):M*)"
 DEFCONF = "\#undef $(exconf:M*)$(.newline)\#define $(exconf:M*) $(exvalue:M*)"
 
-GETVAR = [ "$(var:M*:$(UNQUOTE))" ] && echo "$(var:M*:UNQUOTE)" || $(else_var)
+GETVAR = [ "$(var:M*:$(UNQUOTE))" ] && echo "$(var:M*:$(UNQUOTE))" || $(else_var)
 GETCONFS = echo "" | $(CC) -x c -dM -E -P $(hdr:@v@-imacros "$v"@) - 2>/dev/null
 GETVALUE = { echo $(VALUEIF$(conf::= $(conf:M*:$(UNQUOTE)))$(default::= $(default:M*))) | $(CC) -x c -E -P $(hdr:@v@-imacros "$v"@) - | xargs; } 2>/dev/null
 EXPORTVAR = echo $(DEFVAR$(exconf::= $(exconf:M*))) >> $(EXPORT_FILE)
@@ -50,24 +50,34 @@ EXPORTCONF = echo $(DEFCONF$(exconf::= $(exconf:M*))$(exvalue::= $(exvalue:M*)))
 BBSCONF		:= $(REALSRCROOT)/dreambbs.conf
 BBSCONF_ORIGIN		:= $(REALSRCROOT)/include/config.h
 EXPORT_MAPLE	:= $(REALSRCROOT)/maple/make_export.conf
+EXPORT_VERINFO	:= $(REALSRCROOT)/verinfo_export.conf
 != touch $(EXPORT_MAPLE)
+CFLAGS_MK	+= -imacros "$(EXPORT_VERINFO)"
 
 # User names and group names
 BBSUSR != $(GETVAR$(var::= "$(BBSUSR)")$(else_var::= $(GETVALUE$(conf::= "BBSUSR")$(default::= "$(:!id -un!)")$(hdr::= $(BBSCONF_ORIGIN)))))
 BBSGROUP != $(GETVAR$(var::= "$(BBSGROUP)")$(else_var::= $(GETVALUE$(conf::= "BBSGROUP")$(default::= "$(:!id -gn!)")$(hdr::= $(BBSCONF_ORIGIN)))))
 WWWGROUP != $(GETVAR$(var::= "$(WWWGROUP)")$(else_var::= $(GETVALUE$(conf::= "WWWGROUP")$(default::= "www-data")$(hdr::= $(BBSCONF_ORIGIN)))))
 
 # UIDs and GIDs
-ID_FALLBACK = 2>/dev/null || echo 9999
+ID_DEFAULT = 9999
+ID_FALLBACK = 2>/dev/null || echo $(ID_DEFAULT)
 BBSUID != $(GETVAR$(var::= "$(BBSUID)")$(else_var::= $(GETVALUE$(conf::= "BBSUID")$(default::= "$(:!id -u $(BBSUSR) $(ID_FALLBACK)!)")$(hdr::= $(BBSCONF)))))
-BBSGID != $(GETVAR$(var::= "$(BBSGID)")$(else_var::= $(GETVALUE$(conf::= "BBSGID")$(default::= "$(:!id -g $(BBSGROUP) $(ID_FALLBACK)!)")$(hdr::= $(BBSCONF)))))
-WWWGID != $(GETVAR$(var::= "$(WWWGID)")$(else_var::= $(GETVALUE$(conf::= "WWWGID")$(default::= "$(:!id -g $(WWWGROUP) $(ID_FALLBACK)!)")$(hdr::= $(BBSCONF)))))
+BBSGROUP_GID != getent group $(BBSGROUP) | cut -d: -f3
+BBSGROUP_GID != $(GETVAR$(var::= "$(BBSGROUP_GID)")$(else_var::= echo $(ID_DEFAULT)))
+BBSGID != $(GETVAR$(var::= "$(BBSGID)")$(else_var::= $(GETVALUE$(conf::= "BBSGID")$(default::= "$(BBSGROUP_GID)")$(hdr::= $(BBSCONF)))))
+WWWGROUP_GID != getent group $(WWWGROUP) | cut -d: -f3
+WWWGROUP_GID != $(GETVAR$(var::= "$(WWWGROUP_GID)")$(else_var::= echo $(ID_DEFAULT)))
+WWWGID != $(GETVAR$(var::= "$(WWWGID)")$(else_var::= $(GETVALUE$(conf::= "WWWGID")$(default::= "$(WWWGROUP_GID)")$(hdr::= $(BBSCONF)))))
 
 ## BBS path prefixes and suffixes
 BBSVER != $(GETVALUE$(conf::= "BBSVER_SUFFIX")$(default::= "")$(hdr::= $(BBSCONF_ORIGIN)))
 BBSUSR_HOME != getent passwd $(BBSUSR) | cut -d: -f6
 BBSHOME != $(GETVAR$(var::= "$(BBSHOME)")$(else_var::= $(GETVALUE$(conf::= "BBSHOME")$(default::= "$(BBSUSR_HOME)")$(hdr::= $(BBSCONF)))))
 
+## Numeric local timezone
+BBSUTCZONE != $(GETVAR$(var::= "$(BBSUTCZONE)")$(else_var::= $(GETVALUE$(conf::= "BBSUTCZONE")$(default::= "$(:!date +%z!)")$(hdr::= $(BBSCONF)))))
+
 # rules ref: PttBBS: mbbsd/Makefile
 DEF_LIST	!= sh -c '$(GETCONFS$(hdr::= $(BBSCONF)))'
 DEF_TEST	 = [ $(DEF_LIST:M$(conf:M*:S/"//g:N")) ]  # Balance the quotes
@@ -77,12 +87,13 @@ USE_PFTERM	!= sh -c '$(DEF_TEST$(conf::= "M3_USE_PFTERM")) $(DEF_YES)'
 USE_BBSLUA	!= sh -c '$(DEF_TEST$(conf::= "M3_USE_BBSLUA")) $(DEF_YES)'
 USE_BBSRUBY	!= sh -c '$(DEF_TEST$(conf::= "M3_USE_BBSRUBY")) $(DEF_YES)'
 USE_LUAJIT	!= sh -c '$(DEF_TEST$(conf::= "BBSLUA_USE_LUAJIT")) $(DEF_YES)'
+USE_MRUBY	!= sh -c '$(DEF_TEST$(conf::= "BBSRUBY_USE_MRUBY")) $(DEF_YES)'
 
 # Flags for disabling shared objects
-DEF_LIST	!= sh -c '$(GETCONFS$(hdr::= $(EXPORT_MAPLE)))'
 NO_SO_CLI	:= $("$(NO_SO_CLI)" != "" :? $(NO_SO_CLI) : $(NO_SO:DYES:UNO))
 NO_SO_CONF	!= sh -c '$(DEF_TEST$(conf::= "NO_SO")) $(DEF_YES)'
-NO_SO		= $(NO_SO_CLI:S/NO//g)$(NO_SO_CONF)
+NO_SO_CONF	!= $(GETVALUE$(conf::= "NO_SO")$(default::= "0")$(hdr::= $(EXPORT_MAPLE)))
+NO_SO		= $(NO_SO_CLI:S/NO//g)$(NO_SO_CONF:S/0//g)
 
 CC_HASFLAGS = echo "" | $(CC) -x c -E $(flags:M*) -Werror - >/dev/null 2>&1
 
@@ -121,8 +132,10 @@ NO_SO		 = YES
 
 .if $(NO_SO)
 CFLAGS_MAPLE	+= -DNO_SO
+CFLAGS_SO	+= -DNO_SO
 .else
 CFLAGS_MAPLE	+= -DNO_SO=0
+CFLAGS_SO	+= -DNO_SO=0
 .endif
 
 .if $(CC:M*++) || $(CC:M*++-*)
@@ -170,9 +183,14 @@ LUA_LDFLAGS	!= pkg-config --libs $(LUA_PKG_NAME)
     RUBY_LDFLAGS_ARCHI	= -Wl,--no-as-needed
 .endif
 
+.if $(USE_MRUBY)
+RUBY_CFLAGS	=
+RUBY_LDFLAGS	= -lmruby -lm
+.else
 RUBY_CFLAGS	!= pkg-config --cflags ruby-2.2
 RUBY_LDFLAGS	!= pkg-config --libs ruby-2.2
 .endif
+.endif
 
 .endif  # .ifndef DREAMBBS_MK
 

include/battr.h

@@ -9,6 +9,8 @@
 #ifndef BATTR_H
 #define BATTR_H
 
+#include "cppdef.h"
+
 /* ----------------------------------------------------- */
 /* Board Attribution : flags in BRD.battr                */
 /* ----------------------------------------------------- */
@@ -63,67 +65,24 @@ static const char *const battrs[NUMATTRS] =
       "���i��H��K�峹",
       "�۰ʪ��[e-mail",
       "���׫H",
-#ifdef  HAVE_DETECT_VIOLATELAW
-      "�����������H�k",
-#else
-      "�����������H�k(�t�Υ\\�ॼ�}��)",
-#endif
-#ifdef  HAVE_DETECT_CROSSPOST
-      "������ cross post",
-#else
-      "������ cross post(�t�Υ\\�ॼ�}��)",
-#endif
+      ATTR_CONF_STR("�����������H�k", HAVE_DETECT_VIOLATELAW),
+      ATTR_CONF_STR("������ cross post", HAVE_DETECT_CROSSPOST),
       "�ݪO��Ū�T��o���^��",
       "�������ݪ��\\Ū�v",
-#ifdef  HAVE_RESIST_WATER
-      "�����ݪ��������",
-#else
-      "�����ݪ��������(�t�Υ\\�ॼ�}��)",
-#endif
-#ifdef  HAVE_BRDTITLE_CHANGE
-      "�O�D�ק睊�W",
-#else
-      "�O�D�ק睊�W(�t�Υ\\�ॼ�}��)",
-#endif
-#ifdef  HAVE_USER_MODIFY
-      "�ϥΪ̤��i�ק�峹",
-#else
-      "�ϥΪ̤��i�ק�峹(�t�Υ\\�ॼ�}��)",
-#endif
-#ifdef  HAVE_RECOMMEND
-      "�T����ˤ峹",
-#else
-      "�T����ˤ峹(�t�Υ\\�ॼ�}��)",
-#endif
-#ifdef MultiRecommend
-      "���i�PID�s��",
-      "���i�ֳt�s��",
-      "�i�H���N��",
-      "�i�H�ۭq����ʵ�",
-#else
-      "���i�PID�s��(�t�Υ\\�ॼ�}��)",
-      "���i�ֳt�s��(�t�Υ\\�ॼ�}��)",
-      "�i�H���N��(�t�Υ\\�ॼ�}��)",
-      "�i�H�ۭq����ʵ�(�t�Υ\\�ॼ�}��)",
-#endif
-#ifdef HAVE_COUNT_BOARD
-      "�������ݪO��T�έp",
-#else
-      "�������ݪO��T�έp(�t�Υ\\�ॼ�}��)",
-#endif
+      ATTR_CONF_STR("�����ݪ��������", HAVE_RESIST_WATER),
+      ATTR_CONF_STR("�O�D�ק睊�W", HAVE_BRDTITLE_CHANGE),
+      ATTR_CONF_STR("�ϥΪ̤��i�ק�峹", HAVE_USER_MODIFY),
+      ATTR_CONF_STR("�T����ˤ峹", HAVE_RECOMMEND),
+      ATTR_CONF_STR("���i�PID�s��", MultiRecommend),
+      ATTR_CONF_STR("���i�ֳt�s��", MultiRecommend),
+      ATTR_CONF_STR("�i�H���N��", MultiRecommend),
+      ATTR_CONF_STR("�i�H�ۭq����ʵ�", MultiRecommend),
+      ATTR_CONF_STR("�������ݪO��T�έp", HAVE_COUNT_BOARD),
       "�[�ݶi�O����",
-#ifdef HAVE_POST_BOTTOM
-      "�峹�m��",
-#else
-      "�峹�m��(�t�Υ\\�ॼ�}��)",
-#endif
+      ATTR_CONF_STR("�峹�m��", HAVE_POST_BOTTOM),
       "�u�}�I�ƬݪO",
       "���ϥ�",
-#ifdef ANTI_PHONETIC
-      "�T��`����",
-#else
-      "�T��`����(�t�Υ\\�ॼ�}��)",
-#endif
+      ATTR_CONF_STR("�T��`����", ANTI_PHONETIC),
       "�o�孭��ݪO",
       "�O�D�i�ۭq�o�����O",
       "RSS�ݪO"

include/bbs_script.h

@@ -33,10 +33,16 @@ extern "C" {
 /* BBS-Ruby */
 
 #ifdef M3_USE_BBSRUBY
-  #include <ruby/version.h>
+  #ifdef BBSRUBY_USE_MRUBY
+    #include <mruby/version.h>
 
-  #define RUBY_RELEASE_STR \
-      VER_PATCH_STR(RUBY_API_VERSION_MAJOR, RUBY_API_VERSION_MINOR, RUBY_API_VERSION_TEENY)
+    #define RUBY_RELEASE_STR  MRUBY_RUBY_VERSION
+  #else
+    #include <ruby/version.h>
+
+    #define RUBY_RELEASE_STR \
+        VER_PATCH_STR(RUBY_API_VERSION_MAJOR, RUBY_API_VERSION_MINOR, RUBY_API_VERSION_TEENY)
+  #endif
 #endif
 
 #define HAVE_BBSRUBY