Commit Graph

534 Commits

Author SHA1 Message Date
Laslo Hunhold
24b663d657 Tweak build system a little bit
Be consistent with brackets and add a comment for OpenBSD to make it
clearer what the actual intent of the uncommented line is.

In the Makefile, add a dependency of slstatus.o from config.mk.
2018-05-01 20:53:27 +02:00
Aaron Marcher
41deabf2ec battery_perc: Port to OpenBSD 2018-05-01 20:45:29 +02:00
Laslo Hunhold
19343ff343 components/swap.c | move duplicated code to separate function 2018-05-01 20:24:13 +02:00
Laslo Hunhold
9750a3d731 Use indentation to increase readability
Granted, this style is definitely not common, but for the short
utility-functions of this program it's just the right choice. This
provides great flexibility, such that in the long run, it will be
possible to also share code between the OS-implementations.

This also keeps the state-keeping at a minimum and makes it clearer
which functions are implemented on which OS without having to jiggle
around with too many files in the process.
2018-05-01 19:43:49 +02:00
Laslo Hunhold
42edfea89a Revert component-split
this reverts the commits from 92ab9ef52e up to
d42870d6ca.

After heavy consideration, the component split has more disadvantages
than advantages, especially given there will be utility-functions
sharing quite a lot of code that would then need to be duplicated, as it
does not fit into the util.c due to its speciality.

One big advantage of the component-wise build is readability, and
without doubt, this was achieved here. This point will be addressed
with a different approach that will be visible in the upcoming commits.

One big disadvantage of the component build is the fact that it
introduces state to the build process which is not necessary. Before its
introduction, the only influencing factors where the system-defines
__linux__ and __OpenBSD__. With the components, we are also relying on
the output of uname(1).
Additionally, if the os.mk is not present, make gives the output

     $ make
     Makefile:5: os.mk: No such file or directory
     make: *** No rule to make target 'os.mk'.  Stop.

This could easily be fixed by providing some sort of meta-rule for this
file, however, it indicates the problem we have here, and this entire
statefulness will heavily complicate packaging of this tool and makes
the build process much more complex than it actually has to be.
2018-05-01 19:43:34 +02:00
Quentin Rameau
d42870d6ca Makefile: add distclean target 2018-04-30 16:27:07 +02:00
Quentin Rameau
2ea3d46f13 Makefile: move OS-specific libs to configure script 2018-04-30 16:27:07 +02:00
Quentin Rameau
95665e437b Makefile: separate default flags from user flags 2018-04-30 16:27:07 +02:00
Aaron Marcher
085431b282 Update LICENSE for Quentin Rameau 2018-04-30 15:44:41 +02:00
Quentin Rameau
97ff66522c wifi: OS split 2018-04-30 15:42:16 +02:00
Quentin Rameau
19f3c8f545 uptime: OS split 2018-04-30 15:42:08 +02:00
Quentin Rameau
71eb1d321d temperature: OS split 2018-04-30 15:42:00 +02:00
Quentin Rameau
72f5a0d69a swap: OS split 2018-04-30 15:41:52 +02:00
Quentin Rameau
259e106b4f ram: OS split 2018-04-30 15:41:43 +02:00
Quentin Rameau
3cc649e34c entropy: OS split 2018-04-30 15:41:31 +02:00
Quentin Rameau
f088dbfea0 cpu: OS split 2018-04-30 15:41:09 +02:00
Quentin Rameau
720569bd56 battery: OS split 2018-04-30 15:40:59 +02:00
Quentin Rameau
92ab9ef52e Makefile: detect running OS 2018-04-30 15:40:20 +02:00
Aaron Marcher
3fe1db8892 cpu_freq: Port to OpenBSD
In OpenBSD CPU frequency gets fetched using sysctl now.
2018-04-30 13:20:24 +02:00
Aaron Marcher
c3ce506b7f Fix typo in temperature 2018-04-29 22:44:09 +02:00
Aaron Marcher
4113a39ee6 Update README for OpenBSD build 2018-04-29 22:33:15 +02:00
Aaron Marcher
273d3db573 uptime: Separate function for readbility 2018-04-29 20:07:09 +02:00
Aaron Marcher
09950055ba battery: Separate function for readbility 2018-04-29 20:02:42 +02:00
Aaron Marcher
cee6811036 ram: Move up includes 2018-04-29 20:00:38 +02:00
Aaron Marcher
7baad64a4b Sort LICENSE according to first commit 2018-04-29 18:50:44 +02:00
Aaron Marcher
489c6f87d1 temp: Port to OpenBSD
In OpenBSD temperature gets fetched using sysctl now.
2018-04-29 18:35:41 +02:00
Aaron Marcher
b6d2b652d0 Remove vol_perc() from todo in README 2018-04-29 16:08:45 +02:00
Aaron Marcher
57b1c1719f Update LICENSE for parazyd 2018-04-29 16:05:53 +02:00
parazyd
d66e775c8d Add OpenBSD support in volume.c 2018-04-29 15:57:17 +02:00
Aaron Marcher
53ecbcb3ad Update LICENSE for Ali H. Fardan 2018-04-29 13:02:08 +02:00
Aaron Marcher
96330ff42b Remove ipv{4,6}() from todo in README 2018-04-29 13:00:12 +02:00
Ali H. Fardan
7a9a9b7d76 ip: add OpenBSD support
ip.c already works on OpenBSD, it's just missing some headers:
2018-04-29 12:54:28 +02:00
Aaron Marcher
97ef7c2a1d Remove non-portable functions from config.def.h 2018-04-16 19:09:07 +02:00
Aaron Marcher
8601c27264 Add Darron Anderson to LICENSE
Thank you for your contribution.
2018-04-14 19:44:54 +02:00
Aaron Marcher
c2e7d6812c Remove ram_*() from README 2018-04-14 19:44:25 +02:00
Darron Anderson
88bf05e4a3 Add OpenBSD RAM stats 2018-04-14 19:41:49 +02:00
Aaron Marcher
faa52bdcc0 Format error messages properly
Make use of strerror(errno) and format all errors equally:
function ['parameters']: error message
2018-03-28 19:46:27 +02:00
Aaron Marcher
2289798b6d Remove program name from error messages 2018-03-28 18:49:27 +02:00
Aaron Marcher
96f3a8a54e Get rid of err.h as it is not portable
Replace warn() and warnx() with fprintf() and add <stdio.h> where
necessary.
2018-03-28 18:26:56 +02:00
Aaron Marcher
aced832622 Remove unnecessary headers 2018-03-28 18:14:08 +02:00
Aaron Marcher
198df15d83 Remove ALSA dependency from README
ALSA is not a dependency anymore as we use /dev/mixer. The corresponding
notice about PulseAudio is thus not necessary too.
2018-03-26 18:09:30 +02:00
Aaron Marcher
e79d4932ea More robust preprocessor switches
Replace #ifdef with #if defined() and #elif with #elif defined() as it
should only test if it is defined or not.
2018-03-21 12:21:37 +01:00
Aaron Marcher
fc5d23212f uptime: Port to OpenBSD.
In OpenBSD uptime gets fetched using sysctl now.
2018-03-20 00:52:09 +01:00
Aaron Marcher
7e3f80c1a3 battery_perc: Port to OpenBSD.
In OpenBSD battery percentage gets fetched using apm now.
2018-03-19 18:46:52 +01:00
Aaron Marcher
ad5b7c8b1c README: Add list of non-portable functions 2018-03-18 23:30:54 +01:00
Aaron Marcher
ebf5a35052 Build Linux-only functions only on Linux 2018-03-18 23:26:13 +01:00
Aaron Marcher
25bda72e64 README: Add Todo 2018-03-18 22:51:51 +01:00
Aaron Marcher
ff65c4a413
Merge pull request #43 from SiIky/unknown_str
Print unknown_str in case of error
2018-02-17 20:00:04 +00:00
SiIky
9ca1ac62f9 Print unknown_str in case of error
func can return NULL in case of error, but no checking is done when
printing, and unknown_str wasn't being used anywhere.
2018-02-17 18:08:27 +00:00
Aaron Marcher
8bfe4b2e28
Update LICENSE year for myself. 2018-01-06 23:40:05 +01:00