Commit Graph

59 Commits

Author SHA1 Message Date
Ville Skyttä 41be05b97e Allow binding to a listen address that doesn't exist yet 2014-07-16 19:34:36 +02:00
Stefan Gehn eb0a44b64b Spelling fixes
Fix several spelling mistakes in code comments as well as the Changelog.

Thanks to Ville Skyttä for providing the patch.
2014-07-12 22:48:16 +02:00
Stefan Gehn 4ff218d726 Drop GLib 1.x compatibility for gkrellmd
GLib version 1 is very outdated by now and not available in any recent
Linux distribution. Keeping this code around without actually being
able to test it makes little sense so let's get rid of that.
2014-07-12 22:45:33 +02:00
Stefan Gehn 5c40eea518 Fix inconsistent path generation and checks on win32
- Always check the return value of
  g_win32_get_package_installation_directory_of_module, this call may
  fail and return NULL
- g_build_filename is documented as never returning NULL, no need to
  check for that
2014-07-12 22:45:14 +02:00
Stefan Gehn 33133c63ae Remove compatibility code for GLib < 2.32
Since the minimum GLib version is now 2.32 the code paths for older GLib
2 versions can be removed too.
2014-07-12 22:45:14 +02:00
Stefan Gehn 6e3ee7db10 Port to GLib >= 2.32 GThread API
- Use g_thread_new instead of g_thread create
- Drop explicit call of g_thread_init, it is done implicitely by GLib
  since 2.32
- Since this bumps the minimum required GLib version add and extend the
  pkg-config based version checks to error out on older GLib versions
2014-07-12 22:45:08 +02:00
Stefan Gehn d33190cc0b Remove unsupported linker flags for windows builds
Do not use the default LINK_FLAGS value for windows builds, the default
"-E" linker option only causes warnings for MinGW since it's essentially
ignored by the linker.

The flag is also unneeded since linking plugins against the gkrellm
binary is not done on win32 so none of the gkrellm/gkrellmd functions
need to be exported, the API is manually exposed via the win32-specific
libgkrellm/libgkrellmd static libs.
2014-07-09 22:04:42 +02:00
Stefan Gehn da95bca5c5 Simplify setting default installation prefix
Just setting a default value for PREFIX should have the same result as
an explicit check for an empty INSTALLROOT variable.
2014-04-18 09:29:57 +02:00
Stefan Gehn eb0ded8d55 Use binary extension during gkrellm build
Honor the BINEXT variable in the gkrellm and gkrellmd target to enforce
building with the correct extension. This is needed for recent mingw-w64
cross toolchains since those do not automatically append ".exe" when
linking.
2014-04-18 09:29:27 +02:00
Stefan Gehn 8abd662cd6 Add missing include and link args for gmodule
Explicitely add needed include arguments as well as linker arguments
for gmodule. Before this change we relied on gmodule being an implicit
dependency pulled in via the gtk+-2.0 module, this does not seem to be
the case anymore with >=gdk-pixbuf-2.24 and >=pango-1.30.

Thanks for Alexandre Rostovtsev for bringing this up on the mailinglist
and for providing a first patch.

See also https://bugs.gentoo.org/show_bug.cgi?id=428532
2013-07-20 14:08:38 +02:00
Stefan Gehn 956bd11b50 Treat cifs as remote filesystem
Mark mount points of type cifs as remote filesystems to make gkrellm use
nfs-timeout as polling interval instead of the standard fs-timeout which
should only be used to poll local filesystems.

Thanks to Gerard Neil for submitting this patch.
2013-07-20 14:02:15 +02:00
Stefan Gehn 1d11384131 Abort gkrellmd detaching if chdir fails
Handle the return value for chdir() and abort daemonizing of gkrellmd in
case chdir failed.
2012-02-22 19:58:39 +01:00
Stefan Gehn cdbeeb9b17 Fix syslog function call (missing format string)
Add proper format-string to call to syslog() function.

Fixes Debian Bug #646262
2012-02-22 19:41:29 +01:00
Bill Wilson 50b126e085 Patch from Neil Booth: Add multiple CPU capability to CPU monitor for
Dragonfly.  Acquired dragonfly.c from web so could apply patch.
I have no clue why I never had a dragonfly.c.
2011-08-08 16:06:26 -05:00
Stefan Gehn bf3d25c568 Merge with gkrellm-2.3.5-pre2.tar.bz2 2010-10-06 21:38:56 +00:00
Stefan Gehn 6bd26e8401 Allow disk paths of (almost) any length in both gkrellm and gkrellmd.
monitor.c: serve_disk_data() now uses a dynamic buffer for to-be-sent disk-lines instead of relying on a very short static array.
client.c: read_server_setup() now uses a static read buffer that is as big/small as the global server_buf. client_disk_line_from_server() now uses a dynamic string for disk names.
2010-10-06 20:50:45 +00:00
Stefan Gehn c67cf611a6 - gkrellm.h. Bump maximum line-/item-length for config to 512 (needed for long disk names on Darwin).
- src/disk.c, server/monitor.c: Add gkrellm_disk_add_by_name() that allows creating disks with a custom label from sysdep code.
- src/Makefile, server/Makefile: Cleanup of darwin/darwin9/macosx targets. All custom variables are now set in src/Makefile and server/Makefile to allow easy building inside these subdirs. Removed very old link-flags which were used before OS X 10.3.
- All Makefiles: Remove unused GTK_CONFIG definitions, they were neither passed as an argument nor executed anywhere.
- Makefile: Update comments documenting Darwin and OS X targets (darwin, darwin9 and macosx)
- src/sysdeps/darwin.c: Use utmpx instead of deprecated utmp.
- src/sysdeps/darwin.c: Fix possible leak in gkrellm_sys_cpu_init(), pinfo was never free'd.
- src/sysdeps/darwin.c: Rewrite disk device enumeration and performance gathering. The previous implementation failed as soon as a single device contained no medium, resulting in no/wrong performance data for all subsequent devices. Also provides labels for krells based on real device-names (uses new gkrellm_disk_add_by_name()).
2010-09-23 15:31:24 +00:00
Stefan Gehn d36c3ec662 Fix missing format-strings to avoid compiler warnings 2010-09-23 15:06:21 +00:00
Stefan Gehn 8dbee76730 win32.c: Drop current working directory from DLL search path by calling SetDllDirectory() with an empty string. Avoids possible security problems, especially when loading plugins.
Makefile, win32.c: Load ntdll.dll and lookup used functions at runtime (safer for future windows version and fixes unintended linking against sscanf() from ntdll)
win32.c: Add gkrellm_sys_inet_cleanup() for proper unloading of iphlpapi.dll
2010-09-20 20:53:48 +00:00
Stefan Gehn a457f7a3e1 INSTALL: Slightly update win32 build instructions
ChangeLog: Add and clarify win32-related changes
win32-resource.rc: Bump version number to 2.3.5
2010-09-15 16:14:11 +00:00
Stefan Gehn d72d689c4c Merge with changes from gkrellm-2.3.5-pre.tar.bz2 2010-09-15 15:32:14 +00:00
Stefan Gehn 915d03ad66 Do not link against liblargeint on windows anymore. Allow overriding windres via environment variables (preparation for win64 builds) 2010-06-21 14:49:40 +00:00
Stefan Gehn f3c095a4f6 Correct email address 2010-06-13 17:54:28 +00:00
Stefan Gehn 07551c6fe9 Fix enumeration of fstab-entries in gkrellmd (fstab entries were only sent to a client if fstab was marked as modified, unfortunately this is never the case on win32). Fixes #3.
Remove parsing of "--debug-level" in get_args(), it is already parsed in parse_config()
Make "-d" commandline option the short version for "--detach" only. Before it was also used as a short version for "--debug-level"
2010-06-13 13:40:20 +00:00
Stefan Gehn 7e86c76f32 Switch from printf() to GLib/GKrellM logging (gkrellm_debug(), g_warning(), g_message())
Replace sprintf() calls with snprintf() for security reasons.
2010-06-12 19:41:22 +00:00
Stefan Gehn 836310c392 Enable IPv6-support on win32 if target os is windows xp or newer (win2k lacks needed functions) 2010-06-12 19:26:34 +00:00
Stefan Gehn bf40ec1d5d Allow passing linker flags via LDFLAGS in Makefile 2010-06-12 14:10:52 +00:00
Stefan Gehn 0f9bc83d54 - Bump version to 2.3.4 in windows resource files 2010-05-29 13:19:39 +00:00
Stefan Gehn fcd0b544e4 - Merge with gkrellm-2.3.4 from upstream 2010-05-29 12:49:28 +00:00
Stefan Gehn 25076e8a0f - Merge in missing changes from gkrellm-2.3.3 release
- Revert gkrellm version header change, there are too many places in code/docs containing the version number, one more or less will not hurt
- configure: Make configure shell script write configure.mk and move logic for compiler and linker flags into configure
- configure: Also search openssl and libntlm via pkg-config and fall back to hardcoded library names for linking if not found
- Makefile: Workaround environment-bugs in win32 toolchain by switching from "override CC" to a normal makefile rule for building .o from .c files
2009-12-27 11:48:30 +00:00
Stefan Gehn a9c193f84c Merge with gkrellm-2.3.3 from upstream 2009-12-26 17:08:15 +00:00
Stefan Gehn a7ea973741 - Win32: enumerate users using WTS-API. NOTE: This makes GKrellM require Win XP or newer, code for Win 2k is still present though (depends on value of _WIN32_WINNT) 2009-12-26 15:11:13 +00:00
Stefan Gehn a1bc3c7aae - Unify my own email address around gkrellm-sourcecode, translations are not updated due to gettext problems on win32 2008-12-28 14:51:59 +00:00
Stefan Gehn 0d35922472 - Add gkrellm_debugv() function to fix gkrellm_debug() for win32-plugins. Forwarding var args is not possible with plain C 2008-12-26 10:47:29 +00:00
Stefan Gehn a5194a3488 - Unify search-paths for plugins and themes in both gkrellm and gkrellmd on win32 2008-12-17 14:12:21 +00:00
Stefan Gehn e09fe90ef8 - Remove "rc2" from version number
- Update (own) email-address in "about" tab
2008-12-17 09:39:18 +00:00
Stefan Gehn 2cf2afc458 - comment out all options in default gkrellmd.conf so it can be installed without causing any trouble
- move gkrellm[d] version into its own header
- win32: determine version from headers instead of hardcoding them in the .rc files
2008-10-29 16:02:13 +00:00
Stefan Gehn 3d405b9970 - Use glib wrappers for fopen/stat/chmod/unlink, fixes file operations for win32 where glib uses utf-8 for all file-handling
- win32: remove company name from exe headers as there's no company behind GKrellM
2008-10-28 19:02:04 +00:00
Stefan Gehn 902e9ce6ab - win32: Makefile: install binaries into standard "bin" directory as done on unix and make standard value for INSTALL variable work on win32/msys as well (INSTALL=install somehow calls the wrong install binary for me)
- win32: main.c: simplify locating the locales directory
2008-10-24 18:34:38 +00:00
Stefan Gehn 804e456c03 - Merge in gkrellm-2.3.2 release changes 2008-10-04 08:55:47 +00:00
Stefan Gehn d8c30ffddb - Bump copyright year, version information and minimum gtk+ version in various files 2008-09-30 17:37:03 +00:00
Stefan Gehn 1f28fe7a74 - add debug-area for server-debugging 2008-09-28 19:16:02 +00:00
Stefan Gehn d4f189fb05 - fix includes for syslog-logging in server 2008-09-28 18:38:55 +00:00
Stefan Gehn 6fc301ca06 - merge in changes from gkrellm 2.3.2 snapshot (fetched 2008-09-27) 2008-09-28 18:06:24 +00:00
Stefan Gehn c994994734 - gkrellmd: use new logging system and add syslog-handler for logging to syslog or windows event log
- gkrellmd: redo argv parsing, the old one could have read one item too far
- gkrellmd win32: search plugins in installation directory
- gkrellmd win32: print helpful messages on service install/uninstall
- gkrellmd win32: added install target for gkrellmd.conf
2008-09-28 15:51:42 +00:00
Stefan Gehn 18722795e1 - win32-resource.h: remove unneeded define 2008-09-27 08:04:03 +00:00
Stefan Gehn ec19a8fd2e - remove icon, gkrellmd is a background-application that needs no icon
- update copyright year in application header
2008-09-17 17:07:30 +00:00
Stefan Gehn bb0a4a901d plugins.c, gkrellmd.h: search for plugins in INSTDIR/gkrellmd-plugins on win32 2008-05-25 12:05:15 +00:00
Stefan Gehn 0d055e759c - Set executable bits in svn repos 2008-04-08 09:38:48 +00:00
Stefan Gehn f0bc117fb4 - gkrellmd: clean up service install/uninstall, also start the service after install and stop a running service prior to uninstall
- Makefile: append binary extension on platforms that need it (i.e. win32), needed for new MSYS build-environment
2008-03-25 18:42:25 +00:00