aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Inggs <ginggs@debian.org>2018-02-05 14:56:20 +0200
committerGraham Inggs <ginggs@debian.org>2018-02-05 14:56:20 +0200
commiteaddd9a5da4a652cd3eabd8b44f5bafead8db2b7 (patch)
tree89c6c76902c79e65752efd51607761f9e1e9a5eb
parenta3ab4a38d3816c72a7b5969ab9c10f1862fbaa5a (diff)
downloaddebian_htop-eaddd9a5da4a652cd3eabd8b44f5bafead8db2b7.tar.gz
debian_htop-eaddd9a5da4a652cd3eabd8b44f5bafead8db2b7.tar.bz2
debian_htop-eaddd9a5da4a652cd3eabd8b44f5bafead8db2b7.zip
Refresh debian/patches/601-openvz-new-ctid-vpid.patch
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/601-openvz-new-ctid-vpid.patch22
2 files changed, 12 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 94f4fd2..d324226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ htop (2.1.0-1) UNRELEASED; urgency=medium
[ Graham Inggs ]
* New upstream release 2.1.0 (Closes: #889634)
+ * Refresh debian/patches/601-openvz-new-ctid-vpid.patch
[ Helmut Grohne ]
* Fix FTCBFS: Annotate python-minimal build dependency with :native.
diff --git a/debian/patches/601-openvz-new-ctid-vpid.patch b/debian/patches/601-openvz-new-ctid-vpid.patch
index 83ed8b7..c5997e2 100644
--- a/debian/patches/601-openvz-new-ctid-vpid.patch
+++ b/debian/patches/601-openvz-new-ctid-vpid.patch
@@ -18,7 +18,7 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru
3 files changed, 30 insertions(+), 19 deletions(-)
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
-@@ -114,7 +114,7 @@ typedef struct LinuxProcess_ {
+@@ -119,7 +119,7 @@
double io_rate_write_bps;
#endif
#ifdef HAVE_OPENVZ
@@ -27,7 +27,7 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru
unsigned int vpid;
#endif
#ifdef HAVE_VSERVER
-@@ -251,6 +251,9 @@ LinuxProcess* LinuxProcess_new(Settings*
+@@ -271,6 +271,9 @@
void Process_delete(Object* cast) {
LinuxProcess* this = (LinuxProcess*) cast;
Process_done((Process*)cast);
@@ -37,16 +37,16 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru
#ifdef HAVE_CGROUP
free(this->cgroup);
#endif
-@@ -321,7 +324,7 @@ void LinuxProcess_writeField(Process* th
+@@ -361,7 +364,7 @@
}
#endif
#ifdef HAVE_OPENVZ
-- case CTID: snprintf(buffer, n, "%7u ", lp->ctid); break;
-+ case CTID: snprintf(buffer, n, "%8.8s ", lp->ctid); break;
- case VPID: snprintf(buffer, n, Process_pidFormat, lp->vpid); break;
+- case CTID: xSnprintf(buffer, n, "%7u ", lp->ctid); break;
++ case CTID: xSnprintf(buffer, n, "%8.8s ", lp->ctid); break;
+ case VPID: xSnprintf(buffer, n, Process_pidFormat, lp->vpid); break;
#endif
#ifdef HAVE_VSERVER
-@@ -396,7 +399,7 @@ long LinuxProcess_compare(const void* v1
+@@ -441,7 +444,7 @@
#endif
#ifdef HAVE_OPENVZ
case CTID:
@@ -57,7 +57,7 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru
#endif
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
-@@ -106,7 +106,7 @@ typedef struct LinuxProcess_ {
+@@ -111,7 +111,7 @@
double io_rate_write_bps;
#endif
#ifdef HAVE_OPENVZ
@@ -68,7 +68,7 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru
#ifdef HAVE_VSERVER
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
-@@ -336,27 +336,35 @@ static bool LinuxProcessList_readStatmFi
+@@ -480,27 +480,35 @@
#ifdef HAVE_OPENVZ
static void LinuxProcessList_readOpenVZData(LinuxProcess* process, const char* dirname, const char* name) {
@@ -82,8 +82,8 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru
return;
- }
char filename[MAX_NAME+1];
-- snprintf(filename, MAX_NAME, "%s/%s/stat", dirname, name);
-+ snprintf(filename, MAX_NAME, "%s/%s/status", dirname, name);
+- xSnprintf(filename, MAX_NAME, "%s/%s/stat", dirname, name);
++ xSnprintf(filename, MAX_NAME, "%s/%s/status", dirname, name);
FILE* file = fopen(filename, "r");
if (!file)
return;

© 2014-2024 Faster IT GmbH | imprint | privacy policy