From 4cb3ab73a43062b527eaf281f8400904d95150e8 Mon Sep 17 00:00:00 2001 From: ahze Date: Tue, 10 Jul 2007 11:47:40 +0000 Subject: Update to 2.19.5 git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9175 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/libgtop/Makefile | 5 +- devel/libgtop/distinfo | 6 +- .../files/patch-sysdeps_freebsd_Makefile.in | 45 ------ .../files/patch-sysdeps_freebsd_glibtop_private.c | 57 ------- .../files/patch-sysdeps_freebsd_glibtop_private.h | 43 ------ .../files/patch-sysdeps_freebsd_glibtop_server.h | 10 -- .../libgtop/files/patch-sysdeps_freebsd_proclist.c | 55 ------- .../files/patch-sysdeps_freebsd_procopenfiles.c | 164 --------------------- devel/libgtop/files/patch-sysdeps_freebsd_procwd.c | 124 ---------------- devel/libgtop/pkg-plist | 1 + 10 files changed, 6 insertions(+), 504 deletions(-) delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.c delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.h delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_glibtop_server.h delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_proclist.c delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c delete mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_procwd.c (limited to 'devel/libgtop') diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index d4f8e94f1..984ac8b70 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.18 2007/06/27 19:03:30 marcus Exp $ +# $MCom: ports/devel/libgtop/Makefile,v 1.19 2007/06/30 16:52:21 marcus Exp $ # PORTNAME= libgtop -PORTVERSION= 2.19.4 -PORTREVISION= 2 +PORTVERSION= 2.19.5 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 1e80151e7..33fe54aa7 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.19.4.tar.bz2) = 1cea9b7a17e90187dad9f6ed46173c85 -SHA256 (gnome2/libgtop-2.19.4.tar.bz2) = 71cb75d66c360f4ad480474fd515850ed3f38aa6fda5556341db2e0164d4b869 -SIZE (gnome2/libgtop-2.19.4.tar.bz2) = 761096 +MD5 (gnome2/libgtop-2.19.5.tar.bz2) = 233dfd63b9dc39f08308e73509edd14d +SHA256 (gnome2/libgtop-2.19.5.tar.bz2) = 12ea0de2917411c556e4f97063abee584b513322377b4db1dc954199ff5c01f7 +SIZE (gnome2/libgtop-2.19.5.tar.bz2) = 763130 diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index e5bba3d58..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig 2007-06-26 00:49:06.000000000 -0400 -+++ sysdeps/freebsd/Makefile.in 2007-06-26 17:59:28.000000000 -0400 -@@ -61,7 +61,8 @@ libgtop_sysdeps_suid_2_0_la_DEPENDENCIES - am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo \ -- procmap.lo netload.lo ppp.lo procopenfiles.lo -+ procmap.lo netload.lo ppp.lo procopenfiles.lo procwd.lo \ -+ glibtop_private.lo - libgtop_sysdeps_suid_2_0_la_OBJECTS = \ - $(am_libgtop_sysdeps_suid_2_0_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -305,13 +306,15 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = op - proclist.c procstate.c procuid.c \ - proctime.c procmem.c procsignal.c \ - prockernel.c procsegment.c procargs.c \ -- procmap.c netload.c ppp.c procopenfiles.c -+ procmap.c netload.c ppp.c procopenfiles.c \ -+ procwd.c glibtop_private.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ - glibtop_suid.h - - libgtopincludedir = $(includedir)/libgtop-2.0 -+noinst_HEADERS = glibtop_private.h - all: all-am - - .SUFFIXES: -@@ -382,6 +385,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmem.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procopenfiles.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procwd.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procsegment.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procsignal.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procstate.Plo@am__quote@ -@@ -393,6 +397,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swap.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.c b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.c deleted file mode 100644 index 2487d0208..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.c +++ /dev/null @@ -1,57 +0,0 @@ ---- sysdeps/freebsd/glibtop_private.c.orig 2007-06-26 18:07:59.000000000 -0400 -+++ sysdeps/freebsd/glibtop_private.c 2007-06-27 00:07:50.000000000 -0400 -@@ -0,0 +1,54 @@ -+#include -+#include -+#include -+ -+#include "glibtop_private.h" -+ -+#include -+#include -+#include -+#include -+#include -+ -+char * -+execute_lsof(pid_t pid) { -+ char *output = NULL; -+ char *lsof; -+ char *command; -+ int exit_status; -+ -+ lsof = g_find_program_in_path("lsof"); -+ if (lsof == NULL) -+ return NULL; -+ -+ command = g_strdup_printf("%s -n -P -Fftn -p %d", lsof, pid); -+ g_free(lsof); -+ -+ if (g_spawn_command_line_sync (command, &output, NULL, &exit_status, NULL)) { -+ if (exit_status != 0) { -+ g_warning("Could not execute \"%s\" (%i)", command, -+ exit_status); -+ output = NULL; -+ } -+ } -+ -+ g_free(command); -+ return output; -+} -+ -+/* Ported from linux/glibtop_private.c */ -+gboolean -+safe_readlink(const char *path, char *buf, int bufsiz) -+{ -+ int ret; -+ -+ ret = readlink(path, buf, bufsiz - 1); -+ -+ if (ret == -1) { -+ g_warning("Could not read link %s : %s", path, strerror(errno)); -+ return FALSE; -+ } -+ -+ buf[ret] = '\0'; -+ return TRUE; -+} diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.h b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.h deleted file mode 100644 index d59068b8a..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_private.h +++ /dev/null @@ -1,43 +0,0 @@ ---- sysdeps/freebsd/glibtop_private.h.orig 2007-06-27 14:01:07.000000000 -0400 -+++ sysdeps/freebsd/glibtop_private.h 2007-06-27 14:02:44.000000000 -0400 -@@ -0,0 +1,40 @@ -+/* Copyright (C) 2007 Joe Marcus Clarke -+ This file is part of LibGTop 2.0. -+ -+ LibGTop is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, -+ or (at your option) any later version. -+ -+ LibGTop is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with LibGTop; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __FREEBSD__GLIBTOP_PRIVATE_H__ -+#define __FREEBSD__GLIBTOP_PRIVATE_H__ -+ -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+G_BEGIN_DECLS -+ -+char *execute_lsof(pid_t pid); -+gboolean safe_readlink(const char *path, char *buf, int bufsiz); -+ -+G_END_DECLS -+ -+#endif /* __FREEBSD__GLIBTOP_PRIVATE_H__ */ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_server.h deleted file mode 100644 index db740ecf7..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_server.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sysdeps/freebsd/glibtop_server.h.orig Fri Jun 8 19:52:14 2007 -+++ sysdeps/freebsd/glibtop_server.h Fri Jun 8 19:52:25 2007 -@@ -45,6 +45,7 @@ G_BEGIN_DECLS - #define GLIBTOP_SUID_MSG_LIMITS 0 - #define GLIBTOP_SUID_SEM_LIMITS 0 - #define GLIBTOP_SUID_NETLIST 0 -+#define GLIBTOP_SUID_PROC_WD 0 - - G_END_DECLS - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_proclist.c b/devel/libgtop/files/patch-sysdeps_freebsd_proclist.c deleted file mode 100644 index 8f7f30a12..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_proclist.c +++ /dev/null @@ -1,55 +0,0 @@ ---- sysdeps/freebsd/proclist.c.orig Fri Jun 8 19:46:18 2007 -+++ sysdeps/freebsd/proclist.c Fri Jun 8 19:48:47 2007 -@@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysd - * buf->flags is only set if the call succeeded, in this case pids_chain, - * a list of the pids of all currently running processes is returned, - * buf->number is the number of elements of this list and buf->size is -- * the size of one single element (sizeof (unsigned)). The total size is -+ * the size of one single element (sizeof (pid_t)). The total size is - * stored in buf->total. - * - * The calling function has to free the memory to which a pointer is returned. -@@ -61,7 +61,7 @@ _glibtop_init_proclist_p (glibtop *serve - server->sysdeps.proclist = _glibtop_sysdeps_proclist; - } - --unsigned * -+pid_t * - glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, - gint64 which, gint64 arg) - { -@@ -90,18 +90,18 @@ glibtop_get_proclist_p (glibtop *server, - - len /= sizeof (struct kinfo_proc); - -- pids = g_array_sized_new (FALSE, FALSE, sizeof (unsigned), len); -+ pids = g_array_sized_new (FALSE, FALSE, sizeof (pid_t), len); - - for (i = 0; i < len; i++) { -- unsigned pid; -+ pid_t pid; - -- pid = (unsigned) pinfo[i].ki_pid; -+ pid = (pid_t) pinfo[i].ki_pid; - - switch (which & GLIBTOP_KERN_PROC_MASK) { - case GLIBTOP_KERN_PROC_ALL: - break; - case GLIBTOP_KERN_PROC_PID: -- if ((unsigned) arg != pid) -+ if ((pid_t) arg != pid) - continue; - break; - case GLIBTOP_KERN_PROC_UID: -@@ -144,9 +144,9 @@ glibtop_get_proclist_p (glibtop *server, - g_free (pinfo); - - buf->flags = _glibtop_sysdeps_proclist; -- buf->size = sizeof (unsigned); -+ buf->size = sizeof (pid_t); - buf->number = pids->len; - buf->total = buf->number * buf->size; - -- return (unsigned *) g_array_free (pids, FALSE); -+ return (pid_t *) g_array_free (pids, FALSE); - } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c deleted file mode 100644 index a000d5acc..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c +++ /dev/null @@ -1,164 +0,0 @@ ---- sysdeps/freebsd/procopenfiles.c.orig 2007-04-26 18:27:37.000000000 -0400 -+++ sysdeps/freebsd/procopenfiles.c 2007-06-27 15:00:31.000000000 -0400 -@@ -1,5 +1,6 @@ - /* Copyright (C) 1998-99 Martin Baulig - Copyright (C) 2004 Nicolás Lichtmaier -+ Copyright (C) 2007 Joe Marcus Clarke - This file is part of LibGTop 1.0. - - Modified by Nicolás Lichtmaier to give a process open files. -@@ -26,8 +27,11 @@ - #include - #include - #include -+#include -+#include -+#include - --#include -+#include "glibtop_private.h" - - static const unsigned long _glibtop_sysdeps_proc_open_files = - (1L << GLIBTOP_PROC_OPEN_FILES_NUMBER)| -@@ -42,10 +46,139 @@ _glibtop_init_proc_open_files_s (glibtop - server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; - } - -+static GArray * -+parse_output(const char *output) { -+ GArray *entries; -+ char **lines; -+ char *ftype = NULL; -+ char *fname = NULL; -+ guint i; -+ guint len; -+ int fd = -1; -+ -+ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry)); -+ -+ lines = g_strsplit(output, "\n", 0); -+ len = g_strv_length(lines); -+ -+ for (i = 0; i < len && lines[i]; i++) { -+ glibtop_open_files_entry entry = {0}; -+ -+ if (strlen(lines[i]) < 2) -+ continue; -+ -+ if (!g_str_has_prefix(lines[i], "f") && -+ !g_str_has_prefix(lines[i], "t") && -+ !g_str_has_prefix(lines[i], "n")) -+ continue; -+ -+ if (g_str_has_prefix(lines[i], "f")) { -+ if (!g_ascii_isdigit(*(lines[i] + 1))) -+ i += 2; -+ else -+ fd = atoi(lines[i] + 1); -+ continue; -+ } -+ -+ if (g_str_has_prefix(lines[i], "t")) { -+ ftype = lines[i]; -+ ftype++; -+ continue; -+ } else { -+ fname = lines[i]; -+ fname++; -+ } -+ -+ if (ftype == NULL || fname == NULL) -+ continue; -+ -+ if (!strcmp(ftype, "unix")) { -+ entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET; -+ g_strlcpy(entry.info.localsock.name, fname, -+ sizeof(entry.info.localsock.name)); -+ } else if (!strcmp(ftype, "PIPE")) { -+ entry.type = GLIBTOP_FILE_TYPE_PIPE; -+ } else if (!strcmp(ftype, "VREG") || -+ !strcmp(ftype, "GDIR") || -+ !strcmp(ftype, "GREG") || -+ !strcmp(ftype, "VCHR") || -+ !strcmp(ftype, "VBLK") || -+ !strcmp(ftype, "DIR") || -+ !strcmp(ftype, "LINK") || -+ !strcmp(ftype, "REG") || -+ !strcmp(ftype, "VDIR")) { -+ entry.type = GLIBTOP_FILE_TYPE_FILE; -+ g_strlcpy(entry.info.file.name, fname, -+ sizeof(entry.info.file.name)); -+ } else if (!strcmp(ftype, "IPv4")) { -+ char **hosts; -+ char **remote_host; -+ -+ if (!strstr(fname, "->")) { -+ remote_host = g_strsplit(fname, ":", 0); -+ } else { -+ hosts = g_strsplit(fname, "->", 0); -+ if (g_strv_length(hosts) < 2) { -+ g_strfreev(hosts); -+ continue; -+ } -+ -+ remote_host = g_strsplit(hosts[1], ":", 0); -+ g_strfreev(hosts); -+ } -+ -+ if (g_strv_length(remote_host) < 2) { -+ g_strfreev(remote_host); -+ continue; -+ } -+ -+ entry.type = GLIBTOP_FILE_TYPE_INETSOCKET; -+ if (!strcmp(remote_host[0], "*")) -+ g_strlcpy(entry.info.sock.dest_host, "0.0.0.0", -+ sizeof(entry.info.sock.dest_host)); -+ else -+ g_strlcpy(entry.info.sock.dest_host, -+ remote_host[0], -+ sizeof(entry.info.sock.dest_host)); -+ entry.info.sock.dest_port = atoi(remote_host[1]); -+ -+ g_strfreev(remote_host); -+ } else -+ continue; -+ -+ entry.fd = fd; -+ -+ fd = -1; -+ ftype = NULL; -+ fname = NULL; -+ -+ g_array_append_val(entries, entry); -+ } -+ -+ g_strfreev(lines); -+ -+ return entries; -+} - --/* XXX Unimplemented on FreeBSD */ - glibtop_open_files_entry * - glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid) - { -- return NULL; -+ char *output; -+ GArray *entries; -+ -+ memset(buf, 0, sizeof (glibtop_proc_open_files)); -+ -+ output = execute_lsof(pid); -+ if (output == NULL) return NULL; -+ -+ entries = parse_output(output); -+ -+ g_free(output); -+ -+ buf->flags = _glibtop_sysdeps_proc_open_files; -+ buf->number = entries->len; -+ buf->size = sizeof(glibtop_open_files_entry); -+ buf->total = buf->number * buf->size; -+ -+ return (glibtop_open_files_entry*)g_array_free(entries, FALSE); - } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c deleted file mode 100644 index 544e0ba37..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ /dev/null @@ -1,124 +0,0 @@ ---- sysdeps/freebsd/procwd.c.orig 2007-06-30 12:37:18.000000000 -0400 -+++ sysdeps/freebsd/procwd.c 2007-06-30 12:42:35.000000000 -0400 -@@ -0,0 +1,121 @@ -+/* Copyright (C) 2007 Joe Marcus Clarke -+ This file is part of LibGTop 2. -+ -+ LibGTop is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, -+ or (at your option) any later version. -+ -+ LibGTop is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with LibGTop; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#include -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include -+ -+static const unsigned long _glibtop_sysdeps_proc_wd = -+(1 << GLIBTOP_PROC_WD_EXE) | -+(1 << GLIBTOP_PROC_WD_ROOT) | -+(1 << GLIBTOP_PROC_WD_NUMBER); -+ -+void -+_glibtop_init_proc_wd_s(glibtop *server) -+{ -+ server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd; -+} -+ -+static GPtrArray * -+parse_output(const char *output, glibtop_proc_wd *buf) -+{ -+ GPtrArray *dirs; -+ char **lines; -+ gboolean nextwd = FALSE; -+ gboolean nextrtd = FALSE; -+ gboolean havertd = FALSE; -+ guint i; -+ guint len; -+ -+ dirs = g_ptr_array_sized_new(1); -+ -+ lines = g_strsplit(output, "\n", 0); -+ len = g_strv_length(lines); -+ -+ for (i = 0; i < len && lines[i]; i++) { -+ if (strlen(lines[i]) < 2) -+ continue; -+ -+ if (!strcmp(lines[i], "fcwd")) { -+ nextwd = TRUE; -+ continue; -+ } -+ -+ if (!strcmp(lines[i], "frtd")) { -+ nextrtd = TRUE; -+ continue; -+ } -+ -+ if (!g_str_has_prefix(lines[i], "n")) -+ continue; -+ -+ if (nextwd) { -+ g_ptr_array_add(dirs, g_strdup(lines[i] + 1)); -+ nextwd = FALSE; -+ } -+ -+ if (nextrtd && !havertd) { -+ g_strlcpy(buf->root, lines[i] + 1, -+ sizeof(buf->root)); -+ buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT); -+ nextrtd = FALSE; -+ havertd = TRUE; -+ } -+ } -+ -+ g_strfreev(lines); -+ -+ return dirs; -+} -+ -+char** -+glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid) -+{ -+ char path[MAXPATHLEN]; -+ char *output; -+ -+ memset (buf, 0, sizeof (glibtop_proc_wd)); -+ -+ g_snprintf(path, sizeof(path), "/proc/%u/file", pid); -+ if (safe_readlink(path, buf->exe, sizeof(buf->exe))) -+ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); -+ -+ output = execute_lsof(pid); -+ if (output != NULL) { -+ GPtrArray *dirs; -+ -+ dirs = parse_output(output, buf); -+ g_free(output); -+ -+ buf->number = dirs->len; -+ buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER); -+ -+ g_ptr_array_add(dirs, NULL); -+ -+ return (char **)g_ptr_array_free(dirs, FALSE); -+ } -+ -+ return NULL; -+} diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index dbaf72794..cfd58cc73 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -1,6 +1,7 @@ bin/libgtop_daemon2 bin/libgtop_server2 include/libgtop-2.0/glibtop.h +include/libgtop-2.0/glibtop_private.h include/libgtop-2.0/glibtop/close.h include/libgtop-2.0/glibtop/command.h include/libgtop-2.0/glibtop/cpu.h -- cgit v1.2.3