Commit graph

589 commits

Author SHA1 Message Date
Doug Torrance a75edac40d wmppp.app: Command line options take precedence over configuration files.
Since we now reread the configuration files on occasion, the options given
at the command line could be overwritten.  To avoid this, we save the
command line options and always use them if present.
2015-05-20 10:44:41 +01:00
Doug Torrance 3c16ef37ec wmppp.app: Reread configuration file.
Based in part on a patch by Chris Gray [1] to fix Debian bug #50181 [2].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=wmppp.diff;att=1;bug=50181
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=50181
2015-05-20 10:44:41 +01:00
Doug Torrance 2b0feb59f8 wmppp.app: Add new command line options.
We add command line options for the user to change the start, stop, speed,
ifdown, and stampfile settings at runtime.  This closes a Debian wishlist
bug [1].

Note that, in order to have the command line options overwrite the
defaults set in the configuration file, we split the command line parsing
code into a new function (parse_cmdline()).  We then merged main() and
wmppp_routine().

We document the new options in the help text and in the man page.  We also
take the opportunity to reformat the help text for the -i option and add
the -geometry option to the man page.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293839
2015-05-20 10:44:41 +01:00
Doug Torrance 540b8ac560 wmppp.app: Fix segfault if stop_action or start_action strings are NULL. 2015-05-20 10:44:41 +01:00
Doug Torrance 37acf2a687 wmppp.app: Fix segfault when HOME undefined.
Instead, we exit with an error message.

This fixes Debian bug #716472 [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=716472
2015-05-20 10:44:41 +01:00
Doug Torrance 7631c7d566 wmppp.app: Update Makefile.
Main change is to use $(INSTALL) instead of cp in install target along with
$(DESTDIR) variable.  We also remove installation of user ~/.wmppprc config
file -- this isn't useful for sysadmins or package maintainers.

We also update INSTALL to reflect the changes.
2015-05-20 10:44:41 +01:00
Doug Torrance 9dab93996e wmppp.app: Use #includes from include-what-you-use.
We actually include <sys/socket.h> instead of <bits/socket_type.h>, as it
returns an error: "Never include <bits/socket_type.h> directly; use
<sys/socket.h> instead."
2015-05-20 10:44:41 +01:00
Doug Torrance b14003c1ee wmppp.app: Remove C++ style comments. 2015-05-20 10:44:41 +01:00
Doug Torrance c1b23f6a43 wmppp.app: Replace deprecated usleep with nanosleep. 2015-05-20 10:44:41 +01:00
Doug Torrance 7ec61f487b wmppp.app: Replace deprecated caddr_t cast with void*. 2015-05-20 10:44:41 +01:00
Doug Torrance 40aaf4c6af wmppp.app: Remove unused parameter from get_statistics().
Fixes "warning: unused parameter ‘devname’" compiler warning.
2015-05-20 10:44:41 +01:00
Doug Torrance 82aceda014 wmppp.app: Switch ifs to #ifs for macros.
Fixes "warning: null argument where non-null required" compiler warnings by
not passing NULL to strdup and "(warning) Conversion of string literal to
bool always evaluates to true" found by cppcheck.
2015-05-20 10:44:41 +01:00
Doug Torrance 8d3011886d wmppp.app: Reduce scope of several variables.
Fixes several "(style) The scope of the variable 'p' can be reduced" found
by cppcheck.
2015-05-20 10:44:41 +01:00
Doug Torrance 6b8351219c wmppp.app: Fix spelling mistakes.
Used codespell -w.
2015-05-20 10:44:41 +01:00
Doug Torrance 9d8970e27a wmppp.app: Move source files to top directory.
This way, users need only type "make" to build instead of needing to
"cd wmppp" first.
2015-05-20 10:44:41 +01:00
Doug Torrance 624b2898fe wmgeneral: Don't call free on pointers we haven't malloced.
Could cause occasional segfaults.
2015-05-20 10:44:41 +01:00
Doug Torrance a9b73f2fd6 wmgeneral: Fix segfault if newline encountered in parse_rcfile.
From a patch for wmppp.app by Chris Gray <cgray@tribsoft.com> submitted to
Debian to fix several bugs [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=27997
2015-05-20 10:44:41 +01:00
Doug Torrance cd30d4127d wmgeneral: Add proper copyright headers; fix changelog formatting. 2015-05-20 10:44:41 +01:00
Doug Torrance afd3d56aea wmgeneral: Use #includes from include-what-you-use. 2015-05-20 10:44:41 +01:00
Doug Torrance 6b1ed40882 wmgeneral: Use field width limits for scanf.
This fixes "(portability) scanf without field width limits can crash with
huge input data on some versions of libc" warning from cppcheck.

We choose 10 as the field width limit as it is the number of characters in
2^31-1, the largest int.
2015-05-20 10:44:41 +01:00
Doug Torrance a0f16b945a wmgeneral: Reduce scope of several variables.
Also took the opportunity to fix some whitespace formatting.
2015-05-20 10:44:41 +01:00
Doug Torrance 6dc4716c29 wmgeneral: Merge 2003-10-10 version from wmmon and wmtime.
Note that this was a fork of the earlier 1998-05-02 version and didn't
contain the later changes.  Therefore we merge the best of both versions.

wmtime had some additional unnecessary dummy variables, so we use the wmmon
version.
2015-05-20 10:44:41 +01:00
Doug Torrance a680f87666 wmgeneral: Bump to 1998-09-14 version found in wmckgmail, wmitime, wmsmp.app, wmSMPmon, and wmtz.
Note that wmckgmail and wmtz were identical; this is the version we use.
wmSMPmon differed only with some whitespace.

wmitime differed only with a bugfix (a segfault when -display is given with
no argument), but this will be fixed again in the next commit.

wmsm.app had patched wmgeneral to work with its xpm; instead we patch its
xpm to work with wmgeneral.
2015-05-20 10:44:40 +01:00
Doug Torrance 6c8c14e710 wmgeneral: Bump to 1998-09-11 version found in wmcpufreq and wmppp.app.
We update the dockapps with the older 1998-05-02 version (wmfsm, wmifs, and
wmkeys), and also remove trailing whitespace from the wmcpufreq copy.
2015-05-20 10:44:40 +01:00
Doug Torrance 7d77c17cc1 wmgeneral: Remove inline keywords.
Previously, if we attempted to build using C99 or later, we got "inline
function declared but never defined" warnings and eventual "undefined
reference" errors.  As a result, it fails to build from source using gcc5.

However, if we move the definitions to list.h and add "extern inline"
declarations to list.c, which does compile using C99 and later, then it no
longer compiles using gnu90, the default for gcc4.

To avoid this mess, we remove the inline keywords altogether.

Note that this fixes Debian bugs for wmifs [1], wmppp.app [2], and
wmtime [3].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778170
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778172
[3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778174
2015-05-20 10:44:40 +01:00
Doug Torrance dae24a2f5d wmgeneral: Free pointer.
Fixes "(error) Memory leak: argv" found by cppcheck.
2015-05-20 10:44:40 +01:00
Doug Torrance 746c4b6b7c wmgeneral: Check if malloc fails.
Fixes "(error) Uninitialized variable: ret" found by cppcheck.
2015-05-20 10:44:40 +01:00
Doug Torrance fdb596cd42 wmweather+: Remove from repository.
This dockapp is still maintained by its original upstream author, Brad
Jorsch, and a newer version (2.15) is available at [1].  Therefore, it is
not appropriate for the Window Maker dockapps repository.

[1] https://sourceforge.net/projects/wmweatherplus/
2015-05-16 11:35:26 +01:00
Doug Torrance 89c9512c8d wmbattery: Bump to version 2.48. 2015-05-14 11:44:03 +01:00
Doug Torrance 0fa341ec37 wmbattery: Remove unnecessary brace.
Fixes "Invalid number of character ({) when these macros are defined"
errors given by cppcheck.
2015-05-14 11:44:03 +01:00
Doug Torrance 29e50127b6 wmbattery: Properly free malloced memory.
Fixes memory leak found by cppcheck.
2015-05-14 11:44:03 +01:00
Doug Torrance 7a04d6805b wmbattery: Fix typos.
Ran `codespell -w`.
2015-05-14 11:44:03 +01:00
Doug Torrance 81e95eabca wmbattery: Add -n option to disable dial graphic.
Thanks to Christoph Fritz for the feature request.
2015-05-14 11:44:03 +01:00
Doug Torrance 0b45f308ad wmbattery: Improve help text for -i option. 2015-05-14 11:44:03 +01:00
Doug Torrance 149ea78090 wmbattery: Expand -g option to allow positions relative to right or bottom.
Use '-' instead of '+', e.g., `wmbattery -g -0+0` will place wmbattery in
the upper right hand corner of the screen.

Thanks to Christoph Fritz for the feature request.
2015-05-14 11:44:03 +01:00
Christoph Fritz 9c6faa3682 wmbattery: upower - don't exit after suspend/hibernation wakup
Immediately after suspend/hibernation wakup cycle, up_client_get_devices()
can fail:

 libupower-glib-WARNING **: up_client_get_devices failed: Timeout was reached

Since we do not interpret the UPower signals, just don't exit wmbattery after
first up_client_get_devices() failure.
2015-05-14 11:44:03 +01:00
Christoph Fritz a8858dedde wmbattery: Makefile - use autoheader too
instead, configure complains about:
   config.status: error: cannot find input file: `config.h.in'
2015-05-14 11:44:03 +01:00
Doug Torrance 6615b04e77 wmbattery: Change manpage section from deprecated 1x to 1. 2015-05-14 11:44:02 +01:00
Doug Torrance f97c49286f wmbattery: Escape hyphen in manpage.
Fixes hyphen-used-as-minus-sign Lintian warning in the Debian package.  Patch
from [1].

[1] https://sources.debian.net/src/wmbattery/2.47-1/debian/patches/escape_manpage_hyphens.patch/
2015-05-14 11:44:02 +01:00
Doug Torrance 593a6266ea wmload: Bump to version 0.9.6. 2015-04-15 16:41:44 +01:00
Doug Torrance 7cc19cb1cc wmload: Clarify copyright information.
Add copyright header to wmload.c and COPYING file, obtained from
https://www.gnu.org/licenses/gpl-2.0.txt.
2015-04-15 16:41:44 +01:00
Doug Torrance 24463263ba Add wmload information for dockapps webpage. 2015-04-07 13:28:31 +01:00
Doug Torrance 39a4b7b58f wmload: Bump to version 0.9.5.
Skipping 0.9.3 and 0.9.4 since they've essentially already been released as
asload.
2015-04-07 09:01:41 +01:00
Doug Torrance 4f64133cbe wmload: Replace deprecated usleep with nanosleep. 2015-04-07 09:01:40 +01:00
Doug Torrance 8f06836b0f wmload: Cast data from client message event to Atom for comparison.
Fixes -Wsign-compare compiler warning.
2015-04-07 08:54:08 +01:00
Doug Torrance 04a36b3ae4 wmload: Check if Execute string is empty by testing first character.
Fixes "the address of ‘Execute’ will always evaluate as ‘true’ [-Waddress]"
warning.
2015-04-07 08:54:07 +01:00
Doug Torrance 615412876a wmload: Remove ">/dev/console" from default command to execute on click.
Otherwise, user may receive "permission denied" errors.
2015-04-07 08:54:07 +01:00
Doug Torrance 6ff9ad80f5 wmload: Include sys/wait.h.
Needed to fix "implicit declaration of function ‘waitpid’" warning
introduced after merging asload-0.9.4.
2015-04-07 08:54:07 +01:00
Doug Torrance 4aedbc5823 wmload: Remove trailing whitespace. 2015-04-07 08:54:07 +01:00
Doug Torrance d5e87688a3 wmload: Incorporate changes from asload-0.9.4.
Obtained from [1].

[1] http://tigr.net/afterstep/download/asload/asload-0.9.4.tar.gz
2015-04-07 08:54:07 +01:00