summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-22Merge pull request #290 from duskCoder/changesIngo Bürk
Fix potential issues & avoid unnecessary instructions
2018-06-20Prevent potential crash if glob() failsOlivier Gayot
Calling globfree(NULL) is undefined behaviour. In Linux (glibc), it results in a segmentation fault. It is also undefined behaviour to call globfree(&pglob) if a previous call to glob(&pglob) returned an error. Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20Fix potential memory leak on LinuxOlivier Gayot
The function slurp_all_batteries(), on Linux, allocates memory dynamically Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20Fix invalid handling of glob() errors on LinuxOlivier Gayot
The manual of glob(3) says that the function returns 0 on successful completion. Any other integer value should be considered an error, not only negative integers. In practice, *BSD systems use negative values but Linux uses positive integers. Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20Fix use of undefined macro __OpenBSD__Olivier Gayot
Compiling on Linux with -Wundef produces the following warning: warning: "__OpenBSD__" is not defined, evaluates to 0 [-Wundef] Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20Avoid assigning a new value to a var before using the old valueOlivier Gayot
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20Make sure the arguments passed to printf/die(...) match the formatOlivier Gayot
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20No longer use a temporary buffer in the die() functionOlivier Gayot
Before the following change f947d0a Breaks configfiles! Major refactoring of i3status, see below The die(fmt, ...) function was outputting the reason to the status bar in addition to stderr. For this reason, it was meaningful to create a temporary string according to the format string and then passing it around to the different functions. Nowadays, we only display the error message to stderr so calling fprintf(stderr, ...) is much simpler. Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-20Merge pull request #289 from bebehei/testsuiteIngo Bürk
Testsuite
2018-06-19Show differing results, if testcase failsBenedikt Heine
2018-06-19Run all travis tests and expose the final result as exit codeBenedikt Heine
2018-06-19Expose the testsuite in the MakefileBenedikt Heine
2018-06-19Fail the tests, if i3status actually crashesBenedikt Heine
2018-06-16Merge pull request #287 from eplanet/emeric/man_typoIngo Bürk
Fix man typo
2018-06-14Fix man typoeplanet
2018-06-11Merge pull request #286 from duskCoder/#283Ingo Bürk
Fix issue #283 (shown IP belonging to wrong network interface)
2018-06-11Fix shown IP address belonging to wrong interfaceOlivier Gayot
The following commit: 6a75ea9 Show IP address when address has a label introduced a way to show the IP address of an interface when a label is associated to the IP. When a label is associated to an IP, the structure returned by getifaddrs() has the label concatenated to the interface name in the .ifa_name field as in the following example: struct ifaddrs ifaddr = { .ifa_name = "eth0:mylabel", }; As a consequence, using a strict comparison between the interface name and the .ifa_name field yields a falsy result. However, checking if the .ifa_name starts with the interface name (e.g. eth0) does not work either because other network interfaces can have a name which starts with eth0. This commit solves the issue by stripping out the optional label from the .ifa_name field before making a strict comparison with the interface name. Fix #283 Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-04Simplify the algorithm used to determine the IP addressOlivier Gayot
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-05-22Merge pull request #282 from Stunkymonkey/mem-supportIngo Bürk
fix wrong memory-documentation
2018-05-22fix wrong memory-documentationFelix Buehler
2018-05-19Merge pull request #270 from Stunkymonkey/mem-supportIngo Bürk
initial support of memory-usage for linux
2018-05-15Merge pull request #281 from eplanet/fix_warningsOrestis
Fix MacOS build
2018-05-15Fix MacOS buildeplanet
2018-05-11release v2.122.12Michael Stapelberg
2018-05-04Simplify the memory thresholdsBenedikt Heine
2018-05-04Rename ram variables consistentlyBenedikt Heine
2018-04-11Implement support for memory-usage on LinuxFelix Buehler
2018-04-08Merge pull request #275 from winks/patch-2Ingo Bürk
Fix NULL value on OpenBSD when there is no acpitz0
2018-04-06Fix NULL value on OpenBSD when there is no acpitz0Florian Anderiasch
Using %degrees on OpenBSD resulted in garbage values if sysctl doesn't know about any cpu temperature sensors.
2018-03-29Merge pull request #213 from dlrobertson/addr_descriptionIngo Bürk
Show IP address when address has a label
2018-03-29Show IP address when address has a labelDan Robertson
If an address has been added with a label, ensure the correct address is shown.
2018-03-27Merge pull request #264 from foutaise/masterIngo Bürk
Make iface_type() work on FreeBSD
2018-03-27Merge branch 'master' into masterIngo Bürk
2018-03-27Merge pull request #251 from tomaskrizek/man-eth-wireless-formatIngo Bürk
man: explicitly use format_up/format_down in ethernet, wireless conf
2018-03-27Merge pull request #243 from jasperla/fei_errorIngo Bürk
Remove overly aggressive #error
2018-02-12Merge pull request #266 from moreais/masterIngo Bürk
OpenBSD: fix volume display on some hardware
2018-02-13OpenBSD: fix volume display on some hardwareCarlin Bingham
On some hardware the AUDIO_MIXER_READ ioctl requires the current number of channels to be set, and the mute device found needs to be checked if it belongs to the master output device.
2018-02-07Make iface_type() work on FreeBSDGerome Fournier
2018-02-06Merge pull request #262 from foutaise/masterIngo Bürk
Add check for interval value
2018-02-06Add check for interval valuefoutaise
2018-02-03Merge pull request #261 from tylerbrazier/no-slocIngo Bürk
Remove SLOC comment from man page
2018-02-02Remove SLOC comment from man pageTyler Brazier
This changed happened for the readme in 73620dc876d7f76b9a6771048c5ad0ade94e5bd7
2018-01-28Treat zero battery capacity as "not available" (#259)johcgt
`print_battery_info` computes `batt_info.percentage_remaining` by dividing batt_info.remaining by `full`. If `full` is `0` then the battery remaining will be reported as "inf". Before this, it tries to set `full` to either the design capacity or to the last known good charge. It determines if these values are available by checking whether their fields in `batt_info` are non-negative. As it initialized `batt_info` with values of `-1`, a non-negative value implies that something has provided a value. `slurp_all_batteries` and `add_battery_info` however initialize these fields to zero, so if these functions are called then `batt_info.full_design` will always be used. This means that on systems that don't provide a value for design capacity the percentage remaining will be reported as "inf", unless the user has set `last_full_capacity` to `true` in their `i3status.conf`. This patch changes `print_battery_info` to expect values for the battery capacity to be strictly greater than zero. This seems reasonable as a battery with a capacity of zero isn't useful. An alternative solution would be to change `slurp_all_batteries` and `add_battery_info` to initialize `batt_info` with `-1`, as `print_battery_info` does. This is less appealing as `add_battery_info` is accumulating the values, so using `-1` would introduce off-by-one errors without additional code to avoid them.
2017-12-12Merge pull request #255 from eplanet/update_readmeIngo Bürk
Get rid of the SLOC comment
2017-12-11Get rid of the SLOC commenteplanet
2017-12-11Update comment as in #247 (#254)Emeric Planet
2017-12-11Add IPv6 address when IPv4 isn't available (#247)Emeric Planet
2017-12-09Merge pull request #253 from eplanet/always_reload_tzIngo Bürk
Call tzset at each time print
2017-12-09Call tzset at each time printeplanet
2017-12-09Merge pull request #252 from GuyOfThePery/patch-1Ingo Bürk
Fixed minor typos