Commit: a7afa029881c60fc30abaeafd96faf8be48711aa - tme (git)

Commit MetaInfo

• Revision: a7afa029881c60fc30abaeafd96faf8be48711aa (tree)
• Time: 2022-12-10 14:40:08
• Author: phabrics <phabrics@phab...>
• Commiter: phabrics

Log Message

Miscellaneous changes for better handling system dependencies.

Change Summary

• modified: configure.ac
• modified: libopenvpn/openvpn.c
• modified: libtme/Makefile.am
• modified: libtme/module.c
• modified: tme/common.h

Incremental Difference

--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ darwin*)
 esac
 
 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
+AC_CHECK_PROG([CYGPATH_M], [cygpath], [cygpath -m], [echo])
 
 AC_SUBST(DEV_TAP_FILENAME)
 AC_SUBST(SETCAP)
@@ -792,7 +793,7 @@ dnl Start the list of display host support.
 TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff"
 
 dnl Checks for GLIB.
-AM_PATH_GLIB_2_0([], [have_glib=$enable_glib], [])
+AM_PATH_GLIB_2_0([], [AC_DEFINE([HAVE_GLIB], [], [Defined if GLIB 2.0 is found.])], [])
 
 dnl Checks for display type support
 AM_PATH_GTK_3_0([], [have_gtk=$enable_gtk], [])

--- a/libopenvpn/openvpn.c
+++ b/libopenvpn/openvpn.c
@@ -309,6 +309,7 @@ openvpn_main (int argc, char *argv[])
   return 0;			            /* NOTREACHED */
 }
 
+#if 0
 #ifdef WIN32
 int
 wmain (int argc, wchar_t *wargv[]) {
@@ -342,3 +343,4 @@ main (int argc, char *argv[]) {
 	return openvpn_main(argc, argv);
 }
 #endif
+#endif

--- a/libtme/Makefile.am
+++ b/libtme/Makefile.am
@@ -74,3 +74,9 @@ shlibvar.h: $(top_builddir)/config.h Makefile
 	grep LT_MODULE_PATH_VAR $(top_builddir)/config.h > $@
 	grep LT_DLSEARCH_PATH $(top_builddir)/config.h >> $@
 	echo "#define TME_PACKAGE_PATH \"$(libdir)\"" >> $@
+	echo -n "#define TME_PREFIX_PATH \"" >> $@
+	echo / | tr -d "\n\r\f" >> $@
+	echo \" >> $@
+	echo -n "#define TME_WINDOWS_PATH \"" >> $@
+	$(CYGPATH_W) / | tr -d "\n\r\f" >> $@
+	echo \" >> $@

--- a/libtme/module.c
+++ b/libtme/module.c
@@ -97,7 +97,7 @@ _tme_modules_find(const char *top_name,
 		  unsigned int top_name_length,
 		  char **_modules_dir)
 {
-  unsigned int modules_dir_length;
+  unsigned int modules_dir_length, prefix_length = strlen(TME_PREFIX_PATH);
   int pass;
   const char *search_path;
   const char *p1, *p2, *p3;
@@ -147,9 +147,10 @@ _tme_modules_find(const char *top_name,
 
 	/* form the modules index pathname to try, remembering what
 	   part of it is the modules directory pathname: */
-	modules_dir_length = 
+	modules_dir_length =
+	  prefix_length
 	  /* the search path part, less any trailing slashes: */
-	  (p2 - p1) + 1
+	  + (p2 - p1)
 	  /* a slash: */
 	  + 1
 	  + top_name_length
@@ -162,23 +163,21 @@ _tme_modules_find(const char *top_name,
 		  + strlen("-plugins.txt")
 		  /* a NUL: */
 		  + 1);
-	memcpy(modules_index_pathname, p1, (p2 - p1) + 1);
-	modules_index_pathname[(p2 - p1) + 1] = '/';
-	memcpy(modules_index_pathname
-	       + (p2 - p1) + 1
-	       + 1,
+	strcpy(modules_index_pathname, TME_PREFIX_PATH);
+	strncpy(modules_index_pathname + prefix_length, p1 + 1, (p2 - p1));
+	prefix_length += (p2 - p1);
+	modules_index_pathname[prefix_length++] = '/';
+	strncpy(modules_index_pathname + prefix_length,
 	       top_name,
 	       top_name_length);
-	modules_index_pathname[((p2 - p1) + 1
-				+ 1
-				+ top_name_length)] = '/';
-	memcpy(modules_index_pathname
-	       + modules_dir_length,
+	prefix_length += top_name_length;
+	modules_index_pathname[prefix_length++] = '/';
+	strncpy(modules_index_pathname + prefix_length,
 	       top_name,
 	       top_name_length);
+	prefix_length += top_name_length;
 	strcpy(modules_index_pathname
-	       + modules_dir_length
-	       + top_name_length,
+	       + prefix_length,
 	       "-plugins.txt");
 	
 	/* try to open the modules index: */
@@ -193,6 +192,7 @@ _tme_modules_find(const char *top_name,
 
 	/* keep trying: */
 	tme_free(modules_index_pathname);
+	prefix_length = strlen(TME_PREFIX_PATH);	
       }
 
       /* stop if this was the last path: */

--- a/tme/common.h
+++ b/tme/common.h
@@ -431,11 +431,10 @@ tme_bswap_u128(tme_uint128_t x)
 typedef tme_uint64_t tme_time_t;
 
 static _tme_inline tme_time_t tme_thread_get_time _TME_P((void)) {
-#if defined(WIN32) || defined(USE_GLIB_TIME) && defined(_TME_HAVE_GLIB)
-#ifdef USE_GLIB_TIME
+#if defined(USE_GLIB_TIME) && defined(_TME_HAVE_GLIB)
 #define TME_FRAC_PER_SEC G_USEC_PER_SEC
   return g_get_real_time();
-#else
+#elif defined(WIN32)
   #define TME_FRAC_PER_SEC 10000000
   FILETIME filetime;
   ULARGE_INTEGER _time;
@@ -447,7 +446,6 @@ static _tme_inline tme_time_t tme_thread_get_time _TME_P((void)) {
 #else
   return (_time.u.LowPart) | (_time.u.HighPart << 32);
 #endif
-#endif
 #elif defined(USE_GETTIMEOFDAY) || !defined(_TME_HAVE_CLOCK_GETTIME)
 #define TME_FRAC_PER_SEC 1000000
   struct timeval tv;