zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,916 Commits 1 Branch 38 Tags 5.9 MiB
Commit Graph

1916 Commits

Author SHA1 Message Date
Christian Göttsche e7f6d1ce5f Reduce oom cast from long to int 
Oom values should never be greater then INT_MAX, they should be in the
range 0 - 1000.

Improves: d9a5dd4b91
 2020-08-31 11:55:53 +02:00
Nathan Scott 47a7d0bd74 Merge branch 'configure' of https://github.com/cgzones/htop into cgzones-configure 2020-08-31 17:13:37 +10:00
Nathan Scott b321177b08 Merge branch 'master' of github.com:htop-dev/htop 2020-08-31 16:57:46 +10:00
Nathan Scott 800d8c735d Merge branch 'cov_fixes' of https://github.com/cgzones/htop into cgzones-cov_fixes 2020-08-31 16:56:32 +10:00
Daniel Lange f14173038e Merge branch 'oom' of https://github.com/cgzones/htop 
Closes: #18, #22
 2020-08-31 08:32:39 +02:00
Nathan Scott fdf8a28e60 Merge branch 'Ckath-vim_mode_setting' 2020-08-31 16:14:48 +10:00
Nathan Scott 244630f67f Merge branch 'vim_mode_setting' of https://github.com/Ckath/htop into Ckath-vim_mode_setting 2020-08-31 16:14:40 +10:00
Nathan Scott 0a835e13bf Simplify the --version output, old dates are confusing people 
Drop the copyright notice from the version output as a number
of people seem to be confused by what this means, and we can
do without all the (well intentioned) bug reports.
 2020-08-31 16:14:23 +10:00
Nathan Scott 4bd0859b80 Add a badge/link to the released source tarballs 2020-08-31 16:12:44 +10:00
ckath 338bd829b0 add toggle for vim mode in options 2020-08-29 15:15:52 +02:00
Christian Göttsche 5c99c6e942 Check btime sscanf parse from /proc/stat 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche a850d81bf5 Avoid use of uninitialized variables 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche 05a5fdc47f Ignore sscanf return value of /proc/stat 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche af84d3dfa9 Fail on out-of-range CPU number 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche df41979afc Ignore wmove return value 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche d9a5dd4b91 Improve OOM output 
* Fix sort by adding cast
* Shrink column size to 4
* Drop unnecessary maximum field width specifier in sscanf
 2020-08-28 14:24:59 +02:00
Christian Göttsche a48ce9d103 Really tell gcc to ignore return value of fscanf 2020-08-28 13:10:41 +02:00
Christian Göttsche 3f5784a3f0 Convert hwlock CI run to a full featured one 2020-08-28 13:10:41 +02:00
Christian Göttsche 3b084db1c4 Print configured state 2020-08-28 13:10:41 +02:00
Christian Göttsche 979d004214 Improve indent 2020-08-28 13:10:16 +02:00
Christian Göttsche 5bee902665 Drop configure option --enable-proc 
Move to HTOP_LINUX, as --enable-proc implies my_htop_platform=linux, and
the Linux features do not work without a proc fs.
 2020-08-28 13:10:16 +02:00
Redha Gouicem 3ef5df25bc always display frequency in MHz 2020-08-28 12:15:32 +02:00
Nathan Scott 2d14269bcd
Merge pull request #14 from zdykstra/master 
Normalize ZFS ARC caption
 2020-08-28 16:58:06 +10:00
Nathan Scott b992d52bcf Increae the size of sysfs power supply path buffers 
Resolves https://github.com/htop-dev/htop/issues/15
 2020-08-28 16:57:21 +10:00
Zach Dykstra f97fbd668a Normalize ZFS ARC caption 
Other captions take the form of LABEL:<space>. This moves the
uncompressed ZFS ARC caption into the same style.
 2020-08-28 00:02:35 -05:00
Nathan Scott b5e6952cc6 Update link to Coverity project, still pending. 2020-08-27 10:42:40 +10:00
Nathan Scott 4a8ae4b5d4 Merge branch 'bertwesarg-affinity-fix-panel-width' 2020-08-27 09:36:56 +10:00
Bert Wesarg 94b8c2e714 fix width of `AffinitPanel` 
The panel size of 15 includes the gap to the next panel, thus use 14 as
the minimum size and let the caller of `AffinityPanel_new` handle the
gap.
 2020-08-26 22:03:11 +02:00
Nathan Scott df7e4fcdc0 Update changelog with Berts latest addition 2020-08-26 10:44:22 +10:00
Nathan Scott 728b04bbb5 Merge branch 'ci-hwloc-job' of https://github.com/bertwesarg/htop into bertwesarg-ci-hwloc-job 2020-08-26 10:39:43 +10:00
Nathan Scott d0f31ede56 Merge branch 'ci-hwloc-job' of https://github.com/bertwesarg/htop into bertwesarg-ci-hwloc-job 2020-08-26 10:15:00 +10:00
Nathan Scott ba94e0dfda Merge branch 'ci2' of https://github.com/cgzones/htop into cgzones-ci2 2020-08-26 10:08:50 +10:00
Christian Göttsche fc4f74aa47 ci: add clang build 2020-08-25 12:01:56 +02:00
Christian Göttsche 4e2b9f0965 Avoid shadowing warnings 2020-08-25 12:01:56 +02:00
Christian Göttsche b4ceb83d76 MakeHeader.py.in: remove unused import 2020-08-25 12:00:08 +02:00
Christian Göttsche 1130ad8b73 MakeHeader.py.in: remove executable bit 2020-08-25 12:00:08 +02:00
Christian Göttsche 11f558f934 Avoid discarding const qualifiers 2020-08-25 12:00:03 +02:00
Christian Göttsche 7457bfe9f3 Avoid string overflow warning 
Use xStrdup instead of xMallow and strncpy

    StringUtils.c: In function ‘String_split’:
    StringUtils.c:86:7: error: ‘strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
       86 |       strncpy(token, s, size + 1);
          |       ^
    StringUtils.c:84:18: note: length computed here
       84 |       int size = strlen(s);
          |                  ^
 2020-08-25 11:59:59 +02:00
Christian Göttsche 21fb56e1e2 Avoid string overflow warning 
Enough memory is allocated.

    Header.c: In function ‘Header_readMeterName’:
    Header.c:157:4: error: ‘strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
      157 |    strncpy(name, Meter_name(meter), nameLen);
          |    ^
    Header.c:154:18: note: length computed here
      154 |    int nameLen = strlen(Meter_name(meter));
          |                  ^
 2020-08-25 11:59:59 +02:00
Christian Göttsche 6b11769448 Avoid conversion warning 
linux/Platform.c:47:90: error: implicit conversion from ‘enum LinuxProcessFields’ to ‘enum ProcessFields’ [-Werror=enum-conversion]
       47 | ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
          |
 2020-08-25 11:59:53 +02:00
Bert Wesarg d64a6a2453 CI: Add a HWLOC enabled job 2020-08-25 11:42:21 +02:00
Bert Wesarg 345d415537 Do not include the generated `config.h` header into the package 2020-08-25 11:42:16 +02:00
Bert Wesarg 054b7f2801 Fix out-of-tree builds 2020-08-25 10:36:27 +02:00
Daniel Lange e172282002 Fix in AC_CONFIG_FILES, try #2 2020-08-24 21:37:28 +02:00
Daniel Lange 0bac7c9d94 Nope, configure works but make breaks. 
This reverts commit dad62b6c9e.
 2020-08-24 21:08:07 +02:00
Daniel Lange dad62b6c9e Put Makeheader.py.in into AC_CONFIG_FILES 2020-08-24 21:01:50 +02:00
Nathan Scott 9eb9064fbd Cleanup unused CI build notes and whitespace 2020-08-24 10:22:44 +10:00
Nathan Scott 9e57b5c3f4 Generate an appropriate shebang line for MakeHeader script 
Use configure.ac to handle platform differences where some
build hosts have only a python3, or only python, binary.

Related to https://github.com/htop-dev/htop/pull/6
 2020-08-23 11:24:52 +10:00
Nathan Scott b3aef4ea3a Revert "MakeHeader.py: use python3 shebang" 
This reverts commit 40ac7a88af.
as it causes build failure on non-python3 platforms.
 2020-08-23 09:42:11 +10:00
Nathan Scott 6900e57efd Updates to project URLs in docs and embedded in source code 2020-08-22 15:47:11 +10:00