Commit Graph

886 Commits

Author SHA1 Message Date
Mohammed Ismail Ansari
15429ef58a
format leftover color_degraded and color_bad directives 2020-03-29 18:11:14 -05:00
Mohammed Ismail Ansari
87d3981dd4
add more specificity to describe color_degraded and color_bad 2020-03-29 18:03:51 -05:00
Samuel Holland
585d0700c7 avoid out-of-bounds read after invalid %cpu conversion
In the case where no CPU number is given, skipping a character of
padding actually skips the null terminator, causing further iterations
through the loop to read out of bounds. Have sscanf() return the number
of characters read, instead of reconstructing it from the CPU number.

This was observed as a failure in test 024-cpu-usage-invalid-cpu.
2020-03-28 21:02:02 -05:00
Orestis Floros
3374e1605d
Merge pull request #392 from banderlog/patch-1
add autoconf to requirements
2020-03-19 13:09:23 +01:00
Borys Kabakov
e1b7e6b75a add autoconf to requirements
Update README.md

upd readme
2020-03-16 16:49:47 +02:00
Ingo Bürk
77a330f53a
Merge pull request #391 from niacat/master
print_volume: Native NetBSD audio API support
2020-03-15 12:49:31 +01:00
Ingo Bürk
b7c1307194
Merge pull request #393 from banderlog/patch-2
Update README.md
2020-03-15 12:47:10 +01:00
Borys Kabakov
05bf2e0637
Update README.md
Add configure option to avoid memory leak failures like described in #362
2020-03-12 20:24:33 +02:00
nia
9b8403ac84 print_volume: Native NetBSD audio support
Avoid using the OSS emulation layer to fetch the master volume,
and instead share the audioio code with OpenBSD.

Avoid a failed read on the master control's mute enum if it can't
be found, because sometimes there isn't one.
2020-03-11 23:29:56 +00:00
Ingo Bürk
6eb70f10d2
Merge pull request #390 from Stunkymonkey/format_placeholder-eth
use format_placeholder for eth.info
2020-03-06 13:52:11 +01:00
Ingo Bürk
5576d03f90
Merge pull request #389 from Stunkymonkey/format_placeholder-disk
use format_placeholder for disk.info
2020-03-06 13:51:56 +01:00
Felix Buehler
e60eb9f3d1 use format_placeholder for disk.info 2020-03-03 21:32:49 +01:00
Felix Buehler
48119d890a use format_placeholder for eth.info 2020-03-03 21:31:56 +01:00
Ilya Bystrov
3a4f47295d Wrapper with the ability to add custom info in any position 2020-02-21 21:59:27 +03:00
Ingo Bürk
ae67594b6d
Merge pull request #386 from Stunkymonkey/format_placeholder-date
use format_placeholder for ddate
2020-02-21 17:35:20 +01:00
Felix Buehler
0a5f0ef115 use exact size for known strings 2020-02-21 15:23:37 +01:00
Ingo Bürk
a27ce763f4
Merge pull request #385 from Stunkymonkey/format_placeholder-cpu_temp
use format_placeholder for cpu_temperature
2020-02-20 08:47:27 +01:00
Felix Buehler
3ceb0b8fcf use format_placeholder for ddate 2020-02-18 20:22:36 +01:00
Felix Buehler
2ef1d7440a use format_placeholder for cpu_temperature 2020-02-18 17:51:12 +01:00
Ingo Bürk
b61e959a58
Merge pull request #381 from Stunkymonkey/format_wireless
add wireless format-options
2020-02-17 08:34:09 +01:00
Ingo Bürk
5b115d39f8
Merge pull request #380 from Stunkymonkey/percent-split
use format_placeholder(i3lib) for battery_info
2020-02-17 08:30:44 +01:00
Felix Buehler
42e7147291 add wireless format-options 2020-02-10 22:33:20 +01:00
Felix Buehler
b5a804d1af use format_placeholder for battery 2020-02-10 21:05:18 +01:00
Ingo Bürk
eccd4a7618
Merge pull request #373 from zsugabubus/fix-memory
print_mem: Fix overflow on 32-bit systems
2019-11-25 06:16:16 +01:00
zsugabubus
ad29f204b7
print_mem: Fix overflow on 32-bit systems
Values stored as `unsigned long` in "/proc/meminfo" but they were
handled as `long`.

On 32-bit systems with 4G memory it results in integer overflow.
2019-11-24 23:41:46 +01:00
grmat
abfe05c8bd Introduce format_percentage for battery (#371)
Allow custom output, backwards-compatible to integer_battery_capacity
2019-11-16 16:26:26 +01:00
Ingo Bürk
badef18c22
Merge pull request #369 from 31KM/master
Introduce memory options 'unit' and 'decimals'
2019-10-28 08:38:48 +01:00
MK13
572c96d63e Introduce memory options 'unit' and 'decimals'
Previously the format placeholders were auto-converted to the maximum possible
unit, e.g. /proc/meminfo reports MemTotal of 16307104kB which will get
converted to 15.6GiB. It is now possible to specifiy the target unit, e.g. Mi,
which will be used for the conversion - in the example it would lead to
15924.9MiB.

The resulting number can now be further formatted via the decimal option. It
allows to specify the number of decimals to use, e.g. 15.6GiB vs. 15GiB or
15924.9MiB vs. 15925MiB.
2019-10-26 15:32:32 +02:00
Sascha Wessel
3d6b1b576b wireless: update %signal and %quality based on station info on Linux (#368)
Use station info instead of bss info to update %signal and %quality.
Bss info is based on scan info and doesn't get updated often. Station
info get's updated with every beacon. Bss info still used as fallback.
2019-10-21 08:48:50 +02:00
Michael Stapelberg
807b72a8b1
Merge pull request #366 from duskCoder/patch-slurp
Fix propagation of read error from slurp.
2019-09-19 16:07:59 +02:00
Olivier Gayot
49cf3d7edb Mention the return value of the slurp function and the implications
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2019-09-19 15:48:59 +02:00
Olivier Gayot
4cf8bebf71 Do not return true from slurp() if it failed to read
Failing to read() some data into the destination buffer from the slurp()
function was not considered an error. This means that we were
potentially leaving the caller with an uninitialized destination buffer
without letting him know it's uninitialized.

It is quite unlikely that a single call to read() would ever fail right
after a successful call to open(..., O_RDONLY). However, one practical
example of this happening is when the file being opened is actually a
directory.

Fixed by propagating the error (i.e. returning false from slurp()) if
the call to read() fails.

Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2019-09-19 15:47:14 +02:00
Thomas Klausner
5aec4a5da3 Improve NetBSD port. (#361)
Detect and link against ossaudio.

Comment out unused code and functions.
2019-07-29 13:46:20 -07:00
Michael Stapelberg
e84f9588df print_cpu_usage: use buffered file API
fixes #343
fixes #344
2019-07-29 21:46:08 +02:00
Michael Stapelberg
23da59920c make pulseaudio an optional dependency, follow best practices
For my thoughts about optional dependencies, see
https://michael.stapelberg.ch/posts/2019-05-23-optional-dependencies/

This commit follows the best practices outlined in that article:

1. The travis config was modified to verify both code paths build and link/don’t
   link against pulseaudio.

2. If pulseaudio is missing, the build fails until packagers explicitly pass a
   --disable flag. In practice, I think the only situation when this flag should
   be set is in source-based linux distributions where users can express
   package-level compilation preferences (e.g. Gentoo USE flags).

3. The --version output now reflects the status of the optional dependency.

fixes #359
2019-07-29 21:07:40 +02:00
Ingo Bürk
40aeb7bc44
Merge pull request #360 from 0-wiz-0/master
On NetBSD, include sys/socket.h for AF_INET{,6}.
2019-07-22 10:09:56 +02:00
Thomas Klausner
667e38abab On NetBSD, include sys/socket.h for AF_INET{,6}. 2019-07-21 21:17:59 +02:00
Ingo Bürk
86a4ff0333
Merge pull request #355 from jasperla/header_fix
Fix headers meant for OpenBSD, but snuck in for FreeBSD
2019-07-21 15:28:40 +02:00
Michael Stapelberg
54e798e3a6 configure: disable pulse on OpenBSD and DragonFlyBSD
This matches the conditional compilation in the code and is more correct than
distinguishing linux vs. non-linux (which breaks on Debian’s kFreeBSD and hurd
variants).

Thanks to sdk for providing an OpenBSD 6.5 environment for verification. This
has not been tested on DragonFlyBSD.

related to #352
2019-07-12 14:46:55 +02:00
Michael Stapelberg
02a47cd196 battery: include sys/sysctl.h on OpenBSD
This is required so that CTL_HW and others are defined (ran into this on OpenBSD
6.5).
2019-07-12 14:44:03 +02:00
Michael Stapelberg
1999d5cf55 conditionally compile pulse.c only when using pulseaudio
fixes #352
2019-07-11 15:23:08 +02:00
Jasper Lievisse Adriaanse
70b954b122 Fix headers meant for OpenBSD, but snuck in for FreeBSD 2019-07-08 20:14:59 +02:00
Jasper Lievisse Adriaanse
3a51673c05 Extend battery handling on OpenBSD (#351)
If acpibat watts value is not available, try current (for batteries
that report in amps), then convert to watts.

originally submitted by @jcs
2019-07-08 17:53:25 +02:00
Michael Stapelberg
f791b4af3f release v2.13 2019-06-30 19:55:28 +02:00
Ingo Bürk
bd7de0c8ff
Merge pull request #347 from thrasymache/overflow
print_file_contents: allocate enough to include \0
2019-06-18 09:33:47 +02:00
Sam Newbold
300b31b2df
print_file_contents: allocate enough to include \0
related to #331
Previously, if max_chars was read, the null byte would be written
past the end of buf.
2019-06-10 16:36:18 +02:00
Dennis Vesterlund
9b5f6ae5f4 Added function to print content from file (#331)
Added a function to print file contents to status bar without newlines.
Added tests for print file contents function
Added manpage entry for file contents
2019-02-21 15:34:32 +01:00
Michael Stapelberg
9d28a661a7 configure.ac: complain when asciidoc cannot be found
related to #338
2019-02-11 21:45:20 +01:00
Michael Stapelberg
fd484c6c58 configure.ac: complain when xmlto cannot be found
related to #338
2019-02-11 21:43:35 +01:00
Michael Stapelberg
4c047e3aa4 Makefile.am: s/I3LOCK/I3STATUS/ 2019-02-11 19:52:19 +01:00