Bump liberty

Sadly, the 3.5 deprecation warning doesn't go away after this.

.clang-format

@@ -0,0 +1,32 @@
+# clang-format is fairly limited, and these rules are approximate:
+#  - array initializers can get terribly mangled with clang-format 12.0,
+#  - sometimes it still aligns with space characters,
+#  - struct name NL { NL ... NL } NL name; is unachievable.
+BasedOnStyle: GNU
+ColumnLimit: 80
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+BreakBeforeBraces: Allman
+SpaceAfterCStyleCast: true
+AlignAfterOpenBracket: DontAlign
+AlignOperands: DontAlign
+AlignConsecutiveMacros: Consecutive
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+IndentGotoLabels: false
+
+# IncludeCategories has some potential, but it may also break the build.
+# Note that the documentation says the value should be "Never".
+SortIncludes: false
+
+# This is a compromise, it generally works out aesthetically better.
+BinPackArguments: false
+
+# Unfortunately, this can't be told to align to column 40 or so.
+SpacesBeforeTrailingComments: 2
+
+# liberty-specific macro body wrappers.
+MacroBlockBegin: "BLOCK_START"
+MacroBlockEnd: "BLOCK_END"
+ForEachMacros: ["LIST_FOR_EACH"]

.gitignore

@@ -7,3 +7,5 @@
 /ponymap.files
 /ponymap.creator*
 /ponymap.includes
+/ponymap.cflags
+/ponymap.cxxflags

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "http-parser"]
 	path = http-parser
-	url = git://github.com/joyent/http-parser.git
+	url = https://github.com/nodejs/http-parser.git
 [submodule "liberty"]
 	path = liberty
 	url = https://git.janouch.name/p/liberty.git

CMakeLists.txt

@@ -1,74 +1,67 @@
-project (ponymap C)
-cmake_minimum_required (VERSION 2.8.5)
+cmake_minimum_required (VERSION 3.0...3.27)
+project (ponymap VERSION 0.1.0 LANGUAGES C)
 
 # Moar warnings
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	# -Wunused-function is pretty annoying here, as everything is static
 	set (CMAKE_C_FLAGS
 		"${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Wno-unused-function")
-endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
+endif ()
 
-# Version
-set (project_VERSION_MAJOR "0")
-set (project_VERSION_MINOR "1")
-set (project_VERSION_PATCH "0")
+# Dependencies
+set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
+include (AddThreads)
 
-set (project_VERSION "${project_VERSION_MAJOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")
+find_package (Curses)
+find_package (Ncursesw)
+find_package (PkgConfig REQUIRED)
+pkg_check_modules (jansson REQUIRED jansson)
+pkg_check_modules (libssl REQUIRED libssl libcrypto)
 
 if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
 	# Need this in FreeBSD and OpenBSD respectively;
 	# our POSIX version macros make it undefined
 	add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
-endif ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
+endif ()
 
-# Dependencies
-find_package (Curses)
-find_package (PkgConfig REQUIRED)
-pkg_check_modules (jansson REQUIRED jansson)
-pkg_check_modules (libssl REQUIRED libssl libcrypto)
-pkg_check_modules (ncursesw ncursesw)
-
-if (ncursesw_FOUND)
-	set (project_libraries ${ncursesw_LIBRARIES})
-	include_directories (${ncursesw_INCLUDE_DIRS})
-	link_directories (${ncursesw_LIBRARY_DIRS})
+if (Ncursesw_FOUND)
+	set (project_libraries ${Ncursesw_LIBRARIES})
+	include_directories (${Ncursesw_INCLUDE_DIRS})
+	link_directories (${Ncursesw_LIBRARY_DIRS})
 elseif (CURSES_FOUND)
 	set (project_libraries ${CURSES_LIBRARY})
 	include_directories (${CURSES_INCLUDE_DIR})
-else (CURSES_FOUND)
+else ()
 	message (SEND_ERROR "Curses not found")
-endif (ncursesw_FOUND)
+endif ()
 
-# FIXME: for "lua" we also need to check that it is < 5.4
+# FIXME: for "lua" we also need to check that it is < 5.5
 #   which doesn't seem to be possible with FindPkgConfig
-pkg_search_module (lua lua5.3 lua-5.3 lua>=5.3)
-option (WITH_LUA "Enable experimental support for Lua 5.3 plugins" ${lua_FOUND})
+pkg_search_module (lua lua5.3 lua-5.3 lua5.4 lua-5.4 lua>=5.3)
+option (WITH_LUA "Enable experimental support for Lua plugins" ${lua_FOUND})
 
 if (WITH_LUA)
 	if (NOT lua_FOUND)
 		message (FATAL_ERROR "Lua library not found")
-	endif (NOT lua_FOUND)
+	endif ()
 
 	list (APPEND project_libraries ${lua_LIBRARIES})
 	include_directories (${lua_INCLUDE_DIRS})
 	link_directories (${lua_LIBRARY_DIRS})
-endif (WITH_LUA)
+endif ()
 
 list (APPEND project_libraries ${libssl_LIBRARIES} ${jansson_LIBRARIES})
 include_directories (${libssl_INCLUDE_DIRS} ${jansson_INCLUDE_DIRS})
 link_directories (${libssl_LIBRARY_DIRS} ${jansson_LIBRARY_DIRS})
 
-# -lpthread is only there for debugging (gdb & errno)
 # -lrt is only for glibc < 2.17
 # -liconv may or may not be a part of libc
-foreach (extra iconv dl rt pthread)
+foreach (extra iconv dl rt)
 	find_library (extra_lib_${extra} ${extra})
 	if (extra_lib_${extra})
-		list (APPEND project_libraries ${extra})
-	endif (extra_lib_${extra})
-endforeach (extra)
+		list (APPEND project_libraries ${extra_lib_${extra}})
+	endif ()
+endforeach ()
 
 # Project source files
 set (project_sources ${PROJECT_NAME}.c)
@@ -77,12 +70,14 @@ set (project_headers ${PROJECT_BINARY_DIR}/config.h)
 # Generate a configuration file
 include (GNUInstallDirs)
 set (plugin_dir ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+set (full_plugin_dir ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
 configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)
 include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 
 # Build and install the main executable
 add_executable (${PROJECT_NAME} ${project_sources} ${project_headers})
 target_link_libraries (${PROJECT_NAME} ${project_libraries})
+add_threads (${PROJECT_NAME})
 
 install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
@@ -91,6 +86,7 @@ install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
 add_library (plugin-http SHARED plugins/http.c plugin-api.h
 	http-parser/http_parser.c http-parser/http_parser.h)
 target_link_libraries (plugin-http ${project_libraries})
+add_threads (plugin-http)
 set_target_properties (plugin-http PROPERTIES OUTPUT_NAME http PREFIX "")
 install (TARGETS plugin-http DESTINATION ${plugin_dir})
 
@@ -102,21 +98,22 @@ if (WITH_LUA)
 	list (APPEND plugins lua-loader)
 	foreach (lua_plugin ${lua_plugins})
 		install (FILES plugins/${lua_plugin}.lua DESTINATION ${plugin_dir})
-	endforeach (lua_plugin)
-endif (WITH_LUA)
+	endforeach ()
+endif ()
 foreach (plugin ${plugins})
 	set (target plugin-${plugin})
 	add_library (${target} SHARED plugins/${plugin}.c plugin-api.h)
 	target_link_libraries (${target} ${project_libraries})
+	add_threads (${target})
 	set_target_properties (${target} PROPERTIES OUTPUT_NAME ${plugin} PREFIX "")
 	install (TARGETS ${target} DESTINATION ${plugin_dir})
-endforeach (plugin)
+endforeach ()
 
 # Generate documentation from program help
 find_program (HELP2MAN_EXECUTABLE help2man)
 if (NOT HELP2MAN_EXECUTABLE)
 	message (FATAL_ERROR "help2man not found")
-endif (NOT HELP2MAN_EXECUTABLE)
+endif ()
 
 foreach (page ${PROJECT_NAME})
 	set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
@@ -126,7 +123,7 @@ foreach (page ${PROJECT_NAME})
 			"${PROJECT_BINARY_DIR}/${page}" -o ${page_output}
 		DEPENDS ${page}
 		COMMENT "Generating man page for ${page}" VERBATIM)
-endforeach (page)
+endforeach ()
 
 add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
 
@@ -134,23 +131,22 @@ foreach (page ${project_MAN_PAGES})
 	string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
 	install (FILES "${page}"
 		DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
-endforeach (page)
+endforeach ()
 
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental network scanner")
-set (CPACK_PACKAGE_VERSION ${project_VERSION})
-set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
+set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
+set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 set (CPACK_GENERATOR "TGZ;ZIP")
 set (CPACK_PACKAGE_FILE_NAME
-	"${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${project_VERSION}")
+	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${PROJECT_VERSION}")
 
 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 
 set (CPACK_SET_DESTDIR TRUE)
 include (CPack)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2015, Přemysl Janouch <p@janouch.name>
+Copyright (c) 2014 - 2015, Přemysl Eric Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

README.adoc

@@ -17,13 +17,15 @@ the maximum number of concurrent connections.
 
 Packages
 --------
-Regular releases are sporadic.  git master should be stable enough.  You can get
-a package with the latest development version from Archlinux's AUR.
+Regular releases are sporadic.  git master should be stable enough.
+You can get a package with the latest development version using Arch Linux's
+https://aur.archlinux.org/packages/ponymap-git[AUR],
+or as a https://git.janouch.name/p/nixexprs[Nix derivation].
 
 Building and Usage
 ------------------
-Build dependencies: CMake, pkg-config, help2man +
-Runtime dependenices: curses, openssl, Jansson, lua = 5.3 (optional)
+Build dependencies: CMake >= 3.0, pkg-config, help2man +
+Runtime dependenices: curses, openssl, Jansson, lua >= 5.3 (optional)
 
  $ git clone --recursive https://git.janouch.name/p/ponymap.git
  $ mkdir ponymap/build
@@ -40,9 +42,6 @@ Or you can try telling CMake to make a package for you.  For Debian it is:
  $ cpack -G DEB
  # dpkg -i ponymap-*.deb
 
-Note that for versions of CMake before 2.8.9, you need to prefix `cpack` with
-`fakeroot` or file ownership will end up wrong.
-
 Having the program installed, simply run it with no arguments to retrieve
 a usage text.  Have fun scanning.
 

config.h.in

@@ -1,10 +1,10 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define PROGRAM_NAME "${CMAKE_PROJECT_NAME}"
-#define PROGRAM_VERSION "${project_VERSION}"
+#define PROGRAM_NAME "${PROJECT_NAME}"
+#define PROGRAM_VERSION "${PROJECT_VERSION}"
 
 #cmakedefine WITH_LUA
-#define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${plugin_dir}"
+#define PLUGIN_DIR "${full_plugin_dir}"
 
 #endif  // ! CONFIG_H

plugin-api.h

@@ -1,7 +1,7 @@
 /*
  * plugin-api.h: plugin API for ponymap
  *
- * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2014, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.

plugins/http.c

@@ -1,7 +1,7 @@
 /*
  * http.c: HTTP service detection plugin
  *
- * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2014, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.

plugins/irc.c

@@ -1,7 +1,7 @@
 /*
  * http.c: IRC service detection plugin
  *
- * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2014, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.

plugins/lua-loader.c

@@ -1,7 +1,7 @@
 /*
  * lua-loader.c: Lua plugin loader plugin
  *
- * Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2015, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.

plugins/mpd.lua

@@ -1,7 +1,7 @@
 --
 -- mpd.lua: Music Player Daemon service detection plugin
 --
--- Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
+-- Copyright (c) 2015, Přemysl Eric Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted.

plugins/nut.lua

@@ -1,7 +1,7 @@
 --
 -- nut.lua: Network UPS Tools service detection plugin
 --
--- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
+-- Copyright (c) 2017, Přemysl Eric Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted.

plugins/socks.lua

@@ -1,7 +1,7 @@
 --
 -- socks.lua: SOCKS service detection plugin
 --
--- Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
+-- Copyright (c) 2015, Přemysl Eric Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted.

plugins/ssh.c

@@ -1,7 +1,7 @@
 /*
  * ssh.c: SSH service detection plugin
  *
- * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2014, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.

ponymap.c

@@ -1,7 +1,7 @@
 /*
  * ponymap.c: the experimental network scanner
  *
- * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2014, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -470,8 +470,7 @@ indicator_set_status (struct indicator *self, char *status)
 	bool refresh = self->shown;
 	indicator_hide (self);
 
-	free (self->status);
-	self->status = status;
+	cstr_set (&self->status, status);
 
 	if (refresh)
 		indicator_show (self);
@@ -841,6 +840,7 @@ load_one_plugin (struct app_context *ctx, const char *name, const char *path)
 	void *table = dlopen (path, RTLD_LAZY | RTLD_LOCAL);
 	if (!table)
 	{
+		print_debug ("%s", path);
 		print_error ("could not load `%s': %s", name, dlerror ());
 		return false;
 	}
@@ -875,6 +875,7 @@ load_plugins (struct app_context *ctx)
 	DIR *dir = opendir (plugin_dir);
 	if (!dir)
 	{
+		print_debug ("%s", plugin_dir);
 		print_fatal ("%s: %s",
 			"cannot open plugin directory", strerror (errno));
 		return false;
@@ -2015,6 +2016,10 @@ main (int argc, char *argv[])
 	else
 	{
 		limit.rlim_cur = limit.rlim_max;
+
+		// But too much may be seriously detrimental to function
+		limit.rlim_cur = MIN (limit.rlim_cur, 1 << 16);
+
 		if (setrlimit (RLIMIT_NOFILE, &limit))
 			print_warning ("%s: %s", "setrlimit failed", strerror (errno));
 	}