Updated German translation.

2003-10-22   Vincent van Adrighem  <adrighem@gnome.org>

	* nl.po: Dutch translation updated by Vincent van Adrighem.

ChangeLog

@@ -1,3 +1,26 @@
+2003-10-21  Bastien Nocera  <hadess@hadess.net>
+
+	* lib/read.c: (glibtop_read_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): 
+	reverted string freeze breakage
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* lib/read.c: (glibtop_read_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): apply patch for ngettext support
+	by Christian Neumair <chris@gnome-de.org>
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* src/inodedb/Makefile.am: link to libgtop_suid_common-2.0.la
+	(Closes: #107990)
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in: make it compile
+
 2003-10-19  Carlos Perelló Marín <carlos@gnome.org>
 
 	* support/*: Reverted libgtop changes. It's a common module

configure.in

@@ -479,5 +479,6 @@ lib/Makefile
 examples/Makefile
 doc/Makefile
 support/Makefile
+support/gnome-support-2.0.pc
 libgtop-2.0.pc
 ])

po/ChangeLog

@@ -1,3 +1,23 @@
+2003-10-25  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2003-10-22   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Vincent van Adrighem.
+
+2003-10-22  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2003-10-21  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2003-10-21  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2003-10-19  Carlos Perelló Marín <carlos@gnome.org>
 
 	* POTFILES.ignore: Removed, we use now POTFILES.skip

po/nl.po

@@ -6,13 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-21 12:58+0200\n"
+"POT-Creation-Date: 2003-10-21 19:07+0200\n"
 "PO-Revision-Date: 2002-10-29 13:14+0100\n"
 "Last-Translator: Jeroen van der Vegt <A.J.vanderVegt@ITS.TUDelft.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: examples/smp.c:71
 #, c-format
@@ -93,8 +94,10 @@ msgstr "Draaiing:"
 
 #: lib/read.c:75
 #, c-format
-msgid "read %d bytes"
+msgid "read %d byte"
-msgstr "%d bytes gelezen"
+msgid_plural "read %d bytes"
+msgstr[0] "%d byte gelezen"
+msgstr[1] "%d bytes gelezen"
 
 #: lib/read_data.c:49
 msgid "read data size"
@@ -102,13 +105,17 @@ msgstr "grootte van de gelezen data"
 
 #: lib/read_data.c:66
 #, c-format
-msgid "read data %d bytes"
+msgid "read data %d byte"
-msgstr "lees %d bytes"
+msgid_plural "read data %d bytes"
+msgstr[0] "lees %d byte"
+msgstr[1] "lees %d bytes"
 
 #: lib/write.c:48
 #, c-format
-msgid "write %d bytes"
+msgid "write %d byte"
-msgstr "schrijf %d bytes"
+msgid_plural "write %d bytes"
+msgstr[0] "schrijf %d byte"
+msgstr[1] "schrijf %d bytes"
 
 #: src/daemon/gnuserv.c:453
 msgid "Enable debugging"
@@ -214,11 +221,11 @@ msgstr "%s: optie '-W %s' is dubbelzinnig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#: support/popthelp.c:35
+#: support/popthelp.c:23
 msgid "Show this help message"
 msgstr "Laat deze uitleg zien"
 
-#: support/popthelp.c:36
+#: support/popthelp.c:24
 msgid "Display brief usage message"
 msgstr "Toon een korte handleiding"
 

po/sv.po

@@ -9,13 +9,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
-"POT-Creation-Date: 2003-02-09 23:12+0100\n"
+"POT-Creation-Date: 2003-10-22 00:07+0200\n"
-"PO-Revision-Date: 2003-02-09 23:13+0100\n"
+"PO-Revision-Date: 2003-10-22 00:08+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: examples/smp.c:71
 #, c-format
@@ -117,39 +118,39 @@ msgstr "läste %d byte data"
 msgid "write %d bytes"
 msgstr "skrev %d byte"
 
-#: src/daemon/gnuserv.c:448
+#: src/daemon/gnuserv.c:453
 msgid "Enable debugging"
 msgstr "Aktivera felsökning"
 
-#: src/daemon/gnuserv.c:448
+#: src/daemon/gnuserv.c:453
 msgid "DEBUG"
 msgstr "FELSÖK"
 
-#: src/daemon/gnuserv.c:450
+#: src/daemon/gnuserv.c:455
 msgid "Enable verbose output"
 msgstr "Aktivera utförlig utskrift"
 
-#: src/daemon/gnuserv.c:450
+#: src/daemon/gnuserv.c:455
 msgid "VERBOSE"
 msgstr "UTFÖRLIG"
 
-#: src/daemon/gnuserv.c:452
+#: src/daemon/gnuserv.c:457
 msgid "Don't fork into background"
 msgstr "Grena inte i bakgrunden"
 
-#: src/daemon/gnuserv.c:452
+#: src/daemon/gnuserv.c:457
 msgid "NO-DAEMON"
 msgstr "INGEN-DEMON"
 
-#: src/daemon/gnuserv.c:454
+#: src/daemon/gnuserv.c:459
 msgid "Invoked from inetd"
 msgstr "Startad från inetd"
 
-#: src/daemon/gnuserv.c:454
+#: src/daemon/gnuserv.c:459
 msgid "INETD"
 msgstr "INETD"
 
-#: src/daemon/gnuserv.c:488
+#: src/daemon/gnuserv.c:493
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -222,11 +223,11 @@ msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tillåter inga argument\n"
 
-#: support/popthelp.c:35
+#: support/popthelp.c:23
 msgid "Show this help message"
 msgstr "Visa denna hjälptext"
 
-#: support/popthelp.c:36
+#: support/popthelp.c:24
 msgid "Display brief usage message"
 msgstr "Visa kortfattad användningstext"
 

src/daemon/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am: make it compile
+
 2003-05-11  Andrew Sobala  <aes@gnome.org>
 
 	* gnuserv.c: (permitted): fix buffer overflow vulnerability

src/daemon/Makefile.am

@@ -40,7 +40,7 @@ libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 				  @sysdeps_suid_lib@ \
 				  $(suid_sysdeps) $(suid_common)\
 				  $(LIBGTOP_LIBS)\
-				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
+				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ -lpopt
 
 libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
 libgtop_server2_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \

src/inodedb/Makefile.am

@@ -10,6 +10,7 @@ mkinodedb2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 file_by_inode2_LDADD	= $(top_builddir)/lib/libgtop-2.0.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
-			  @LIBSUPPORT@ @INTLLIBS@
+			  @LIBSUPPORT@ @INTLLIBS@ \
+			  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 
 EXTRA_DIST		= README.inodedb

sysdeps/freebsd/ChangeLog

@@ -1,3 +1,8 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+        * swap.c: (glibtop_get_swap_p): fix swap sizes in FreeBSD,
+	patch by edwin@mavetju.org
+
 2001-10-17  Abel Cheung <maddog@linux.org.hk>
 
 	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.

sysdeps/freebsd/swap.c

@@ -369,8 +369,8 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	buf->flags = _glibtop_sysdeps_swap;
 
-	buf->used = kvmsw[nswdev].ksw_used;
+	buf->used = kvmsw[nswdev].ksw_used * getpagesize(); 
-	buf->total = kvmsw[nswdev].ksw_total;
+	buf->total = kvmsw[nswdev].ksw_total * getpagesize();
 
 	buf->free = buf->total - buf->used;
 

sysdeps/linux/ChangeLog

@@ -1,3 +1,10 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* glibtop_server.h:
+	* mem.c: (glibtop_get_mem_s):
+	* swap.c: (glibtop_get_swap_s): committing patch from Sebastien
+	Bacher <seb128@debian.org> for Linux 2.6 support (Closes: #104747)
+
 2001-10-17  Abel Cheung <maddog@linux.org.hk>
 
 	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.

sysdeps/linux/glibtop_server.h

@@ -57,6 +57,25 @@ skip_line (const char *p)
 	return (char *) ++p;
 }
 
+static inline unsigned long
+get_scaled(const char *buffer, const char *key)
+{
+  const char    *ptr;
+  char          *next;
+  unsigned long value = 0;
+  
+  if ((ptr = strstr(buffer, key)))
+    {
+      ptr += strlen(key);
+      value = strtoul(ptr, &next, 0);
+      if (strchr(next, 'k'))
+	value *= 1024;
+      else if (strchr(next, 'M'))
+	value *= 1024 * 1024;
+    }
+  return value;
+}
+
 static inline int
 proc_file_to_buffer (char *buffer, const char *fmt, pid_t pid)
 {

sysdeps/linux/mem.c

@@ -65,17 +65,13 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 
 	buffer [len] = '\0';
 
-	p = skip_line (buffer);
+	buf->total  = get_scaled(buffer, "MemTotal:");
-	p = skip_token (p);		/* "Mem:" */
+	buf->used   = get_scaled(buffer, "Active:");
+	buf->free   = get_scaled(buffer, "MemFree:");
+	buf->shared = get_scaled(buffer, "Mapped:");
+	buf->buffer = get_scaled(buffer, "Buffers:");
+	buf->cached = get_scaled(buffer, "Cached:");
 
-	buf->total  = strtoul (p, &p, 0);
+ 	buf->user = buf->total - buf->free - buf->cached - buf->buffer;
-	buf->used   = strtoul (p, &p, 0);
+ 	buf->flags = _glibtop_sysdeps_mem;
-	buf->free   = strtoul (p, &p, 0);
-	buf->shared = strtoul (p, &p, 0);
-	buf->buffer = strtoul (p, &p, 0);
-	buf->cached = strtoul (p, &p, 0);
-
-	buf->user = buf->total - buf->free - buf->cached - buf->buffer;
-
-	buf->flags = _glibtop_sysdeps_mem;
 }

sysdeps/linux/swap.c

@@ -70,13 +70,11 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
 
 	buffer [len] = '\0';
 
-	p = skip_line (buffer);
+	/* Kernel 2.6 with multiple lines */
-	p = skip_line (p);
-	p = skip_token (p);		/* "Swap:" */
  
-	buf->total  = strtoul (p, &p, 0);
+	buf->total = get_scaled(buffer, "SwapTotal:");
-	buf->used   = strtoul (p, &p, 0);
+	buf->free = get_scaled(buffer, "SwapFree:");
-	buf->free   = strtoul (p, &p, 0);
+	buf->used = buf->total - buf->free;
 
 	buf->flags = _glibtop_sysdeps_swap;