Released 2.20.2

svn path=/branches/gnome-2-20/; revision=2721

NEWS

@@ -1,3 +1,15 @@
+05 Mars 2008: Overview of changes in 2.20.2
+===========================================
+* linux:
+  - fixed smaps parsing on >= 2.6.24.x.
+    backport of svn+ssh://svn.gnome.org/svn/libgtop/trunk@2713.
+
+7 January 2008: Overview of changes in 2.20.1
+=============================================
+* freebsd:
+  - fixed build on GNU/kfreebsd. Petr Salinger.
+  - fixed procmem units. Kuang-che Wu.
+
 16 September 2007: Overview of changes in 2.20.0
 ================================================
 * Updated translations.

configure.in

@@ -4,7 +4,7 @@ dnl
 
 m4_define([libgtop_major_version], [2])
 m4_define([libgtop_minor_version], [20])
-m4_define([libgtop_micro_version], [0])
+m4_define([libgtop_micro_version], [2])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.

po/ChangeLog

@@ -1,3 +1,19 @@
+2008-02-20  Pawan Chitrakar <chautari@gmail.com>
+
+	* ne.po: Updated Nepali Translation.
+
+2007-10-21  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Youssef Chahibi.
+
+2007-10-15  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2007-10-03  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation by Alessio Frusciante.
+
 2007-09-18  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by

po/he.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.libgtop-GNOME-2-0-port.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-27 17:02+0300\n"
+"POT-Creation-Date: 2007-09-30 03:40+0100\n"
 "PO-Revision-Date: 2003-03-18 18:06+0200\n"
 "Last-Translator: Yair Hershkovitz <yairhr@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -20,390 +20,184 @@ msgstr ""
 
 # *** This library should not be translated (only copy the english msgs) ***
 # *** Old hebrew translation is commented for backup sake                ***
-
+#: ../lib/read.c:51
-#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "read %d byte"
 msgstr[1] "read %d bytes"
 
-#: lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
 msgstr "read data size"
 
-#: lib/read_data.c:72
+#: ../lib/read_data.c:70
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "read %lu byte of data"
 msgstr[1] "read %lu bytes of data"
 
-#: lib/write.c:52
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "wrote %d byte"
 msgstr[1] "wrote %d bytes"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Enable debugging"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Enable verbose output"
 
-#: src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Don't fork into background"
 
-#: src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
-
-#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Invoked from inetd"
 
-#: src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:498
-msgid "INETD"
-msgstr "INETD"
-
-#: src/daemon/gnuserv.c:500
 #, c-format
-msgid ""
+msgid "Run '%s --help' to see a full list of available command line options.\n"
-"Error on option %s: %s.\n"
+msgstr "Run '%s --help' to see a full list of available command line options.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
 msgstr "Hangup"
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "Interrupt"
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "Quit"
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "Illegal instruction"
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "Trace trap"
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "Abort"
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "EMT error"
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
 msgstr "Floating-point exception"
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "Kill"
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "Bus error"
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "Segmentation violation"
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
 msgstr "Bad argument to system call"
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "Broken pipe"
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "Alarm clock"
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "Termination"
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
 msgstr "Urgent condition on socket"
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "Stop"
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
 msgstr "Keyboard stop"
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "Continue"
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "Child status has changed"
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
 msgstr "Background read from tty"
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
 msgstr "Background write to tty"
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
 msgstr "I/O now possible"
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "CPU limit exceeded"
 
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "File size limit exceeded"
 
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "Virtual alarm clock"
 
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "Profiling alarm clock"
 
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "Window size change"
 
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "Information request"
 
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
 msgstr "User defined signal 1"
 
-#: sysdeps/osf1/siglist.c:59 sysdeps/sun4/siglist.c:59
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "User defined signal 2"
 
-#
+#~ msgid "DEBUG"
-##: lib/read.c:65
+#~ msgstr "DEBUG"
-##, c-format
+
-#msgid "read %d byte"
+#~ msgid "VERBOSE"
-#msgid_plural "read %d bytes"
+#~ msgstr "VERBOSE"
-#msgstr[0] ""
+
-#"נקראו %d בתים"
+#~ msgid "NO-DAEMON"
-#msgstr[1] ""
+#~ msgstr "NO-DAEMON"
-#"נקראו %d בתים"
+
-#
+#~ msgid "INETD"
-##: lib/read_data.c:53
+#~ msgstr "INETD"
-#msgid "read data size"
-#msgstr "קורא את גודל המידע"
-#
-##: lib/read_data.c:72
-##,, c-format
-#msgid "read %lu byte of data"
-#msgid_plural "read %lu bytes of data"
-#msgstr[0] ""
-#"נקראו %lu בתים של מידע"
-#msgstr[1] ""
-#"נקראו %lu בתים של מידע"
-#
-##: lib/write.c:52
-##, c-format
-#msgid "wrote %d byte"
-#msgid_plural "wrote %d bytes"
-#msgstr[0] ""
-#"נכתבו %d בתים"
-#msgstr[1] ""
-#"נכתבו %d בתים"
-#
-##: src/daemon/gnuserv.c:460
-#msgid "Enable debugging"
-#msgstr "אפשר ניפוי"
-#
-##: src/daemon/gnuserv.c:460
-#msgid "DEBUG"
-#msgstr "ניפוי"
-#
-##: src/daemon/gnuserv.c:462
-#msgid "Enable verbose output"
-#msgstr "אפשר פלט מפורט"
-#
-##: src/daemon/gnuserv.c:462
-#msgid "VERBOSE"
-#msgstr "מפורט"
-#
-##: src/daemon/gnuserv.c:464
-#msgid "Don't fork into background"
-#msgstr "אל תשכפל לרקע"
-#
-##: src/daemon/gnuserv.c:464
-#msgid "NO-DAEMON"
-#msgstr "NO-DAEMON"
-#
-##: src/daemon/gnuserv.c:466
-#msgid "Invoked from inetd"
-#msgstr ""
-#
-##: src/daemon/gnuserv.c:466
-#msgid "INETD"
-#msgstr ""
-#
-##: src/daemon/gnuserv.c:500
-##, c-format
-#msgid ""
-#"Error on option %s: %s.\n"
-#"Run '%s --help' to see a full list of available command line options.\n"
-#msgstr ""
-#"שגיאה באפשרות %s: %s.\n"
-#"הפעל '%s --help' כדי לראות רשימה מלאה של אפשרויות שורות פקודה זמינות.\n"
-#
-##: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-#msgid "Hangup"
-#msgstr "ניתוק"
-#
-##: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-#msgid "Interrupt"
-#msgstr "הפרעה"
-#
-##: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-#msgid "Quit"
-#msgstr "יציאה"
-#
-##: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-#msgid "Illegal instruction"
-#msgstr "הוראה לא חוקית"
-#
-##: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-#msgid "Trace trap"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-#msgid "Abort"
-#msgstr "ביטול"
-#
-##: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-#msgid "EMT error"
-#msgstr "שגיאת EMT"
-#
-##: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-#msgid "Floating-point exception"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-#msgid "Kill"
-#msgstr "הרוג"
-#
-##: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-#msgid "Bus error"
-#msgstr "שגיאת אפיק"
-#
-##: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-#msgid "Segmentation violation"
-#msgstr "הפרעת התחלקות"
-#
-##: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-#msgid "Bad argument to system call"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-#msgid "Broken pipe"
-#msgstr "צינור שבור"
-#
-##: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-#msgid "Alarm clock"
-#msgstr "שעון מעורר"
-#
-##: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-#msgid "Termination"
-#msgstr "סיום"
-#
-##: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-#msgid "Urgent condition on socket"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-#msgid "Stop"
-#msgstr "עצור"
-#
-##: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-#msgid "Keyboard stop"
-#msgstr "עצירת מקלדת"
-#
-##: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-#msgid "Continue"
-#msgstr "המשך"
-#
-##: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-#msgid "Child status has changed"
-#msgstr "מצב הילד השתנה"
-#
-##: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-#msgid "Background read from tty"
-#msgstr "קרית רקע מ tty"
-#
-##: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-#msgid "Background write to tty"
-#msgstr "כתיבת רקע מ tty"
-#
-##: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-#msgid "I/O now possible"
-#msgstr "קלט/פלט עכשיו אפשרי"
-#
-##: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-#msgid "CPU limit exceeded"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-#msgid "File size limit exceeded"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-#msgid "Virtual alarm clock"
-#msgstr "שעון מעורר וירוטאלי"
-#
-##: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-#msgid "Profiling alarm clock"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-#msgid "Window size change"
-#msgstr "שינוי גודל חלון"
-#
-##: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-#msgid "Information request"
-#msgstr "בקשת מידע"
-#
-##: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-#msgid "User defined signal 1"
-#msgstr "אות מוגדר משתמש 1"
-#
-##: sysdeps/osf1/siglist.c:59 sysdeps/sun4/siglist.c:59
-#msgid "User defined signal 2"
-#msgstr "אות מוגדר משתמש 2"

po/it.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-25 18:15+0200\n"
+"POT-Creation-Date: 2007-10-03 14:34+0200\n"
-"PO-Revision-Date: 2005-03-03 22:47+0100\n"
+"PO-Revision-Date: 2007-10-02 23:18+0200\n"
 "Last-Translator: Alessio Frusciante <algol@firenze.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -15,193 +15,174 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/read.c:65
+#: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "letto %d byte"
 msgstr[1] "letti %d byte"
 
-#: lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
 msgstr "dimensione dei dati letti"
 
-#: lib/read_data.c:72
+#: ../lib/read_data.c:70
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "letto %lu byte di dati"
 msgstr[1] "letti %lu byte di dati"
 
-#: lib/write.c:52
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "scrittura di %d byte"
 msgstr[1] "scrittura di %d byte"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Abilita debug"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Abilita output prolisso"
 
-#: src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Non fare fork in background"
 
-#: src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
-
-#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Invocato da inetd"
 
-#: src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:498
-msgid "INETD"
-msgstr "INETD"
-
-#: src/daemon/gnuserv.c:500
 #, c-format
-msgid ""
+msgid "Run '%s --help' to see a full list of available command line options.\n"
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Errore nell'opzione %s: %s.\n"
+"Eseguire '%s --help' per vedere una lista completa delle opzioni per la riga "
-"Eseguire '%s --help' per vedere una lista completa delle opzioni per la "
+"di comando.\n"
-"linea di comando.\n"
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
 msgstr "Hangup"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "Interrupt"
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "Quit"
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "Illegal instruction"
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "Trace trap"
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "Abort"
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "EMT error"
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
 msgstr "Floating-point exception"
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "Kill"
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "Bus error"
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "Segmentation violation"
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
 msgstr "Bad argument to system call"
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "Broken pipe"
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "Alarm clock"
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "Termination"
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
 msgstr "Urgent condition on socket"
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "Stop"
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
 msgstr "Keyboard stop"
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "Continue"
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "Lo stato del figlio è cambiato"
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
 msgstr "Lettura in background dalla tty"
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
 msgstr "Scrittura in background sulla tty"
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
 msgstr "I/O adesso possibile"
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "Superato il limite della CPU"
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "Superato il limite nella dimensione dei file"
 
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "Virtual alarm clock"
 
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "Profiling alarm clock"
 
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "Window size change"
 
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "Information request"
 
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
 msgstr "Segnale definito dall'utente 1"
 
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "Segnale definito dall'utente 2"

po/ne.po

@@ -1,23 +1,21 @@
-# translation of libgtop.HEAD.ne.po to Nepali
+# translation of libgtop.gnome-2-20.ne.po to Nepali
-# translation of libgtop.gnome-2-10.ne.po to Nepali
-# translation of libgtop.gnome-2-10.po to Nepali
-# translation of libgtop.HEAD.po to Nepali
 # Nepali Translation Project.
 # This file is distributed under the same license as the libgtop package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
 # Pawan Chitrakar  <pawan@nplinux.org>, 2004.
 # Jaydeep Bhusal <zaydeep@hotmail.com>, 2005.
 # Bishnu Adhikari <bsn_adk@hotmail.com>, 2005.
 # Shiva  Pokharel <pokharelshiva@hotmail.com>, 2005.
 # Mahesh subedi <submanesh@hotmail.com>, 2006.
-#
+# Nabin Gautam <nabin@mpp.org.np>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.HEAD.ne\n"
+"Project-Id-Version: libgtop.gnome-2-20.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-14 22:35+0200\n"
+"POT-Creation-Date: 2007-09-30 03:40+0100\n"
-"PO-Revision-Date: 2006-07-20 14:58+0545\n"
+"PO-Revision-Date: 2007-12-19 12:53+0545\n"
-"Last-Translator: Mahesh subedi <submanesh@hotmail.com>\n"
+"Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,196 +23,176 @@ msgstr ""
 "X-Poedit-Language: Nepali\n"
 "X-Poedit-Country: NEPAL\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2;plural=(n!=1)\n"
+"Plural-Forms: nplurals=2; plural=n !=1\n"
 
-#: ../lib/read.c:65
+#: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d बाइट पढ्नुहोस्"
-msgstr[1] "%d बाइट्स पढ्नुहोस्"
+msgstr[1] "%d बाइट पढ्नुहोस्"
 
-#: ../lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
 msgstr "डेटा साइज पढ्नुहोस्"
 
-#: ../lib/read_data.c:72
+#: ../lib/read_data.c:70
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "डेटाको %lu बाइट पढ्नुहोस्"
-msgstr[1] "डेटाको %lu बाइट्स पढ्नुहोस्"
+msgstr[1] "डेटाको %lu बाइट पढ्नुहोस्"
 
-#: ../lib/write.c:53
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "%d बाइट लेख्यो"
-msgstr[1] "%d बाइट्स लेख्यो"
+msgstr[1] "%d बाइट लेख्यो"
 
-#: ../src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
-msgstr "डिबग सक्षम पार्नुहोस्"
+msgstr "डिबगिङ सक्षम पार्नुहोस्"
 
 #: ../src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "भर्बोज निर्गत सक्षम पार्नुहोस्"
 
 #: ../src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
-msgstr "पृष्ठभूमिमा फोर्क नगर्नुहोस्"
+msgstr "पृष्ठभूमिमा बिभाजन नगर्नुहोस्"
 
 #: ../src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
-
-#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
-msgstr "इनेट्डबाट आव्हान गरिएको"
+msgstr "inetd बाट आह्वान गरिएको"
 
-#: ../src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:498
-msgid "INETD"
-msgstr "INETD"
-
-#: ../src/daemon/gnuserv.c:500
 #, c-format
-msgid ""
+msgid "Run '%s --help' to see a full list of available command line options.\n"
-"Error on option %s: %s.\n"
+msgstr "उपलब्ध आदेश लाइन विकल्पको पूरै सूची हेर्न  '%s --मद्दत' चलाउनुहोस् ।\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s: %s विकल्पमा त्रुटि।\n"
-"उपलब्ध आदेश लाइन विकल्पहरूको एउटा पूर्ण सूची हेर्नका लागि '%s --मद्दत' चलाउनुहोस्।\n"
 
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
-msgstr "ह्याङ अप"
+msgstr "ह्याङअप"
 
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "रोकावट"
 
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "अन्त्य गर्नुहोस्"
 
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "अवैध निर्देशन"
 
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "पदचिन्ह ट्रयाप"
 
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "परित्याग गर्नुहोस्"
 
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
-msgstr "EMT त्रुटि"
+msgstr "इएमटी (EMT) त्रुटि"
 
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
 msgstr "उत्प्लावन बिन्दु अपवाद"
 
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "नष्ट गर्नुहोस्"
 
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "बस त्रुटि"
 
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
-msgstr "खण्डीकरण खण्डन"
+msgstr "खण्डीकरण बिखण्डन"
 
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
 msgstr "प्रणाली कलमा खराब तर्क"
 
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "विच्छेद पाइप"
 
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
-msgstr "सचेतक घडि"
+msgstr "सचेतक घडी"
 
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
-msgstr "समाप्ति"
+msgstr "अन्त्य"
 
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
 msgstr "सकेटमा आकस्मिक अवस्था"
 
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "रोक्नुहोस्"
 
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
-msgstr "कुञ्जिपाटी बन्द"
+msgstr "कुञ्जिपाटी बन्द गर्नुहोस्"
 
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "जारी राख्नुहोस्"
 
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "चाइल्ड वस्तुस्थिति परिवर्तन गरिएको छ"
 
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
-msgstr "टिटिवाइ बाट पृष्ठभूमि पढ्नुहोस्"
+msgstr "tty बाट पृष्ठभूमि पढ्नुहोस्"
+
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+msgid "Background write to tty"
+msgstr "tty मा पृष्ठभूमि लेख्नुहोस्"
+
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+msgid "I/O now possible"
+msgstr "I/O अब सम्भव छ"
 
 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "Background write to tty"
+msgid "CPU limit exceeded"
-msgstr "टिटिवाइ बाट पृष्ठभूमि लेख्नुहोस्"
+msgstr "सीपीयू (CPU) सीमा नाघ्यो"
 
 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "I/O now possible"
+msgid "File size limit exceeded"
-msgstr "I/O अब सम्भव"
+msgstr "फाइल साइज सीमा नाघ्यो"
 
 #: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "CPU limit exceeded"
-msgstr "CPU को सीमा नाघ्यो"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "File size limit exceeded"
-msgstr "फाइल साइजको सीमा नाघ्यो"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Virtual alarm clock"
 msgstr "अवास्तविक सचेतक घडी"
 
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "सचेतक घडीको प्रोफाइल हुँदैछ"
 
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "सञ्झ्याल साइज परिवर्तन"
 
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "सूचना अनुरोध"
 
-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
 msgstr "प्रयोगकर्ता परिभषित सङ्केत १"
 
-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "प्रयोगकर्ता परिभषित सङ्केत २"
 

sysdeps/freebsd/open.c

@@ -63,9 +63,11 @@ glibtop_open_p (glibtop *server, const char *program_name,
 	server->machine.euid = geteuid ();
 	server->machine.gid = getgid ();
 	server->machine.egid = getegid ();
-
+#if defined(__FreeBSD_kernel__)
+	server->os_version_code = __FreeBSD_kernel_version;
+#else
 	server->os_version_code = __FreeBSD_version;
-
+#endif
 	/* Setup machine-specific data */
 	server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
 

sysdeps/freebsd/procmem.c

@@ -98,9 +98,9 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
        buf->rss_rlim = pinfo [0].ki_rssize;
 
        buf->vsize = buf->size = (guint64)
-	       (pinfo [0].ki_size / 1024);
+	       pinfo [0].ki_size;
        buf->resident = buf->rss = (guint64)
-	       ps_pgtok (pinfo [0].ki_rssize);
+	       ps_pgtok (pinfo [0].ki_rssize) * 1024;
 
 	/* Now we get the shared memory. */
 

sysdeps/linux/glibtop_private.c

@@ -17,13 +17,20 @@
 unsigned long long
 get_scaled(const char *buffer, const char *key)
 {
-	const char    *ptr;
+	const char    *ptr = buffer;;
 	char	      *next;
-	unsigned long long value = 0;
+	unsigned long long value;
 
+	if (key) {
 		if (G_LIKELY((ptr = strstr(buffer, key))))
-	{
 			ptr += strlen(key);
+		else {
+			g_warning("Could not read key '%s' in buffer '%s'",
+				  key, buffer);
+			return 0;
+		}
+	}
+
 	value = strtoull(ptr, &next, 0);
 
 	for ( ; *next; ++next) {
@@ -35,9 +42,6 @@ get_scaled(const char *buffer, const char *key)
 			break;
 		}
 	}
-	} else
-		g_warning("Could not read key '%s' in buffer '%s'",
-			  key, buffer);
 
 	return value;
 }

sysdeps/linux/procmap.c

@@ -66,49 +66,78 @@ _glibtop_init_proc_map_s (glibtop *server)
 /* Provides detailed information about a process. */
 
 
-static void
+
-add_smaps(glibtop *server, FILE *smaps, glibtop_map_entry *entry)
+struct smap_value {
+	char name[16];
+	size_t name_len;
+	ptrdiff_t offset;
+};
+
+static int
+compare(const void* a_key, const void* a_smap)
+{
+	const char* key = a_key;
+	const struct smap_value* smap = a_smap;
+	return strncmp(key, smap->name, smap->name_len);
+}
+
+
+static gboolean
+is_smap_value(const char* s)
+{
+	for ( ; *s; ++s) {
+
+		if (isspace(*s))
+			return FALSE;
+
+		if (*s == ':')
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+
+/*
+  Returns whether line is a 'value' line
+  and add if we know its meaning
+*/
+static gboolean
+parse_smaps(glibtop_map_entry *entry, const char* line)
 {
 #define SMAP_OFFSET(MEMBER) offsetof(glibtop_map_entry, MEMBER)
+#define STR_AND_LEN(X) (X), (sizeof X - 1)
 
-	struct smap_value {
+	/* keep sorted */
-		char name[15];
-		ptrdiff_t offset;
-	};
-
 	const struct smap_value values[] = {
-		{ "Size:",		SMAP_OFFSET(size) },
+		{ STR_AND_LEN("Private_Clean:"),	SMAP_OFFSET(private_clean) },
-		{ "Rss:",		SMAP_OFFSET(rss) },
+		{ STR_AND_LEN("Private_Dirty:"),	SMAP_OFFSET(private_dirty) },
-		{ "Shared_Clean:",	SMAP_OFFSET(shared_clean) },
+		{ STR_AND_LEN("Rss:"),			SMAP_OFFSET(rss) },
-		{ "Shared_Dirty:",	SMAP_OFFSET(shared_dirty) },
+		{ STR_AND_LEN("Shared_Clean:"),		SMAP_OFFSET(shared_clean) },
-		{ "Private_Clean:",	SMAP_OFFSET(private_clean) },
+		{ STR_AND_LEN("Shared_Dirty:"),		SMAP_OFFSET(shared_dirty) },
-		{ "Private_Dirty:",	SMAP_OFFSET(private_dirty) }
+		{ STR_AND_LEN("Size:"),			SMAP_OFFSET(size) }
 	};
 
-	size_t i;
+#undef STR_AND_LEN
+#undef SMAP_OFFSET
 
-	for (i = 0; i < G_N_ELEMENTS(values); ++i) {
+	struct smap_value* smap;
-		char line[80];
+
+	smap = bsearch(line, values, G_N_ELEMENTS(values), sizeof values[0], compare);
+
+	if (smap) {
 		char *offset;
 		guint64 *value;
 
-		if (!fgets(line, sizeof line, smaps) || !g_str_has_prefix(line, values[i].name)) {
-			glibtop_warn_io_r(server,
-					  "Could not read smaps value %s",
-					  values[i].name);
-			return;
-		}
-
 		offset = (void*) entry;
-		offset += values[i].offset;
+		offset += smap->offset;
 		value = (void*) offset;
 
-		*value = get_scaled(line, values[i].name);
+		*value = get_scaled(line + smap->name_len, NULL);
+		return TRUE;
 	}
 
-	entry->flags |= _glibtop_sysdeps_map_entry_smaps;
+	return is_smap_value(line);
-
-#undef SMAP_OFFSET
 }
 
 
@@ -150,7 +179,7 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 
 	while(TRUE)
 	{
-		unsigned long perm = 0;
+		unsigned long perm;
 		guint len;
 		int line_end;
 
@@ -164,6 +193,8 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 		if (getline(&line, &line_size, maps) == -1)
 			break;
 
+	new_entry_line:
+
 		if (sscanf(line, PROC_MAPS_FORMAT,
 			   &start, &end, flags, &offset,
 			   &dev_major, &dev_minor, &inode, &line_end) != 7)
@@ -173,6 +204,7 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 		g_strstrip(filename);
 
 		/* Compute access permissions. */
+		perm = 0;
 
 		if (flags [0] == 'r')
 			perm |= GLIBTOP_MAP_PERM_READ;
@@ -205,11 +237,22 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 		entry->inode = inode;
 		g_strlcpy(entry->filename, filename, sizeof entry->filename);
 
-		if (has_smaps)
+		if (has_smaps) {
-			add_smaps(server, maps, entry);
+			ssize_t ret;
+			entry->flags |= _glibtop_sysdeps_map_entry_smaps;
 
+			while ((ret = getline(&line, &line_size, maps)) != -1) {
+				if (!parse_smaps(entry, line))
+					goto new_entry_line;
 			}
 
+			if (ret == -1)
+				goto eof;
+		}
+	}
+
+eof:
+
 	free(line);
 	fclose (maps);