1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-19 19:45:15 +00:00
Commit Graph

2244 Commits

Author SHA1 Message Date
Pavel Labath
5ded90e22a Fix wlan stats segfault (sf.net #3581218)
Sometimes wlan related TEXT causes segment fault, and backtrace shows it's strtok in
iw_get_stats.

I read the code of wireless_tools, which says 'strtok not thread safe, not used in WE-12 and
later' for iw_get_stats. But it need to first check if has_range and then we_version_compiled.

In conky/src/linux.cc, iw_get_stats is called before iw_get_range_info, hence has_range is always
0 in iw_get_stats and strtok is used. I simply move iw_get_range_info before iw_get_stats and no
segfault up to now.

patch by ruikai
2012-11-01 15:04:08 +01:00
Pavel Labath
cbc131ea6c Fix curl-related crashes (sf.net #3386728)
curl implements some of the timeouts using alarm(), where the alarm handler longjmp()s back into the
curl code. This is a bad idea in multi-threaded applications, since it is not guaranteed that
SIGALARM will be recieved by the correct thread. Therefore, we instruct curl to avoid using
signals.

Conflicts:

	src/ccurl_thread.c
2012-10-24 23:25:10 +02:00
Pavel Labath
5177c8d282 MPD: add mpd_albumartist (sf.net #3532376)
Adds mpd_albumartist support as an object since mpd_artist lists all participating artists of the
current song and not the main album artist.

patch by Sébastien Lavoie-Courchesne
2012-10-07 12:07:38 +02:00
Kevin Lyles
09467931d4 Fix graph auto-scaling when the width is 0 2012-10-03 22:45:13 +02:00
Pavel Labath
6f62e113f1 Do not truncate non-human-readable numbers to 32bit (sf.net #3564560)
patch by hdastwb
2012-09-04 12:58:54 +02:00
Nikolas Garofil
a0052f6b19 Fix building without X11
Fix by Scott Moreau
2012-08-26 13:53:25 +02:00
Nikolas Garofil
79636ef8dd Merge branch 'master' of git://git.omp.am/conky 2012-07-25 21:34:32 +02:00
Nikolas Garofil
19b9441704 fix if_existing bugs
- it was returning reverse results when searching strings in file
- if didn't detect that files didn't exist when searching for strings
2012-07-20 13:44:53 +02:00
Pavel Labath
8bae807f68 Add a missing include 2012-07-19 18:42:34 +02:00
Nikolas Garofil
3cca68ed3e Fix -i, -u, -x and -y option 2012-07-17 00:05:54 +02:00
Pavel Labath
b34a1a21e7 Use lround instead of std::lround
for unknown reasons DragonFly's gcc does not have lround in the std namespace
cf. sf.net #3289079
2012-07-13 20:17:54 +02:00
Magliano Andrea
abdb5582bd Proper handle missing statfs64
statfs64 ist atm linux specific; wrap statfs around it.

Also cleanup param.h and mount.h including: the assumption in fs.cc
that their presence is a sign of *BSDs is wrong, as they exist in
linux too with different meaning.

Besides presence of mount.h isn't detected in Conky.cmake, so
conditional including mount.h in fs.cc is useless. Is just works
because mount.h and param.h are included in freebsd.h and dragonfly.h
later on. They are unneded in linux.

Just remove conditional including of mount.h and param.h in fs.cc,
conditional wrap statfs64 in proper *BSD header files.
2012-07-06 15:13:59 +02:00
Pavel Labath
31c2f82842 Fall back to statfs if statfs64 not present
mostly needed for the dragonfly port (sf.net #3289079)
2012-07-05 16:41:58 +02:00
Pavel Labath
fa575171c4 Remove -D_GNU_SOURCE and do not use GNU extensions
we hope to compile on non-GNU systems as well
2012-07-01 15:05:27 +02:00
Magliano Andrea
78b1daf848 Update docs + minor changes
* document DragonFly specific $version variable
* add sample conky config file
* some dragonfly.cc code cleanup
2012-06-28 19:05:28 +02:00
Magliano Andrea
d5af1be997 Forgot the very new stuff (dragonfly.cc dragonfly.h)
this actually pertains to 24aaeb2b15e317211af7c94ffddf7b1da1493372
2012-06-28 19:05:07 +02:00
Magliano Andrea
9268165d71 Usable state reached (use top.cc + minor changes)
* process* management left to top.cc
* compile with -Wall -Werror (lots of wasted time for stupid errors)
* unify find_process() and new_process(), as used always together

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 19:04:31 +02:00
Magliano Andrea
98196d0e6b Preliminary import from 2.8.1 git release
* don't use kvm_* calls, just sysctl (so no suid perm necessary)

* sysctls calls in general aren't thread safe, collapse callbacks
  using same sysctls (specifically total/running procs and proc list
  ones).

  Some sysctls need two calls (first to get size of obj returned,
  second to get object self); if different threads use this schema
  on same sysctl, weird values are returned (first/second calls
  sequence should be serialized).

  In general it makes not much sense too having more threads that use
  the same sysctl; just get info once and populate all data.

* add DragonFly specific extended uname string ($version in conky.conf)
  with git version and signature

Todo:

- top process list logic is old style, use top.cc funcs.
- find a solution for cpu freq

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 18:56:01 +02:00
Pavel Labath
4c1ec83174 Fix "Using log-scaled graph with show_graph_scale causes segfault" (sf.net #3538674)
bug reported by Nikslay
2012-06-28 18:26:49 +02:00
Pavel Labath
6b0d6a9f32 Fix a segfault in graph drawing code (sf.net #3537523)
PS: boy, is that code messy or what

bug reported by b3niup
2012-06-26 22:43:12 +02:00
Pavel Labath
b5dc59e9b2 Fix building with BUILD_HTTP
bug reported by arclance
2012-06-04 23:29:27 +02:00
Pavel Labath
dea2c56582 Fix building on Debian GNU/kFreeBSD (sf.net #3525356) 2012-06-04 16:27:36 +02:00
Pavel Labath
1e5eba211d Fix `lua hooks are not being called' (sf.net #3501425) 2012-06-03 16:52:16 +02:00
Pavel Labath
11e32706d4 Fix `using "draw_shades yes" lua script runs twice per update' (sf.net #3524540)
bugreported by arclance
2012-06-03 16:24:37 +02:00
Brenden Matthews
ddef05d4eb Update version, copyright. 2012-05-03 16:34:44 -07:00
Kevin Lyles
810535a386 Fix overflow in comparisons.
Fix other comparison issues (integer truncation, overflow in cpu time)

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2012-05-03 14:08:04 -07:00
Jim Duchek
413ad89ecf Fixed version string
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2012-05-03 14:06:50 -07:00
Jim Duchek
13a324a462 Remove comment
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2012-05-03 14:06:50 -07:00
Jim Duchek
bf7248ecd6 Fixed GCC 4.7.0 issues, double buffering
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2012-05-03 14:06:50 -07:00
Brenden Matthews
cf7610cf42 Build fix for defconfig.h. 2012-03-07 13:43:26 -08:00
Brenden Matthews
19fc6e1a75 Build fix for Lua >=5.2.
See Gentoo bug at https://bugs.gentoo.org/show_bug.cgi?id=407089.
2012-03-07 13:37:41 -08:00
Pavel Labath
be4854c6bb add mpd_date function that shows date for current track (sf.net #3440445)
patch submitted by Andrey Tikhonov
2012-01-29 21:14:19 +01:00
Nikolas Garofil
6cce8e8e11 fix wrong alignments when font changes (sf.net #3461442) 2012-01-12 20:55:11 +01:00
Nikolas Garofil
59f79105bd Show "No Address" instead of "::" when there is no address 2012-01-09 11:20:53 +01:00
Nikolas Garofil
2039d6232e bugfix: $v6addr shows addresses double 2012-01-09 00:23:09 +01:00
Nikolas Garofil
7702c525a7 remove removed network devices (sf.net #3468653) 2012-01-08 15:45:08 +01:00
Pavel Labath
9df83969e7 Fix "rhost undeclared" (sf.net #3466456)
patch by Jaromír Cápík
2012-01-03 10:39:12 +01:00
Pavel Labath
09dd497314 Second part of the statfs64 patch
this also fixes the $fs_type variable.
2011-11-02 19:18:02 +01:00
Pavel Labath
3ed782c75c A slightly better fix for the double-free problem
one of those frees is completely unnecessary
2011-11-01 19:10:37 +01:00
Pavel Labath
749328456b Avoid double free on tempgrad graphs
bug reported by billie.
2011-11-01 19:06:41 +01:00
Pavel Labath
dccf796b42 Use statfs64 for $fs_* to support very large volumes
bug reported by puppetm.
2011-11-01 16:17:15 +01:00
Brenden Matthews
b3e706aefd RFC 3501 only requires + for IMAP continuation. 2011-10-31 15:17:47 +01:00
Brenden Matthews
e9a5b23711 Fix another regression from c1277d650b. 2011-10-31 15:16:54 +01:00
Brenden Matthews
e08ccb7512 Fix for regression introduced by 951cb1ac7e. 2011-10-31 13:41:30 +01:00
Pavel Labath
4463a100ba Increase MAX_NET_INTERFACES to 64
also change a magic constant in net_stat.h to reflect the fact that it depends on
MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505

ps: this should really be solved in a more need way, without the need for static arrays
2011-10-25 19:00:39 +02:00
Pavel Labath
951cb1ac7e Fix graph updating for large (>512pix) graphs (sf.net #3253656)
apparently, this was actually a feature as someone made it deliberately act that way. However, I
agree with the bug reporter that it is strange so I remove it.
2011-10-23 22:34:51 +02:00
Pavel Labath
6482283c03 Revert default value of alignment to BOTTOM_LEFT
previous default value NONE behaved strangely in combination with other default settings.
2011-10-23 22:26:15 +02:00
Pavel Labath
04a9a7f137 Fix xmms2 stream updating (sf.net #3150884)
Currently the variables related to xmms2 in conky do not update if the currently playing track
has any of its information updated (ie: the title changes). This results in incorrect behaviour
for streams where the same track is continually played but the title and artist change as new
songs are played. The attached patch corrects this issue by changing conky to respond to a
callback that fires when xmms2 media library entries are updated. After the callback fires, the
patch checks to see if the media library entry that changed corresponds to the currently playing
song and if it does updates the conky xmms2 related variables accordingly.

A different version of the patch was previously submitted and accepted into conky. Unfortunately,
this patch contained a bug that caused conky xmms2 variables to be updated when any media library
information was updated. However, the previous patch was reverted as a result of a commit the
made conky compatible with a new version of the xmms2 client api.

Patch submitted by Tamim Khan.

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2011-10-19 16:38:26 +02:00
Pavel Labath
cd9cd2151b Support IMAP responses which arrive fragmented (sf.net #3182411)
bug reported by Richard De Boer
2011-10-16 12:24:26 +02:00
Pavel Labath
8e3df58eea Ignore whitespace in parameters of $pid_* (sf.net #3423766)
This enables one to pass the output of $top to these variables. It was not possible before,
because $top pads the pids with spaces.
2011-10-15 14:27:09 +02:00