diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:10:31 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:10:31 -0300 |
| commit | f5ed25b75901e05f9933b548c8bbdda654608c32 (patch) | |
| tree | 37db6969ba4d61e110bab354ab6dc0db64f0a633 /extra/htop | |
| parent | 1200fd46a32625f2ac4b035653cb49c22cce6426 (diff) | |
| parent | bc0657f7159d0b01373ecb59afc426b98a172b1e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dangerdeep/PKGBUILD
community/lsb-release/PKGBUILD
community/perl-gtk2-mozembed/PKGBUILD
extra/camsource/PKGBUILD
extra/gsf-sharp/PKGBUILD
extra/muine/PKGBUILD
extra/ocfs2-tools/PKGBUILD
extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
Diffstat (limited to 'extra/htop')
| -rw-r--r-- | extra/htop/fix-segfault-small-terminal.patch | 24 | ||||
| -rw-r--r-- | extra/htop/fix-sort-key-bug.patch | 15 |
2 files changed, 0 insertions, 39 deletions
diff --git a/extra/htop/fix-segfault-small-terminal.patch b/extra/htop/fix-segfault-small-terminal.patch deleted file mode 100644 index c55146492..000000000 --- a/extra/htop/fix-segfault-small-terminal.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- trunk/Meter.c 2011/08/26 20:52:35 229 -+++ trunk/Meter.c 2011/08/26 20:55:09 230 -@@ -264,13 +264,19 @@ - - w--; - x++; -- char bar[w]; -+ -+ if (w < 1) { -+ attrset(CRT_colors[RESET_COLOR]); -+ return; -+ } -+ char bar[w + 1]; - - int blockSizes[10]; - for (int i = 0; i < w; i++) - bar[i] = ' '; - -- sprintf(bar + (w-strlen(buffer)), "%s", buffer); -+ const size_t barOffset = w - MIN(strlen(buffer), w); -+ snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer); - - // First draw in the bar[] buffer... - double total = 0.0; diff --git a/extra/htop/fix-sort-key-bug.patch b/extra/htop/fix-sort-key-bug.patch deleted file mode 100644 index 41a2dd377..000000000 --- a/extra/htop/fix-sort-key-bug.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Roman Kosenko <madkite@gmail.com> -Date: Thu, 10 Mar 2011 16:23:53 +0200 -Subject: [PATCH] Fix stupid bug with --sort-key - ---- htop.c.old 2010-11-24 20:45:38.000000000 +0200 -+++ htop.c 2011-03-10 16:32:18.473716667 +0200 -@@ -282,7 +282,7 @@ - printVersionFlag(); - break; - case 's': -- if (strcmp(optarg, "help")) { -+ if (!strcmp(optarg, "help")) { - for (int j = 1; j < LAST_PROCESSFIELD; j++) - printf ("%s\n", Process_fieldNames[j]); - exit(0); |