Replace print_system_info by get_system_info

include/civetweb.h

@@ -1097,14 +1097,19 @@ CIVETWEB_API int mg_get_response(struct mg_connection *conn,
 CIVETWEB_API unsigned mg_check_feature(unsigned feature);
 
 
-/* Check which features where set when civetweb has been compiled.
-   (Experimental: The API of this function is likely to change.)
+/* Get information on the system. Useful, if in support requests.
    Parameters:
-     To be defined - 0, 0 prints to stdout.
+     buffer: Store system information as string here.
+     buflen: Length of buffer (including a byte required for a terminating 0).
    Return:
-     To be defined.
+     Available size of system information, exluding a terminating 0.
+     The information is complete, if the return value is smaller than buflen.
+   Note:
+     It is possible to determine the required buflen, by first calling this
+     function with  buffer = NULL and buflen = NULL. The required buflen is
+     one byte more than the returned value.
 */
-CIVETWEB_API int mg_print_system_info__experimental(int prm1, char *prm2);
+CIVETWEB_API int mg_get_system_info(char *buffer, int buflen);
 
 #ifdef __cplusplus
 }

src/civetweb.c

@@ -14465,13 +14465,15 @@ mg_check_feature(unsigned feature)
 }
 
 
-/* Print system information.
- * TODO: define parameters. */
-int
-mg_print_system_info__experimental(int prm1, char *prm2)
+/* Get system information. It can be printed or stored by the caller.
+ * Return the size of available information. */
+static int
+mg_get_system_info_impl(char *buffer, int buflen)
 {
-	char buf[256];
+	char block[256];
+	int system_info_length = 0;
 	const char *version = mg_version();
+
 #if defined(_WIN32)
 #if !defined(__SYMBIAN32__)
 	DWORD dwVersion = 0;
@@ -14496,31 +14498,34 @@ mg_print_system_info__experimental(int prm1, char *prm2)
 
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "Windows %u.%u",
+	            block,
+	            sizeof(block),
+	            "Windows %u.%u\n",
 	            (unsigned)dwMajorVersion,
 	            (unsigned)dwMinorVersion);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "CPU: type %u, cores %u, mask %x",
+	            block,
+	            sizeof(block),
+	            "CPU: type %u, cores %u, mask %x\n",
 	            (unsigned)si.wProcessorArchitecture,
 	            (unsigned)si.dwNumberOfProcessors,
 	            (unsigned)si.dwActiveProcessorMask);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 
 #else
-	mg_snprintf(NULL, NULL, buf, sizeof(buf), "%s - Symbian");
-	if (prm1 == 0) {
-		puts(buf);
+	mg_snprintf(NULL, NULL, block, sizeof(block), "%s - Symbian\n");
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #endif
 #else
@@ -14530,23 +14535,24 @@ mg_print_system_info__experimental(int prm1, char *prm2)
 
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "%s %s (%s) - %s",
+	            block,
+	            sizeof(block),
+	            "%s %s (%s) - %s\n",
 	            name.sysname,
 	            name.version,
 	            name.release,
 	            name.machine);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #endif
 
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "Features: %X%s%s%s%s%s%s",
+	            block,
+	            sizeof(block),
+	            "Features: %X%s%s%s%s%s%s\n",
 	            mg_check_feature(0xFFFFFFFFu),
 	            mg_check_feature(1) ? " Files" : "",
 	            mg_check_feature(2) ? " HTTPS" : "",
@@ -14554,142 +14560,160 @@ mg_print_system_info__experimental(int prm1, char *prm2)
 	            mg_check_feature(8) ? " IPv6" : "",
 	            mg_check_feature(16) ? " WebSockets" : "",
 	            mg_check_feature(32) ? " Lua" : "");
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 
 #ifdef USE_LUA
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "Lua Version: %u (%s)",
+	            block,
+	            sizeof(block),
+	            "Lua Version: %u (%s)\n",
 	            (unsigned)LUA_VERSION_NUM,
 	            LUA_RELEASE);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #endif
 
-	mg_snprintf(NULL, NULL, buf, sizeof(buf), "Version: %s", version);
-	if (prm1 == 0) {
-		puts(buf);
-	}
-
-	mg_snprintf(NULL, NULL, buf, sizeof(buf), "Build: %s", __DATE__);
-	if (prm1 == 0) {
-		puts(buf);
+	mg_snprintf(NULL,
+	            NULL,
+	            block,
+	            sizeof(block),
+	            "Version: %s, Build: %s\n",
+	            version,
+	            __DATE__);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 
 /* http://sourceforge.net/p/predef/wiki/Compilers/ */
 #if defined(_MSC_VER)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "MSC: %u (%u)",
+	            block,
+	            sizeof(block),
+	            "MSC: %u (%u)\n",
 	            (unsigned)_MSC_VER,
 	            (unsigned)_MSC_FULL_VER);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__MINGW64__)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "MinGW64: %u.%u",
+	            block,
+	            sizeof(block),
+	            "MinGW64: %u.%u\n",
 	            (unsigned)__MINGW64_VERSION_MAJOR,
 	            (unsigned)__MINGW64_VERSION_MINOR);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "MinGW32: %u.%u",
+	            block,
+	            sizeof(block),
+	            "MinGW32: %u.%u\n",
 	            (unsigned)__MINGW32_MAJOR_VERSION,
 	            (unsigned)__MINGW32_MINOR_VERSION);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__MINGW32__)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "MinGW32: %u.%u",
+	            block,
+	            sizeof(block),
+	            "MinGW32: %u.%u\n",
 	            (unsigned)__MINGW32_MAJOR_VERSION,
 	            (unsigned)__MINGW32_MINOR_VERSION);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__clang__)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "clang: %u.%u.%u (%s)",
+	            block,
+	            sizeof(block),
+	            "clang: %u.%u.%u (%s)\n",
 	            __clang_major__,
 	            __clang_minor__,
 	            __clang_patchlevel__,
 	            __clang_version__);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__GNUC__)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "gcc: %u.%u.%u",
+	            block,
+	            sizeof(block),
+	            "gcc: %u.%u.%u\n",
 	            (unsigned)__GNUC__,
 	            (unsigned)__GNUC_MINOR__,
 	            (unsigned)__GNUC_PATCHLEVEL__);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__INTEL_COMPILER)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "Intel C/C++: %u",
+	            block,
+	            sizeof(block),
+	            "Intel C/C++: %u\n",
 	            (unsigned)__INTEL_COMPILER);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__BORLANDC__)
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
-	            "Borland C: 0x%x",
+	            block,
+	            sizeof(block),
+	            "Borland C: 0x%x\n",
 	            (unsigned)__BORLANDC__);
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #elif defined(__SUNPRO_C)
-	mg_snprintf(
-	    NULL, NULL, buf, sizeof(buf), "Solaris: 0x%x", (unsigned)__SUNPRO_C);
-	if (prm1 == 0) {
-		puts(buf);
+	mg_snprintf(NULL,
+	            NULL,
+	            block,
+	            sizeof(block),
+	            "Solaris: 0x%x\n",
+	            (unsigned)__SUNPRO_C);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #else
-	mg_snprintf(NULL, NULL, buf, sizeof(buf), "Other");
-	if (prm1 == 0) {
-		puts(buf);
+	mg_snprintf(NULL, NULL, block, sizeof(block), "Other\n");
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 #endif
 	/* Determine 32/64 bit data mode.
 	 * see https://en.wikipedia.org/wiki/64-bit_computing */
 	mg_snprintf(NULL,
 	            NULL,
-	            buf,
-	            sizeof(buf),
+	            block,
+	            sizeof(block),
 	            "Data model: int:%u/%u/%u/%u, float:%u/%u/%u, char:%u/%u, "
-	            "ptr:%u, size:%u, time:%u",
+	            "ptr:%u, size:%u, time:%u\n",
 	            (unsigned)sizeof(short),
 	            (unsigned)sizeof(int),
 	            (unsigned)sizeof(long),
@@ -14702,14 +14726,27 @@ mg_print_system_info__experimental(int prm1, char *prm2)
 	            (unsigned)sizeof(void *),
 	            (unsigned)sizeof(size_t),
 	            (unsigned)sizeof(time_t));
-	if (prm1 == 0) {
-		puts(buf);
+	system_info_length += (int)strlen(block);
+	if (system_info_length < buflen) {
+		strcat(buffer, block);
 	}
 
-	/* WARNING: these parameters are not being used */
-	(void)prm2;
+	return system_info_length;
+}
+
 
-	return 0;
+/* Get system information. It can be printed or stored by the caller.
+ * Return the size of available information. */
+int
+mg_get_system_info(char *buffer, int buflen)
+{
+	if ((buffer == NULL) || (buflen < 1)) {
+		return mg_get_system_info_impl(NULL, 0);
+	} else {
+		/* Reset buffer, so we can always use strcat. */
+		buffer[0] = 0;
+		return mg_get_system_info_impl(buffer, buffer);
+	}
 }
 
 

src/main.c

@@ -149,6 +149,7 @@ static int g_exit_flag = 0;         /* Main loop should exit */
 static char g_server_base_name[40]; /* Set by init_server_name() */
 static const char *g_server_name;   /* Set by init_server_name() */
 static const char *g_icon_name;     /* Set by init_server_name() */
+static char *g_system_info;         /* Set by init_system_info() */
 static char g_config_file_name[PATH_MAX] =
     "";                          /* Set by process_command_line_arguments() */
 static struct mg_context *g_ctx; /* Set by start_civetweb() */
@@ -647,6 +648,26 @@ init_server_name(int argc, const char *argv[])
 }
 
 
+static void
+init_system_info(void)
+{
+	int len = mg_get_system_info(NULL, 0);
+	if (len > 0) {
+		g_system_info = malloc(len + 1);
+		(void)mg_get_system_info(g_system_info, len + 1);
+	} else {
+		g_system_info = sdup("Not available");
+	}
+}
+
+
+static void
+free_system_info(void)
+{
+	free(g_system_info);
+}
+
+
 static int
 log_message(const struct mg_connection *conn, const char *message)
 {
@@ -811,8 +832,11 @@ start_civetweb(int argc, char *argv[])
 #ifdef WIN32
 		(void)MakeConsole();
 #endif
-		fprintf(stdout, "\n%s (%s)\n", g_server_base_name, g_server_name);
-		(void)mg_print_system_info__experimental(0, 0);
+		fprintf(stdout,
+		        "\n%s (%s)\n%s\n",
+		        g_server_base_name,
+		        g_server_name,
+		        g_system_info);
 
 		exit(EXIT_SUCCESS);
 	}
@@ -1998,7 +2022,10 @@ show_system_info()
 		return;
 	}
 
-	/* TODO */
+	(void)MessageBox(NULL,
+	                 g_system_info,
+	                 "System Information:",
+	                 MB_ICONINFORMATION);
 
 	sGuard--;
 }
@@ -2239,6 +2266,7 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show)
 	(void)show;
 
 	init_server_name((int)__argc, (const char **)__argv);
+	init_system_info();
 	memset(&cls, 0, sizeof(cls));
 	cls.lpfnWndProc = (WNDPROC)WindowProc;
 	cls.hIcon = LoadIcon(NULL, IDI_APPLICATION);
@@ -2284,6 +2312,8 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show)
 		DispatchMessage(&msg);
 	}
 
+	free_system_info();
+
 	/* Return the WM_QUIT value. */
 	return (int)msg.wParam;
 }
@@ -2339,6 +2369,7 @@ int
 main(int argc, char *argv[])
 {
 	init_server_name(argc, (const char **)argv);
+	init_system_info();
 	start_civetweb(argc, argv);
 
 	[NSAutoreleasePool new];
@@ -2396,6 +2427,7 @@ main(int argc, char *argv[])
 	[NSApp run];
 
 	stop_civetweb();
+	free_system_info();
 
 	return EXIT_SUCCESS;
 }
@@ -2406,6 +2438,7 @@ int
 main(int argc, char *argv[])
 {
 	init_server_name(argc, (const char **)argv);
+	init_system_info();
 	start_civetweb(argc, argv);
 	fprintf(stdout,
 	        "%s started on port(s) %s with web root [%s]\n",
@@ -2422,6 +2455,8 @@ main(int argc, char *argv[])
 	stop_civetweb();
 	fprintf(stdout, "%s", " done.\n");
 
+	free_system_info();
+
 	return EXIT_SUCCESS;
 }
 #endif /* _WIN32 */