Commit Graph

158 Commits

Author SHA1 Message Date
Aaron Marcher
6123f482e3 Fix indents (spaces for alignment) 2018-05-07 13:48:43 +02:00
Aaron Marcher
6c6c144be6 wifi_perc: Simplify 2018-05-07 12:25:34 +02:00
Aaron Marcher
0a287616b2 num_files: Variable declarations at top of block 2018-05-07 12:17:13 +02:00
Aaron Marcher
dcffaeaf57 Fix disk_perc by casting it to int 2018-05-07 12:14:46 +02:00
Aaron Marcher
4fc4983502 disk_perc: Simplify 2018-05-07 11:44:15 +02:00
Aaron Marcher
b3330d849d cpu: Simplify functions 2018-05-07 11:39:59 +02:00
Aaron Marcher
16a97fbca1 Unify header includes
- Sort Alphabetically
- Same indentation for preprocessor clauses
2018-05-07 11:21:59 +02:00
Aaron Marcher
fbbe300f4d entropy: Small fix 2018-05-06 23:09:36 +02:00
Aaron Marcher
fd14804d6f entropy: Port to OpenBSD
OpenBSD's entropy design is superior to Linux.
2018-05-06 22:54:32 +02:00
Aaron Marcher
62563a5a0d datetime: Add <stdio.h> for fprintf 2018-05-06 22:41:56 +02:00
Aaron Marcher
932f65c373 datetime: Add error message 2018-05-06 22:38:29 +02:00
Aaron Marcher
ee5ec75621 Fix coding style
- Use block for single statement ifs
- Keep lines to reasonable length (current debate as to reasonable)
- When functions return -1 for error test against 0 not -1
- Do not indent cases another level
- Do not test against NULL and 0 explicitly
- Use tabs for indentation, use spaces for alignment
2018-05-06 22:28:56 +02:00
Aaron Marcher
66a7fb16fc Remove cpu_iowait
The third value from load_avg (idle) gives us almost the same
information as cpu_iowait. Plus OpenBSD does not offer an iowait value
as Linux and thus the corresponding function would not be portable.
2018-05-06 21:11:50 +02:00
Aaron Marcher
235fa3c306 cpu_perc: Documentation and readbility improvements 2018-05-06 21:10:02 +02:00
Aaron Marcher
2b82bf0248 cpu_perc: Port to OpenBSD
In OpenBSD the CPU usage in percent is now computed using KERN_CPTIME
sysctl.
2018-05-06 17:48:37 +02:00
Aaron Marcher
efb41724b5 swap_*: Port to OpenBSD 2018-05-06 01:20:46 +02:00
Aaron Marcher
417f473fe2 battery: Remove full indicator
It does not respect charging thresholds and it is not trivial to
implement the indicator in OpenBSD.
2018-05-04 18:04:53 +02:00
Aaron Marcher
699f6734d9 wifi_perc: Fix file descriptor leak 2018-05-02 19:41:53 +02:00
Aaron Marcher
54ebd0dabe uptime: Add missing brace 2018-05-02 12:08:54 +02:00
parazyd
34010907a6 volume: Cast SOUND_MIXER_READ_DEVMASK to int to avoid warning. 2018-05-02 11:49:15 +02:00
Aaron Marcher
f7a6d6c8f7 wifi: Various cleanups 2018-05-02 08:49:06 +02:00
Aaron Marcher
709549b4bd user: Only declare variables in the beginning 2018-05-02 08:42:55 +02:00
Aaron Marcher
e43c3a16f0 uptime: Simplifiy and clean up 2018-05-02 08:41:06 +02:00
Aaron Marcher
f007007156 run_command: Clean up 2018-05-02 08:29:36 +02:00
Aaron Marcher
7c11f890a5 keyboard_indicators: Clean up opening display 2018-05-02 08:26:23 +02:00
Aaron Marcher
b2b6eb638e ip: Sort headers alphabetically 2018-05-02 08:21:32 +02:00
Aaron Marcher
2bd581a47b battery_state: Unify unknown state with "?" symbol 2018-05-02 08:16:21 +02:00
Aaron Marcher
4f5ac5d9fe Remove battery_power for various reasons
- Battery power cannot be easily gatherable via apm(4)
- IMHO it does not represent essential information
2018-05-01 21:01:25 +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
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
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
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
489c6f87d1 temp: Port to OpenBSD
In OpenBSD temperature gets fetched using sysctl now.
2018-04-29 18:35:41 +02:00
parazyd
d66e775c8d Add OpenBSD support in volume.c 2018-04-29 15:57:17 +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
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
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
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
ebf5a35052 Build Linux-only functions only on Linux 2018-03-18 23:26:13 +01:00
Aaron Marcher
fa62e8199e
Fix a bug in wifi_essid().
When an invalid interface name is passed to wifi_essid() it does not
close opened sockets.
2018-01-06 23:37:09 +01:00
parazyd
d2988c72e3
Return actual percentage for wifi_perc()
Implement basic percentage calculation for wifi_perc. With this
commit, the function returns correct percentage, since the max
of what /proc/net/wireless returns is 70.
2017-10-24 11:16:54 +02:00
Laslo Hunhold
7246dc4381
Move components into dedicated subdirectory
This brings us a lot more tidiness.
2017-09-24 17:20:27 +02:00