Fossil SCM

Improved libfuse version information.

drh 2017-01-17 02:22 trunk merge

Commit 28c7a35f2edf954ffd5c606b92e0b91c8a65bc3b

Parent 3192b13d200d3b3…

2 files changed +13 -5 +4 -3

M src/fusefs.c

+13 -5

		--- src/fusefs.c
		+++ src/fusefs.c
		@@ -339,16 +339,24 @@
339	339	fusefs_clear_path();
340	340	}
341	341	#endif /* FOSSIL_HAVE_FUSEFS */
342	342
343	343	/*
344		-** Return the version number of the fuse library.
	344	+** Return version numbers for the FUSE header that was used at compile-time
	345	+** and/or the FUSE library that was loaded at runtime.
345	346	*/
346	347	const char *fusefs_lib_version(void){
	348	+#if defined(FOSSIL_HAVE_FUSEFS) && FUSE_MAJOR_VERSION>=3
	349	+ return fuse_pkgversion();
	350	+#else
	351	+ return "unknown";
	352	+#endif
	353	+}
	354	+
	355	+const char *fusefs_inc_version(void){
347	356	#ifdef FOSSIL_HAVE_FUSEFS
348		-# define STRINGIFY_(X) #X
349		-# define STRINGIFY(X) STRINGIFY_(X)
350		- return STRINGIFY(FUSE_MAJOR_VERSION) "." STRINGIFY(FUSE_MINOR_VERSION);
	357	+ return COMPILER_STRINGIFY(FUSE_MAJOR_VERSION) "."
	358	+ COMPILER_STRINGIFY(FUSE_MINOR_VERSION);
351	359	#else
352		- return 0;
	360	+ return "unknown";
353	361	#endif
354	362	}
355	363

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -339,16 +339,24 @@
339	fusefs_clear_path();
340	}
341	#endif /* FOSSIL_HAVE_FUSEFS */
342
343	/*
344	** Return the version number of the fuse library.

345	*/
346	const char *fusefs_lib_version(void){








347	#ifdef FOSSIL_HAVE_FUSEFS
348	# define STRINGIFY_(X) #X
349	# define STRINGIFY(X) STRINGIFY_(X)
350	return STRINGIFY(FUSE_MAJOR_VERSION) "." STRINGIFY(FUSE_MINOR_VERSION);
351	#else
352	return 0;
353	#endif
354	}
355

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -339,16 +339,24 @@
339	fusefs_clear_path();
340	}
341	#endif /* FOSSIL_HAVE_FUSEFS */
342
343	/*
344	** Return version numbers for the FUSE header that was used at compile-time
345	** and/or the FUSE library that was loaded at runtime.
346	*/
347	const char *fusefs_lib_version(void){
348	#if defined(FOSSIL_HAVE_FUSEFS) && FUSE_MAJOR_VERSION>=3
349	return fuse_pkgversion();
350	#else
351	return "unknown";
352	#endif
353	}
354
355	const char *fusefs_inc_version(void){
356	#ifdef FOSSIL_HAVE_FUSEFS
357	return COMPILER_STRINGIFY(FUSE_MAJOR_VERSION) "."
358	COMPILER_STRINGIFY(FUSE_MINOR_VERSION);

359	#else
360	return "unknown";
361	#endif
362	}
363

M src/main.c

+4 -3

		--- src/main.c
		+++ src/main.c
		@@ -932,11 +932,12 @@
932	932	#endif
933	933	#if defined(FOSSIL_ENABLE_SSL)
934	934	blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
935	935	#endif
936	936	#if defined(FOSSIL_HAVE_FUSEFS)
937		- blob_appendf(pOut, "libfuse version %s\n", fusefs_lib_version());
	937	+ blob_appendf(pOut, "libfuse %s, loaded %s\n", fusefs_inc_version(),
	938	+ fusefs_lib_version());
938	939	#endif
939	940	#if defined(FOSSIL_DEBUG)
940	941	blob_append(pOut, "FOSSIL_DEBUG\n", -1);
941	942	#endif
942	943	#if defined(FOSSIL_OMIT_DELTA_CKSUM_TEST)
		@@ -978,13 +979,13 @@
978	979	blob_append(pOut, "MBCS_COMMAND_LINE\n", -1);
979	980	#else
980	981	blob_append(pOut, "UNICODE_COMMAND_LINE\n", -1);
981	982	#endif
982	983	#if defined(FOSSIL_DYNAMIC_BUILD)
983		- blob_append(pOut, "DYNAMIC_BUILD\n", -1);
	984	+ blob_append(pOut, "FOSSIL_DYNAMIC_BUILD\n", -1);
984	985	#else
985		- blob_append(pOut, "STATIC_BUILD\n", -1);
	986	+ blob_append(pOut, "FOSSIL_STATIC_BUILD\n", -1);
986	987	#endif
987	988	#if defined(USE_SEE)
988	989	blob_append(pOut, "USE_SEE\n", -1);
989	990	#endif
990	991	#if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
991	992

	--- src/main.c
	+++ src/main.c
	@@ -932,11 +932,12 @@
932	#endif
933	#if defined(FOSSIL_ENABLE_SSL)
934	blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
935	#endif
936	#if defined(FOSSIL_HAVE_FUSEFS)
937	blob_appendf(pOut, "libfuse version %s\n", fusefs_lib_version());

938	#endif
939	#if defined(FOSSIL_DEBUG)
940	blob_append(pOut, "FOSSIL_DEBUG\n", -1);
941	#endif
942	#if defined(FOSSIL_OMIT_DELTA_CKSUM_TEST)
	@@ -978,13 +979,13 @@
978	blob_append(pOut, "MBCS_COMMAND_LINE\n", -1);
979	#else
980	blob_append(pOut, "UNICODE_COMMAND_LINE\n", -1);
981	#endif
982	#if defined(FOSSIL_DYNAMIC_BUILD)
983	blob_append(pOut, "DYNAMIC_BUILD\n", -1);
984	#else
985	blob_append(pOut, "STATIC_BUILD\n", -1);
986	#endif
987	#if defined(USE_SEE)
988	blob_append(pOut, "USE_SEE\n", -1);
989	#endif
990	#if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
991

	--- src/main.c
	+++ src/main.c
	@@ -932,11 +932,12 @@
932	#endif
933	#if defined(FOSSIL_ENABLE_SSL)
934	blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
935	#endif
936	#if defined(FOSSIL_HAVE_FUSEFS)
937	blob_appendf(pOut, "libfuse %s, loaded %s\n", fusefs_inc_version(),
938	fusefs_lib_version());
939	#endif
940	#if defined(FOSSIL_DEBUG)
941	blob_append(pOut, "FOSSIL_DEBUG\n", -1);
942	#endif
943	#if defined(FOSSIL_OMIT_DELTA_CKSUM_TEST)
	@@ -978,13 +979,13 @@
979	blob_append(pOut, "MBCS_COMMAND_LINE\n", -1);
980	#else
981	blob_append(pOut, "UNICODE_COMMAND_LINE\n", -1);
982	#endif
983	#if defined(FOSSIL_DYNAMIC_BUILD)
984	blob_append(pOut, "FOSSIL_DYNAMIC_BUILD\n", -1);
985	#else
986	blob_append(pOut, "FOSSIL_STATIC_BUILD\n", -1);
987	#endif
988	#if defined(USE_SEE)
989	blob_append(pOut, "USE_SEE\n", -1);
990	#endif
991	#if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
992