sync upstream libssfx

.gitignore

@@ -65,3 +65,4 @@ docs/.vitepress/cache
 docs/.vitepress/.temp
 docs/.vitepress/dist
 node_modules
+sfx

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "src/ruri"]
 	path = src/ruri
-	url = https://github.com/RuriOSS/ruri
+	url = https://github.com/Moe-hacker/ruri
 [submodule "src/catsh"]
 	path = src/catsh
-	url = https://github.com/RuriOSS/catsh
+	url = https://github.com/rurioss/catsh
+[submodule "src/ssfx"]
+	path = src/ssfx
+	url = https://github.com/rurioss/ssfx

Makefile

@@ -48,7 +48,7 @@ CHECKER = clang-tidy
 CHECKER_FLAGS = --checks=*,-clang-analyzer-security.insecureAPI.strcpy,-altera-unroll-loops,-cert-err33-c,-concurrency-mt-unsafe,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-readability-function-cognitive-complexity,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-bugprone-easily-swappable-parameters,-cert-err34-c,-misc-include-cleaner,-readability-identifier-length,-bugprone-signal-handler,-cert-msc54-cpp,-cert-sig30-c,-altera-id-dependent-backward-branch,-bugprone-suspicious-realloc-usage,-hicpp-signed-bitwise,-clang-analyzer-security.insecureAPI.UncheckedReturn
 -include config.mk
 # Target.
-objects = easteregg/daijin.o catsh/src/catsh.o net.o checkdep.o dockerhub.o exec.o info.o lxcmirror.o shared.o signal.o archive.o subcommand.o main.o ruri/src/easteregg/action.o ruri/src/easteregg/nekofeng.o ruri/src/easteregg/layer.o ruri/src/easteregg/typewriter.o ruri/src/caplist.o ruri/src/chroot.o ruri/src/cprintf.o ruri/src/info.o ruri/src/rurienv.o ruri/src/rurifetch.o ruri/src/seccomp.o ruri/src/signal.o ruri/src/umount.o ruri/src/unshare.o ruri/src/rootless.o ruri/src/mount.o ruri/src/k2v.o ruri/src/elf-magic.o ruri/src/config.o ruri/src/cgroup.o ruri/src/passwd.o ruri/src/ps.o ruri/src/ruri.o
+objects = ssfx/ssfx.o easteregg/daijin.o catsh/src/catsh.o net.o checkdep.o dockerhub.o exec.o info.o lxcmirror.o shared.o signal.o archive.o subcommand.o main.o ruri/src/easteregg/action.o ruri/src/easteregg/nekofeng.o ruri/src/easteregg/layer.o ruri/src/easteregg/typewriter.o ruri/src/caplist.o ruri/src/chroot.o ruri/src/cprintf.o ruri/src/info.o ruri/src/rurienv.o ruri/src/rurifetch.o ruri/src/seccomp.o ruri/src/signal.o ruri/src/umount.o ruri/src/unshare.o ruri/src/rootless.o ruri/src/mount.o ruri/src/k2v.o ruri/src/elf-magic.o ruri/src/config.o ruri/src/cgroup.o ruri/src/passwd.o ruri/src/ps.o ruri/src/ruri.o
 O = out
 BIN_TARGET = rurima
 .NOTPARALLEL:
@@ -75,6 +75,7 @@ build_dir:
 	@mkdir -p $(O)/ruri/src
 	@mkdir -p $(O)/ruri/src/easteregg
 	@mkdir -p $(O)/catsh/src
+	@mkdir -p $(O)/ssfx
 $(objects) :%.o:src/%.c $(build_dir)
 	@cd $(O)
 	@$(CC) $(CFLAGS) -c ../$< -o $@
@@ -103,4 +104,8 @@ help :
 	@echo "  make clean          clean"
 	@echo "Only for developers:"
 	@echo "  make check          run clang-tidy"
-	@echo "  make format         format code"
+	@echo "  make format         format code"
+up :
+	git submodule update --init --recursive
+	git submodule foreach git pull origin main
+	git submodule foreach git checkout main

README.md

@@ -7,6 +7,14 @@
 [![Build release](https://github.com/RuriOSS/rurima/actions/workflows/build.yml/badge.svg)](https://github.com/RuriOSS/rurima/actions/workflows/build.yml)
 
 ![](https://img.shields.io/badge/Powered%20By-GNU%20C-00d000?style=flat&labelColor=gray&logo=C)
+
+# Send us your feedback!
+Your use case, your suggestions, and some ideas, anyway, we would love to hear from you!     
+[Discussions](https://github.com/RuriOSS/rurima/discussions/16)      
+# Also, keep up to date:
+Some updates and news will be posted on:      
+[Twitter(X)](https://x.com/RuriOSS)      
+And, dont forget to `rurima ota` to get the latest build!      
 # What's new:
 - Some other OCI compatible registry support like ghcr.io could work with `-f/--fallback` option enabled now.      
 # The first release:

build.c

@@ -665,6 +665,12 @@ void build()
 	for (int i = 0; easteregg_rma_files && easteregg_rma_files[i] != NULL; i++) {
 		add_args(&files, easteregg_rma_files[i]);
 	}
+	char ssfx_src[PATH_MAX];
+	sprintf(ssfx_src, "%s/ssfx", SRC_DIR);
+	char **ssfx_files = find_file(ssfx_src, ".c", (char *[]){ "main.c", NULL });
+	for (int i = 0; ssfx_files && ssfx_files[i] != NULL; i++) {
+		add_args(&files, ssfx_files[i]);
+	}
 	compile_files_parallel(files, JOBS);
 	free_args(easteregg_files);
 	free_args(easteregg_rma_files);

meson.build

@@ -19,20 +19,35 @@ libruri_dependencies = []
 ## Build flags
 common_cc_flags = [
     '-Wno-pedantic',
-    '-Wno-newline-eof',
     '-Wno-sign-compare',
     '-Wno-unused-result',
     '-Wno-unused-variable',
     '-Wno-unused-function',
     '-Wno-unused-parameter',
     '-Wno-unused-but-set-variable',
-    '-Wno-missing-field-initializers',
+    '-Wno-missing-field-initializers'
+]
+
+gcc_cc_flags = [
+    '-Wno-restrict',
+    '-Wno-format-overflow',
+    '-Wno-discarded-qualifiers'
+]
+
+clang_cc_flags = [
+    '-Wno-newline-eof',
     '-Wno-gnu-zero-variadic-macro-arguments',
     '-Wno-incompatible-pointer-types-discards-qualifiers'
 ]
 
 add_project_arguments(cc.get_supported_arguments(common_cc_flags), language: 'c')
 
+if cc.get_id() == 'clang'
+    add_project_arguments(cc.get_supported_arguments(clang_cc_flags), language: 'c')
+else
+    add_project_arguments(cc.get_supported_arguments(gcc_cc_flags), language: 'c')
+endif
+
 libruri_version = '3.9.3'
 
 prefixdir = get_option('prefix')
@@ -45,26 +60,28 @@ want_cap = get_option('cap')
 want_seccomp = get_option('seccomp')
 
 ## Cap.
+libcap = dependency('libcap', required: false)
 if want_cap
-    libcap = dependency('libcap', required: false)
     pkgconfig_libs += libcap
     libruri_dependencies += libcap
     if libcap.found() == false
         add_project_arguments(cc.get_supported_arguments('-DDISABLE_LIBCAP=on'), language: 'c')
     endif
 else
+    libcap.found() == false
     add_project_arguments(cc.get_supported_arguments('-DDISABLE_LIBCAP=on'), language: 'c')
 endif
 
 ## Seccomp.
+libseccomp = dependency('libseccomp', required: false)
 if want_seccomp
-    libseccomp = dependency('libseccomp', required: false)
     pkgconfig_libs += libseccomp
     libruri_dependencies += libseccomp
     if libseccomp.found() == false
         add_project_arguments(cc.get_supported_arguments('-DDISABLE_LIBSECCOMP=on'), language: 'c')
     endif
 else
+    libseccomp.found() == false
     add_project_arguments(cc.get_supported_arguments('-DDISABLE_LIBSECCOMP=on'), language: 'c')
 endif
 
@@ -101,13 +118,13 @@ executable('rurima',
 install_data('README.md', install_dir: get_option('datadir') / 'doc' / meson.project_name())
 
 summary({
-  'Build type': get_option('buildtype'),
-  'Install prefix': get_option('prefix'),
-  'Source directory': meson.project_source_root(),
-  'Build directory': meson.project_build_root(),
+  'Build type':           get_option('buildtype'),
+  'Install prefix':       get_option('prefix'),
+  'Source directory':     meson.project_source_root(),
+  'Build directory':      meson.project_build_root(),
 }, section: 'Directories')
 
 summary({
-  'libcap': libcap.found(),
-  'libseccomp': libseccomp.found(),
+  'libcap':               libcap.found(),
+  'libseccomp':           libseccomp.found(),
 }, section: 'Dependencies')

src/archive.c

@@ -168,6 +168,14 @@ static void show_progress(double per)
 	if (rurima_global_config.no_progress) {
 		return;
 	}
+	if (per < 0.0 || per > 1.0) {
+		return;
+	}
+	static double last_per = 0.0;
+	if (per - last_per < 0.005 && per < 1.0) {
+		return;
+	}
+	last_per = per;
 	struct winsize size;
 	ioctl(STDOUT_FILENO, TIOCGWINSZ, &size);
 	unsigned short width = size.ws_col - 10;
@@ -188,6 +196,7 @@ static void show_progress_with_line(float per, int line)
 {
 	/*
 	 * Show progress bar.
+	 * Callback function for cth_exec_with_file_input().
 	 */
 	if (rurima_global_config.no_progress) {
 		return;

src/include/rurima.h

@@ -69,6 +69,7 @@
 #include "../ruri/src/include/ruri.h"
 #include "../catsh/src/include/catsh.h"
 #include "../easteregg/daijin.h"
+#include "../ssfx/include/ssfx.h"
 struct RURIMA_CONFIG {
 	char *_Nonnull docker_mirror;
 	char *_Nonnull lxc_mirror;
@@ -201,4 +202,5 @@ void rurima_ota(void);
 void rurima_run(int argc, char **_Nonnull argv);
 void rurima_netns_wrapper(int argc, char **argv);
 void rurima_load_rootfs(int argc, char **argv);
-void rurima_docker_print_config_from_json(const char *_Nonnull config, const char *_Nonnull savedir);
+void rurima_docker_print_config_from_json(const char *_Nonnull config, const char *_Nonnull savedir);
+void rurima_sfx(int argc, char **argv);

src/info.c

@@ -52,8 +52,11 @@ void rurima_show_version_info(void)
 #if defined(RURI_COMMIT_ID)
 	cprintf("{base}%s%s%s", "built-in ruri commit id .........:  ", RURI_COMMIT_ID, "\n");
 #endif
-#if defined(LIBCAP_MAJOR) && defined(LIBCAP_MINOR)
-	cprintf("{base}%s%d%s%d%s", "libcap ..........................:  ", LIBCAP_MAJOR, ".", LIBCAP_MINOR, "\n");
+#if defined(CTH_VERSION_STRING)
+	cprintf("{base}%s%s%s", "built-in catsh version ..........:  ", CTH_VERSION_STRING, "\n");
+#endif
+#if defined(SSFX_VERSION_STRING)
+	cprintf("{base}%s%s%s", "built-in ssfx version ...........:  ", SSFX_VERSION_STRING, "\n");
 #endif
 	cprintf("{base}%s%s\n", "Compiler version ................:  ", __VERSION__);
 	cprintf("{base}%s%s\n", "Build date ......................:  ", __TIMESTAMP__);

src/main.c

@@ -279,6 +279,10 @@ int main(int argc, char **argv)
 			rurima_QwQ();
 			return 0;
 		}
+		if (strcmp(argv[i], "sfx") == 0) {
+			rurima_sfx(argc - i - 1, &argv[i + 1]);
+			return 0;
+		}
 		show_help();
 		rurima_error("{red}Invalid subcommand `%s`!\n", argv[i]);
 		return 1;

src/meson.build

@@ -54,6 +54,33 @@ libcprintf_dep = declare_dependency(
 
 install_headers('ruri/src/include/cprintf.h', subdir: 'cprintf')
 
+## libssfx
+libssfx_include_dir = include_directories('ssfx/include')
+
+libssfx_sources = [
+  'ssfx/ssfx.c',
+]
+
+libssfx = library('ssfx',
+  libssfx_sources,
+  include_directories: libssfx_include_dir,
+  install: true,
+  version: '0.9.0',
+  soversion: '0',
+)
+
+pkgconfig.generate(libssfx,
+  name: 'libssfx',
+  description: 'ssfx library',
+  version: '0.9.0',
+)
+
+libssfx_dep = declare_dependency(
+  link_with: libssfx,
+  include_directories: libssfx_include_dir,
+)
+
+install_headers('ssfx/include/ssfx.h', subdir: 'ssfx')
 
 ## libruri
 libruri_include_dir = include_directories(
@@ -112,6 +139,7 @@ libruri_dep = declare_dependency(
   dependencies: [
     libcprintf_dep,
     libcatsh_dep,
+    libssfx_dep,
     libruri_dependencies,
   ],
 )

src/subcommand.c

@@ -869,4 +869,38 @@ void rurima_load_rootfs(int argc, char **argv)
 	rurima_check_dir_deny_list(tmp_dir);
 	cth_exec_command((char *[]){ "rm", "-rf", tmp_dir, NULL });
 	exit(0);
+}
+void rurima_sfx(int argc, char **_Nonnull argv)
+{
+	//
+	if (self_is_valid_ssfx_master()) {
+		rurima_log("{base}This is a valid rurima sfx master executable.\n");
+	} else if (self_is_valid_ssfx_pack()) {
+		rurima_log("{base}This is a valid rurima sfx packed executable.\n");
+	} else if (self_is_valid_ssfx_other()) {
+		rurima_log("{base}This is a valid rurima sfx other executable.\n");
+	} else {
+		rurima_log("{base}This is not a valid rurima sfx executable.\n");
+	}
+	cprintf("{red}Warning: rurima sfx feature is in development, do not use it anyway!\n");
+	//
+	if (argc == 0) {
+		rurima_error("{red}No subcommand specified!\n");
+	}
+	if (strcmp(argv[0], "pack-self") == 0) {
+		if (argc < 3) {
+			rurima_error("{red}Usage: rurima sfx pack-self <output_file> <input_dir>\n");
+		}
+		char *tar_exe_path = argv[1];
+		char *output_file = argv[2];
+		rurima_check_dir_deny_list(output_file);
+		pack_ssfx_master(tar_exe_path, output_file);
+		cprintf("{yellow}Warning: this feature is only for developers!\n");
+		cprintf("{yellow}Warning: make sure that tar and rurima executable are compatible with target system!\n");
+		cprintf("{yellow}Warning: make sure that tar and rurima executable are statically linked!\n");
+		exit(0);
+	}
+	if (!self_is_valid_ssfx_master()) {
+		rurima_error("{red}This executable is not a valid rurima sfx master!\n");
+	}
 }