diff options
| author | Eugene V. Lyubimkin <jackyf.devel@gmail.com> | 2008-12-06 11:03:18 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:23 +0200 |
| commit | a16cd75873cfc544e0f1bcf61b593080729b29f9 (patch) | |
| tree | c965d5f2fc6d3b38be5f6512f721e36940c78eda /debian/patches | |
| parent | bcb965d78ae0b4599fe77a2d641b3ff035658fc9 (diff) | |
| download | debian_htop-a16cd75873cfc544e0f1bcf61b593080729b29f9.tar.gz debian_htop-a16cd75873cfc544e0f1bcf61b593080729b29f9.tar.bz2 debian_htop-a16cd75873cfc544e0f1bcf61b593080729b29f9.zip | |
Imported Debian patch 0.8.1-2debian/0.8.1-2
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/010-make-desktop-file-valid.patch | 1 | ||||
| -rw-r--r-- | debian/patches/200-filter-non-printable-characters.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/debian/patches/010-make-desktop-file-valid.patch b/debian/patches/010-make-desktop-file-valid.patch index c115498..24721c8 100644 --- a/debian/patches/010-make-desktop-file-valid.patch +++ b/debian/patches/010-make-desktop-file-valid.patch @@ -1,3 +1,4 @@ +Make desktop file valid. See #488912 in Debian BTS. Index: htop/htop.desktop =================================================================== --- htop.orig/htop.desktop 2008-11-16 22:08:29.670673088 +0200 diff --git a/debian/patches/200-filter-non-printable-characters.patch b/debian/patches/200-filter-non-printable-characters.patch new file mode 100644 index 0000000..3a3867e --- /dev/null +++ b/debian/patches/200-filter-non-printable-characters.patch @@ -0,0 +1,14 @@ +Filters non-printable characters from process names. See #504144 in Debian BTS. +Index: htop/RichString.c +=================================================================== +--- htop.orig/RichString.c 2008-12-06 11:13:19.679940957 +0200 ++++ htop/RichString.c 2008-12-06 11:14:57.454712750 +0200 +@@ -89,7 +89,7 @@ + inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) { + int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len); + for (int i = this->len, j = 0; i < last; i++, j++) +- this->chstr[i] = data_c[j] | attrs; ++ this->chstr[i] = (isprint(data_c[j]) ? data_c[j] : '?') | attrs; + this->chstr[last] = 0; + this->len = last; + } diff --git a/debian/patches/series b/debian/patches/series index 8f8f5d7..3f8b005 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 010-make-desktop-file-valid.patch +200-filter-non-printable-characters.patch |