From 6799ce187bada86bee406550849731188a34705b Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Thu, 16 Sep 1999 21:38:03 +0000 Subject: [PATCH] **** Merged from HEAD **** --- AUTHORS | 2 +- Makefile.am | 2 + configure.in | 3 + examples/netload.c | 2 +- examples/second.c | 2 - examples/smp.c | 4 +- examples/sysdeps.c | 2 +- examples/timings.c | 7 +- include/glibtop/error.h | 17 +- libgtop.spec.in | 6 +- po/fr.po | 569 +++++++++++++++++++---------- src/daemon/ChangeLog | 5 + src/daemon/Makefile.am | 8 + src/daemon/gnuserv.c | 5 +- src/daemon/slave.c | 14 +- sysdeps/freebsd/AUTHORS | 3 +- sysdeps/freebsd/ChangeLog | 12 + sysdeps/freebsd/proctime.c | 2 +- sysdeps/freebsd/procuid.c | 6 +- sysdeps/guile/names/guile-names.pl | 1 - sysdeps/linux/ChangeLog | 5 + sysdeps/linux/cpu.c | 15 +- sysdeps/linux/netload.c | 2 - sysdeps/linux/ppp.c | 2 + sysdeps/linux/proctime.c | 7 +- 25 files changed, 459 insertions(+), 244 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8148100d..8ad497d8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ Martin Baulig (martin@home-of-linux.org) -Josh Sled +Drazen Kacar (dave@srce.hr) diff --git a/Makefile.am b/Makefile.am index c11bdd71..80a46693 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,8 @@ confexecdir = $(libdir) confexec_DATA = $(top_builddir)/libgtopConf.sh \ $(top_builddir)/libgtop-features.def +CLEANFILES=libgtopConf.sh + bin_SCRIPTS = $(top_builddir)/libgtop-config ## to automatically rebuild aclocal.m4 if any of the macros in diff --git a/configure.in b/configure.in index 54e4fa6d..a9919589 100644 --- a/configure.in +++ b/configure.in @@ -158,6 +158,9 @@ else static_targets="" fi +AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes) +AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes) + AC_SUBST(static_targets) AC_SUBST(smp_examples) AC_SUBST(guile_examples) diff --git a/examples/netload.c b/examples/netload.c index 6e905e2b..a16527ec 100644 --- a/examples/netload.c +++ b/examples/netload.c @@ -43,7 +43,7 @@ int main (int argc, char *argv []) { glibtop_netload netload; - unsigned method, count, port, i; + unsigned method, count, port; struct in_addr addr, subnet; char *address_string, *subnet_string; char buffer [BUFSIZ]; diff --git a/examples/second.c b/examples/second.c index cb9d5657..cfb57196 100644 --- a/examples/second.c +++ b/examples/second.c @@ -31,8 +31,6 @@ #include #include -#include - static void output (pid_t pid) { diff --git a/examples/smp.c b/examples/smp.c index 78e993e9..9a098604 100644 --- a/examples/smp.c +++ b/examples/smp.c @@ -27,8 +27,6 @@ #include #include -#include - int main (int argc, char *argv []) { @@ -67,7 +65,7 @@ main (int argc, char *argv []) memset (separator, '-', 91); separator [92] = '\0'; - sprintf (buffer, _("Ticks (%d per second):"), frequency); + sprintf (buffer, _("Ticks (%ld per second):"), frequency); printf ("\n\n%-26s %12s %12s %12s %12s %12s\n%s\n", buffer, _("Total"), _("User"), _("Nice"), _("Sys"), _("Idle"), separator); diff --git a/examples/sysdeps.c b/examples/sysdeps.c index a884f797..f2a40c51 100644 --- a/examples/sysdeps.c +++ b/examples/sysdeps.c @@ -38,7 +38,7 @@ int main (int argc, char *argv []) { glibtop_sysdeps sysdeps; - unsigned method, count, port, i; + unsigned method, count, port; char buffer [BUFSIZ]; count = PROFILE_COUNT; diff --git a/examples/timings.c b/examples/timings.c index c131c6cf..10adff74 100644 --- a/examples/timings.c +++ b/examples/timings.c @@ -70,14 +70,11 @@ int main (int argc, char *argv []) { glibtop_union data; - glibtop_sysdeps sysdeps; - unsigned c, count, port, i, *ptr; + unsigned c, count, *ptr; struct rusage total_start, total_end; struct rusage rusage_start, rusage_end; struct timeval elapsed_utime, elapsed_stime; - char buffer [BUFSIZ]; - pid_t pid, ppid; - char *args; + pid_t pid; count = PROFILE_COUNT; diff --git a/include/glibtop/error.h b/include/glibtop/error.h index 30f45f4d..1434e495 100644 --- a/include/glibtop/error.h +++ b/include/glibtop/error.h @@ -28,13 +28,22 @@ BEGIN_LIBGTOP_DECLS +#ifndef G_GNUC_UNUSED +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#define G_GNUC_UNUSED \ + __attribute__((unused)) +#else /* !__GNUC__ */ +#define G_GNUC_UNUSED +#endif /* !__GNUC__ */ +#endif /* defined G_GNUC_UNUSED */ + void glibtop_error_vr (glibtop *server, char *format, va_list args); void glibtop_warn_vr (glibtop *server, char *format, va_list args); void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args); void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args); -static void +static void G_GNUC_UNUSED glibtop_error_r (glibtop *server, char *format, ...) { va_list args; @@ -44,7 +53,7 @@ glibtop_error_r (glibtop *server, char *format, ...) va_end (args); } -static void +static void G_GNUC_UNUSED glibtop_warn_r (glibtop *server, char *format, ...) { va_list args; @@ -54,7 +63,7 @@ glibtop_warn_r (glibtop *server, char *format, ...) va_end (args); } -static void +static void G_GNUC_UNUSED glibtop_error_io_r (glibtop *server, char *format, ...) { va_list args; @@ -64,7 +73,7 @@ glibtop_error_io_r (glibtop *server, char *format, ...) va_end (args); } -static void +static void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...) { va_list args; diff --git a/libgtop.spec.in b/libgtop.spec.in index 85b2e657..0455cdbc 100644 --- a/libgtop.spec.in +++ b/libgtop.spec.in @@ -1,6 +1,7 @@ # Note that this is NOT a relocatable package %define ver @VERSION@ -%define rel SNAP +%define RELEASE SNAP +%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix /usr Summary: LibGTop library @@ -118,8 +119,9 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/lib/*.sh %{prefix}/lib/*.def %{prefix}/include/* +%{prefix}/lib/libgtop %files examples %defattr(-,root,root) -%{prefix}/libexec/libgtop/* +%{prefix}/libexec/libgtop diff --git a/po/fr.po b/po/fr.po index 7854f8b2..9b4082ec 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,14 +1,15 @@ # libgtop fr.po -# Copyright (C) 1998 Free Software Foundation, Inc. -# Vincent Renardias , 1998. +# Copyright (C) 1998,1999 Free Software Foundation, Inc. +# Vincent Renardias , 1998,1999. +# Fabrice Bellet , 1999. # msgid "" msgstr "" "Project-Id-Version: libgtop VERSION\n" -"POT-Creation-Date: 1999-05-28 01:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Vincent Renardias \n" -"Language-Team: Vincent Renardias \n" +"POT-Creation-Date: 1999-09-16 23:16+0200\n" +"PO-Revision-Date: 1999-07-27 18:24+0200\n" +"Last-Translator: Vincent Renardias \n" +"Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,7 +32,7 @@ msgstr "Temps CPU en mode syst #: sysdeps/names/cpu.c:47 msgid "CPU Time in the Idle Task" -msgstr "Temps CPU pour la tache inactive" +msgstr "Temps CPU pour la tâche inactive" #: sysdeps/names/cpu.c:48 msgid "Tick Frequency" @@ -39,75 +40,75 @@ msgstr "Fr #: sysdeps/names/cpu.c:49 msgid "SMP Total CPU Time" -msgstr "" +msgstr "Temps CPU Total SMP" #: sysdeps/names/cpu.c:50 msgid "SMP CPU Time in User Mode" -msgstr "" +msgstr "Temps CPU SMP en mode utilisateur" #: sysdeps/names/cpu.c:51 msgid "SMP CPU Time in User Mode (nice)" -msgstr "" +msgstr "Temps CPU SMP en mode utilisateur (nice)" #: sysdeps/names/cpu.c:52 msgid "SMP CPU Time in System Mode" -msgstr "" +msgstr "Temps CPU SMP en mode système" #: sysdeps/names/cpu.c:53 msgid "SMP CPU Time in the Idle Task" -msgstr "" +msgstr "Temps CPU SMP dans la tâche inactive" #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64 msgid "Number of clock ticks since system boot" -msgstr "" +msgstr "Nombre de tics d'horloge depuis le dernier redémarrage" #: sysdeps/names/cpu.c:59 sysdeps/names/cpu.c:65 msgid "Number of clock ticks the system spent in user mode" -msgstr "" +msgstr "Nombre de tics d'horloge passés en mode utilisateur" #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66 msgid "Number of clock ticks the system spent in user mode (nice)" -msgstr "" +msgstr "Nombre de tics d'horloge passés en mode utilisateur (nice)" #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67 msgid "Number of clock ticks the system spent in system mode" -msgstr "" +msgstr "Nombre de tics d'horloge passés en mode système" #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68 msgid "Number of clock ticks the system spent in the idle task" -msgstr "" +msgstr "Nombre de tics d'horloge passés dans la tâche inactive" #: sysdeps/names/cpu.c:63 msgid "Tick frequency (default is 100)" -msgstr "" +msgstr "Fréquence des tics (100 par défaut)" #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48 msgid "Total blocks" -msgstr "" +msgstr "Nombre total de blocs" #: sysdeps/names/fsusage.c:40 msgid "Free blocks" -msgstr "" +msgstr "Blocs libres" #: sysdeps/names/fsusage.c:41 msgid "Available blocks" -msgstr "" +msgstr "Blocs disponibles" #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51 msgid "Total file nodes" -msgstr "" +msgstr "Nombre total de noeuds de fichiers" #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52 msgid "Free file nodes" -msgstr "" +msgstr "Noeuds de fichiers libres" #: sysdeps/names/fsusage.c:49 msgid "Free blocks available to the superuser" -msgstr "" +msgstr "Blocs libres disponibles pour le super-utilisateur" #: sysdeps/names/fsusage.c:50 msgid "Free blocks available to non-superusers" -msgstr "" +msgstr "Blocs libres disponibles pour les utilisateurs non-privilégiés" #: sysdeps/names/loadavg.c:39 msgid "Load Average" @@ -115,28 +116,28 @@ msgstr "Charge Moyenne" #: sysdeps/names/loadavg.c:40 msgid "Running Tasks" -msgstr "" +msgstr "Tâches en cours d'exécution" #: sysdeps/names/loadavg.c:41 msgid "Number of Tasks" -msgstr "" +msgstr "Nombre de tâches" #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50 msgid "Last PID" -msgstr "" +msgstr "Dernier PID" #: sysdeps/names/loadavg.c:47 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes" msgstr "" -"Nombre de processus tournant simultannement en moyenne sur 1, 5 et 15 minutes" +"Nombre de processus tournant simultanément en moyenne sur 1, 5 et 15 minutes" #: sysdeps/names/loadavg.c:48 msgid "Number of tasks currently running" -msgstr "" +msgstr "Nombre de tâches en cours d'exécution" #: sysdeps/names/loadavg.c:49 msgid "Total number of tasks" -msgstr "" +msgstr "Nombre total de tâches" #: sysdeps/names/mem.c:41 msgid "Total Memory" @@ -160,7 +161,7 @@ msgstr "Tampons" #: sysdeps/names/mem.c:46 msgid "Cached" -msgstr "Dans le cache" +msgstr "Cache" #: sysdeps/names/mem.c:47 msgid "User" @@ -168,11 +169,11 @@ msgstr "Utilisateur" #: sysdeps/names/mem.c:48 msgid "Locked" -msgstr "Vérouillé" +msgstr "Verrouillé" #: sysdeps/names/mem.c:53 msgid "Total physical memory in kB" -msgstr "Mémoire physique totalle en Ko" +msgstr "Mémoire physique totale en Ko" #: sysdeps/names/mem.c:54 msgid "Used memory size in kB" @@ -192,7 +193,7 @@ msgstr "Taille des tampons en Ko" #: sysdeps/names/mem.c:58 msgid "Size of cached memory in kB" -msgstr "Taille de la mémoire dans le cache en Ko" +msgstr "Taille de la mémoire cache en Ko" #: sysdeps/names/mem.c:59 msgid "Memory used from user processes in kB" @@ -200,33 +201,33 @@ msgstr "M #: sysdeps/names/mem.c:60 msgid "Memory in locked pages in kB" -msgstr "Mémoire dans les pages vérouillées en Ko" +msgstr "Mémoire dans les pages verrouillées en Ko" #: sysdeps/names/mountlist.c:38 sysdeps/names/mountlist.c:45 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45 msgid "Number of list elements" -msgstr "" +msgstr "Nombre d'éléments de liste" #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46 #: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46 msgid "Total size of list" -msgstr "Taille totalle de la liste" +msgstr "Taille totale de la liste" #: sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47 #: sysdeps/names/procmap.c:40 sysdeps/names/procmap.c:47 msgid "Size of a single list element" -msgstr "" +msgstr "Taille d'un élément de liste" #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51 msgid "Size in kilobytes of message pool" -msgstr "Taille en kilo-octets du pool de messages" +msgstr "Taille en kilo-octets de l'ensemble de messages" #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52 msgid "Number of entries in message map" -msgstr "" +msgstr "Nombre d'entrées dans la table des messages" #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53 msgid "Max size of message" @@ -246,43 +247,43 @@ msgstr "Taille des segments de messages" #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57 msgid "Number of system message headers" -msgstr "Nombre d'entetes de messages système" +msgstr "Nombre d'entêtes de messages système" #: sysdeps/names/prockernel.c:42 msgid "K_Flags" -msgstr "" +msgstr "Drap_N" #: sysdeps/names/prockernel.c:42 msgid "Min_Flt" -msgstr "" +msgstr "DP_Min" #: sysdeps/names/prockernel.c:42 msgid "Maj_Flt" -msgstr "" +msgstr "DP_Maj" #: sysdeps/names/prockernel.c:42 msgid "CMin_Flt" -msgstr "" +msgstr "DP_MinF" #: sysdeps/names/prockernel.c:43 msgid "CMaj_Flt" -msgstr "" +msgstr "DP_MajF" #: sysdeps/names/prockernel.c:43 msgid "KStk_ESP" -msgstr "" +msgstr "ESP_PileN" #: sysdeps/names/prockernel.c:43 msgid "KStk_EIP" -msgstr "" +msgstr "EIP_PileN" #: sysdeps/names/prockernel.c:43 msgid "NWChan" -msgstr "" +msgstr "Chan_NA" #: sysdeps/names/prockernel.c:44 msgid "WChan" -msgstr "" +msgstr "Chan_N" #. K_Flags #: sysdeps/names/prockernel.c:50 @@ -296,6 +297,17 @@ msgid "" "\n" "The math bit should be a decimal 4, and the traced bit is decimal 10." msgstr "" +"Flags Noyau du processus.\n" +"\n" +"Avec Linux actuellement, tous les processus ont le bit mathématique à un, " +"parce que crt0.s teste l'émulation du mode mathématique. Donc ce bit " +"mathématique n'est pas proposé à l'affichage.\n" +"\n" +"Il s'agit propablement d'un bug, puisque tout programme n'est pas issu d'un " +"code en langage C.\n" +"\n" +"Le bit mathématique devrait donner 4 en décimal, et le bit tracé vaut 10 en " +"décimal." #. Min_Flt #: sysdeps/names/prockernel.c:59 @@ -303,6 +315,8 @@ msgid "" "The number of minor faults the process has made, those which have not " "required loading a memory page from disk." msgstr "" +"Le nombre de défauts de page mineurs d'un processus, c'est-à-dire ceux qui " +"n'ont pas nécessité de charger une page mémoire depuis le disque." #. Maj_Flt #: sysdeps/names/prockernel.c:62 @@ -310,16 +324,22 @@ msgid "" "The number of major faults the process has made, those which have required " "loading a memory page from disk." msgstr "" +"Le nombre de défauts de page majeurs d'un processus, c'est-à-dire ceux qui " +"ont nécessité de charger une page mémoire depuis le disque." #. CMin_Flt #: sysdeps/names/prockernel.c:65 msgid "The number of minor faults that the process and its children have made." msgstr "" +"Le nombre de défauts de page mineurs qu'un processus et ses fils ont " +"réalisés." #. CMaj_Flt #: sysdeps/names/prockernel.c:68 msgid "The number of major faults that the process and its children have made." msgstr "" +"Le nombre de défauts de page majeurs qu'un processus et ses fils ont " +"réalisés." #. KStk_ESP #: sysdeps/names/prockernel.c:71 @@ -327,11 +347,13 @@ msgid "" "The current value of esp (32-bit stack pointer), as found in the kernel " "stack page for the process." msgstr "" +"La valeur courante du registre ESP (pointeur de pile 32 bits), tel qu'il " +"apparaît dans la page mémoire noyau du processus." #. KStk_EIP #: sysdeps/names/prockernel.c:74 msgid "The current EIP (32-bit instruction pointer)." -msgstr "" +msgstr "La valeur courante du registre EIP (pointeur d'instruction 32 bits)" #. NWChan #: sysdeps/names/prockernel.c:76 @@ -341,51 +363,58 @@ msgid "" "textual name. (If you have an up-to-date /etc/psdatabase, then try ps -l to " "see the WCHAN field in action)" msgstr "" +"Il s'agit du \"canal\" dans lequel le processus est en attente, constitué " +"par l'adresse d'un appel système dans lequel le processus est bloqué. La " +"correspondance entre l'adresse et le nom de l'appel système est disponible " +"si le fichier /etc/psdatabase est à jour par rapport à la version du noyau " +"(Essayer un ps -l)" #. WChan #: sysdeps/names/prockernel.c:81 msgid "This is the textual name of the `nwchan' field." msgstr "" +"Il s'agit du nom en clair de l'appel système sur lequel le processus est " +"bloqué." #: sysdeps/names/procmem.c:47 msgid "Size" -msgstr "" +msgstr "Taille" #: sysdeps/names/procmem.c:47 msgid "Virtual" -msgstr "" +msgstr "Virtuelle" #: sysdeps/names/procmem.c:47 msgid "Resident" -msgstr "" +msgstr "Résidente" #: sysdeps/names/procmem.c:47 msgid "Share" -msgstr "" +msgstr "Partagée" #: sysdeps/names/procmem.c:48 msgid "Resident Set Size" -msgstr "" +msgstr "Taille pages résidentes (RSS)" #: sysdeps/names/procmem.c:48 msgid "Resident Set Size Limit" -msgstr "" +msgstr "Limite de taille des pages résidentes (RSSL)" #: sysdeps/names/procmem.c:53 msgid "Total # of pages of memory" -msgstr "" +msgstr "Nb total de pages mémoire" #: sysdeps/names/procmem.c:54 msgid "Number of pages of virtual memory" -msgstr "" +msgstr "Nb de pages de mémoire virtuelle" #: sysdeps/names/procmem.c:55 -msgid "Number of residnet set (non-swapped) pages" -msgstr "" +msgid "Number of resident set (non-swapped) pages" +msgstr "Nombre de pages résidentes (non swappées)" #: sysdeps/names/procmem.c:56 msgid "Number of pages of shared (mmap'd) memory" -msgstr "" +msgstr "Nombre de pages partagées (par mmap())" #: sysdeps/names/procmem.c:57 msgid "" @@ -394,329 +423,338 @@ msgid "" "space. This does not include pages which have not been demand-loaded in, or " "which are swapped out." msgstr "" +"Nombre de pages dont le processus dispose en mémoire réelle, moins 3 pour " +"des raisons administratives. Cela comptabilise les pages utilisées pour " +"l'espace de Texte, de Données et de Pile du processus. Cela ne tient pas " +"compte des pages qui n'ont pas encore été demandées (ie accédées), ainsi que " +"de celle qui ont été swappées." #: sysdeps/names/procmem.c:62 msgid "" "Current limit in bytes on the rss of the process (usually 2,147,483,647)." -msgstr "" +msgstr "Limite courante du RSS du processus (2147483647 en général)." #: sysdeps/names/procsegment.c:42 msgid "Text_RSS" -msgstr "" +msgstr "RSS Texte" #: sysdeps/names/procsegment.c:42 msgid "ShLib_RSS" -msgstr "" +msgstr "RSS Libs Part." #: sysdeps/names/procsegment.c:42 msgid "Data_RSS" -msgstr "" +msgstr "RSS Données" #: sysdeps/names/procsegment.c:42 msgid "Stack_RSS" -msgstr "" +msgstr "RSS Pile" #: sysdeps/names/procsegment.c:43 msgid "Dirty Size" -msgstr "" +msgstr "Taille Pages modifiées" #: sysdeps/names/procsegment.c:43 msgid "Start_Code" -msgstr "" +msgstr "Début_code" #: sysdeps/names/procsegment.c:43 msgid "End_Code" -msgstr "" +msgstr "Fin_code" #: sysdeps/names/procsegment.c:43 msgid "Start_Stack" -msgstr "" +msgstr "Début_Pile" #: sysdeps/names/procsegment.c:48 msgid "Text resident set size" -msgstr "" +msgstr "Taille texte résident" #: sysdeps/names/procsegment.c:49 msgid "Shared-Lib resident set size" -msgstr "" +msgstr "Taille résidence des bibs. partagées" #: sysdeps/names/procsegment.c:50 msgid "Data resident set size" -msgstr "" +msgstr "Taille données résidentes" #: sysdeps/names/procsegment.c:51 msgid "Stack resident set size" -msgstr "" +msgstr "Taille Pile résidente" #: sysdeps/names/procsegment.c:52 msgid "Total size of dirty pages" -msgstr "" +msgstr "Taille totale pages modifiées" #: sysdeps/names/procsegment.c:53 msgid "Address of beginning of code segment" -msgstr "" +msgstr "Adresse de début du segment de code" #: sysdeps/names/procsegment.c:54 msgid "Address of end of code segment" -msgstr "" +msgstr "Adresse de fin du segment de code" #: sysdeps/names/procsegment.c:55 msgid "Address of the bottom of stack segment" -msgstr "" +msgstr "Adresse du bas du segment de pile" #: sysdeps/names/procsignal.c:40 msgid "Signal" -msgstr "" +msgstr "Signal" #: sysdeps/names/procsignal.c:40 msgid "Blocked" -msgstr "" +msgstr "Bloqué" #: sysdeps/names/procsignal.c:40 msgid "SigIgnore" -msgstr "" +msgstr "Ignore Sig" #: sysdeps/names/procsignal.c:40 msgid "SigCatch" -msgstr "" +msgstr "Capture Sig" #: sysdeps/names/procsignal.c:45 msgid "Mask of pending signals" -msgstr "" +msgstr "Masque des signaux en attente" #: sysdeps/names/procsignal.c:46 msgid "Mask of blocked signals" -msgstr "" +msgstr "Masque des signaux bloqués" #: sysdeps/names/procsignal.c:47 msgid "Mask of ignored signals" -msgstr "" +msgstr "Masque des signaux ignorés" #: sysdeps/names/procsignal.c:48 msgid "Mask of caught signals" -msgstr "" +msgstr "Masque des signaux capturés" #: sysdeps/names/procstate.c:40 msgid "Cmd" -msgstr "" +msgstr "Commande" #: sysdeps/names/procstate.c:40 msgid "State" -msgstr "" +msgstr "État" #: sysdeps/names/procstate.c:40 msgid "UID" -msgstr "" +msgstr "UID" #: sysdeps/names/procstate.c:40 msgid "GID" -msgstr "" +msgstr "GID" #: sysdeps/names/procstate.c:45 msgid "Basename of executable file in call to exec()" -msgstr "" +msgstr "Chemin du fichier executable lors de l'appel à exec()" #: sysdeps/names/procstate.c:46 msgid "Single-Char code for process state (S=sleeping)" -msgstr "" +msgstr "Code de l'état du processus (S=sommeil)" #: sysdeps/names/procstate.c:47 msgid "UID of process" -msgstr "" +msgstr "ID réel de l'utilisateur du processus" #: sysdeps/names/procstate.c:48 msgid "GID of process" -msgstr "" +msgstr "ID réel du groupe du processus" #: sysdeps/names/proctime.c:44 msgid "Start_Time" -msgstr "" +msgstr "Date de lancement" #: sysdeps/names/proctime.c:44 msgid "RTime" -msgstr "" +msgstr "TempsR" #: sysdeps/names/proctime.c:44 msgid "UTime" -msgstr "" +msgstr "TempsU" #: sysdeps/names/proctime.c:44 msgid "STime" -msgstr "" +msgstr "TempsS" #: sysdeps/names/proctime.c:45 msgid "CUTime" -msgstr "" +msgstr "TempsUF" #: sysdeps/names/proctime.c:45 msgid "CSTime" -msgstr "" +msgstr "TempsSF" #: sysdeps/names/proctime.c:45 msgid "TimeOut" -msgstr "" +msgstr "TimeOut" #: sysdeps/names/proctime.c:45 msgid "It_Real_Value" -msgstr "" +msgstr "Val_Réelle_Int" #: sysdeps/names/proctime.c:46 msgid "Frequency" -msgstr "" +msgstr "Fréquence" #: sysdeps/names/proctime.c:46 msgid "XCPU_UTime" -msgstr "" +msgstr "Temps_XCPU_U" #: sysdeps/names/proctime.c:46 msgid "XCPU_STime" -msgstr "" +msgstr "Temps_XCPU_S" #: sysdeps/names/proctime.c:51 msgid "Start time of process in seconds since the epoch" -msgstr "" +msgstr "Date du lancement du processus en secondes depuis le 01/01/1970." #: sysdeps/names/proctime.c:52 msgid "Real time accumulated by process (should be utime + stime)" -msgstr "" +msgstr "Temps réel accumulé par le processus (corresponds à TempsU + TempsS)" #: sysdeps/names/proctime.c:53 msgid "user-mode CPU time accumulated by process" -msgstr "" +msgstr "Temps CPU passé par le processus en mode utilisateur" #: sysdeps/names/proctime.c:54 msgid "kernel-mode CPU time accumulated by process" -msgstr "" +msgstr "Temps CPU passé par le processus en mode noyau" #: sysdeps/names/proctime.c:55 msgid "cumulative utime of process and reaped children" -msgstr "" +msgstr "Cumul du TempsU du processus et de ses fils" #: sysdeps/names/proctime.c:56 msgid "cumulative stime of process and reaped children" -msgstr "" +msgstr "Cumul du TempsS du processus et de ses fils" #: sysdeps/names/proctime.c:57 msgid "The time (in jiffies) of the process's next timeout" msgstr "" +"Le temps (en jiffies, càd tics d'horloge) avant la prochaine expiration du " +"timer de séquencement du processus." #: sysdeps/names/proctime.c:58 msgid "" "The time (in jiffies) before the next SIGALRM is sent to the process due to " "an interval timer." msgstr "" +"Le temps restant (en jiffies, càd tics d'horloge) avant l'envoi du prochaine " +"signal SIGALRM au processus sur expiration d'un timer de type intervalle." #: sysdeps/names/proctime.c:60 msgid "Tick frequency" -msgstr "" +msgstr "Fréquence des tics d'horloge" #: sysdeps/names/proctime.c:61 msgid "SMP user-mode CPU time accumulated by process" -msgstr "" +msgstr "Temps utilisateur accumulé par le processus en architecture SMP" #: sysdeps/names/proctime.c:62 msgid "SMP kernel-mode CPU time accumulated by process" -msgstr "" +msgstr "Temps noyau accumulé par le processus en architecture SMP" #: sysdeps/names/procuid.c:56 msgid "Uid" -msgstr "" +msgstr "Uid" #: sysdeps/names/procuid.c:56 msgid "EUid" -msgstr "" +msgstr "EUid" #: sysdeps/names/procuid.c:56 msgid "Gid" -msgstr "" +msgstr "Gid" #: sysdeps/names/procuid.c:56 msgid "EGid" -msgstr "" +msgstr "EGid" #: sysdeps/names/procuid.c:56 msgid "Pid" -msgstr "" +msgstr "Pid" #: sysdeps/names/procuid.c:57 msgid "PPid" -msgstr "" +msgstr "PPid" #: sysdeps/names/procuid.c:57 msgid "PGrp" -msgstr "" +msgstr "PGrp" #: sysdeps/names/procuid.c:57 msgid "Session" -msgstr "" +msgstr "Session" #: sysdeps/names/procuid.c:57 msgid "Tty" -msgstr "" +msgstr "Tty" #: sysdeps/names/procuid.c:58 msgid "TPGid" -msgstr "" +msgstr "TPGid" #: sysdeps/names/procuid.c:58 msgid "Priority" -msgstr "" +msgstr "Priorité" #: sysdeps/names/procuid.c:58 msgid "Nice" -msgstr "" +msgstr "Nice" #: sysdeps/names/procuid.c:63 msgid "User ID" -msgstr "" +msgstr "ID d'utilisateur" #: sysdeps/names/procuid.c:64 msgid "Effective User ID" -msgstr "" +msgstr "ID d'utilisateur effectif" #: sysdeps/names/procuid.c:65 msgid "Group ID" -msgstr "" +msgstr "ID de groupe" #: sysdeps/names/procuid.c:66 msgid "Effective Group ID" -msgstr "" +msgstr "ID de groupe effectif" #: sysdeps/names/procuid.c:67 msgid "Process ID" -msgstr "" +msgstr "ID du processus" #: sysdeps/names/procuid.c:68 msgid "PID of parent process" -msgstr "" +msgstr "ID du processus père" #: sysdeps/names/procuid.c:69 msgid "Process group ID" -msgstr "" +msgstr "ID de groupe du processus" #: sysdeps/names/procuid.c:70 msgid "Session ID" -msgstr "" +msgstr "ID de session" #: sysdeps/names/procuid.c:71 msgid "Full device number of controlling terminal" -msgstr "" +msgstr "Numéro du périphérique controllant le terminal" #: sysdeps/names/procuid.c:72 msgid "Terminal process group ID" -msgstr "" +msgstr "ID de groupe du processus de control du terminal" #: sysdeps/names/procuid.c:73 msgid "Kernel scheduling priority" -msgstr "" +msgstr "Priorité de séquencement noyau" #: sysdeps/names/procuid.c:74 msgid "Standard unix nice level of process" -msgstr "" +msgstr "Niveau de \"nice\" (standard unix) du processus" #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56 msgid "Number of entries in semaphore map" -msgstr "" +msgstr "Nombre d'entrées dans la table des sémaphores" #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57 msgid "Max number of arrays" @@ -736,11 +774,11 @@ msgstr "Nombre maximum de s #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61 msgid "Max ops per semop call" -msgstr "" +msgstr "Nombre maximum d'opérations par appel à semop()" #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62 msgid "Max number of undo entries per process" -msgstr "" +msgstr "Nombre maximum de structures 'undo' par processus" #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63 msgid "sizeof struct sem_undo" @@ -752,7 +790,7 @@ msgstr "Valeur maximum d'un s #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65 msgid "Adjust on exit max value" -msgstr "" +msgstr "Valeur maximum de 'Adjust on exit'" #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48 msgid "Max segment size" @@ -772,39 +810,39 @@ msgstr "Nombre maximum de segments partag #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52 msgid "Max total shared memory" -msgstr "Taille totalle de la mémoire partagée" +msgstr "Taille totale de la mémoire partagée" #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48 msgid "Total Swap Space" -msgstr "Taille totalle de la zone d'échange" +msgstr "Taille totale de la zone de swap" #: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49 msgid "Used Swap Space" -msgstr "Taille utilisée de la zone d'échange" +msgstr "Quantité de swap utilisée" #: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50 msgid "Free Swap Space" -msgstr "Espace libre de la zone d'échange" +msgstr "Quantité de swap libre" #: sysdeps/names/swap.c:42 msgid "Page In" -msgstr "" +msgstr "Pages Entrantes (disque vers mémoire)" #: sysdeps/names/swap.c:43 msgid "Page Out" -msgstr "" +msgstr "Pages Sortantes (mémoire vers disque)" #: sysdeps/names/swap.c:51 msgid "Total number of swap pages that have been brought in since system boot" -msgstr "" +msgstr "Nombre total de pages de swap chargées en mémoire depuis le démarrage" #: sysdeps/names/swap.c:53 msgid "Total number of swap pages that have been brought out since system boot" -msgstr "" +msgstr "Nombre total de pages de swap sauvées sur disque depuis le démarrage" #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76 msgid "Server Features" -msgstr "" +msgstr "Caractéristiques serveur" #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77 msgid "CPU Usage" @@ -820,7 +858,7 @@ msgstr "Utilisation du Swap" #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80 msgid "System Uptime" -msgstr "Uptime du système" +msgstr "Durée de fonctionnement" #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81 msgid "Load Averange" @@ -840,19 +878,19 @@ msgstr "Limites de l'ensemble de s #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85 msgid "List of running Processes" -msgstr "Liste des taches en cours d'éxécution" +msgstr "Liste des taches en cours d'exécution" #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86 msgid "Process Status information" -msgstr "Information sur l'état du processus" +msgstr "Information sur l'état des processus" #: sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:87 msgid "Process UID and TTY information" -msgstr "Information UID et TTY du processus" +msgstr "Information sur l'UID et le TTY des processus" #: sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:88 msgid "Process Memory information" -msgstr "Information Mémoire du Processus" +msgstr "Information sur la Mémoire du Processus" #: sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:89 msgid "Process Time information" @@ -872,43 +910,43 @@ msgstr "Information sur la segmentation du processus" #: sysdeps/names/sysdeps.c:66 msgid "Process Arguments" -msgstr "" +msgstr "Arguments du processus" #: sysdeps/names/sysdeps.c:67 sysdeps/names/sysdeps.c:94 msgid "Process Memory Map" -msgstr "" +msgstr "Table mémoire du processus" #: sysdeps/names/sysdeps.c:68 msgid "Mount List" -msgstr "" +msgstr "Liste montages" #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96 msgid "File System Usage" -msgstr "" +msgstr "Utilisation des systèmes de fichiers" #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97 msgid "Network Load" -msgstr "" +msgstr "Charge réseau" #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98 msgid "PPP Statistics" -msgstr "" +msgstr "Statistiques PPP" #: sysdeps/names/sysdeps.c:93 msgid "Command line arguments of the process" -msgstr "" +msgstr "Arguments de la ligne de commande du processus" #: sysdeps/names/sysdeps.c:95 msgid "List of currently mounted filesystems" -msgstr "" +msgstr "Liste des systèmes de fichiers montés" #: sysdeps/names/uptime.c:38 msgid "Uptime" -msgstr "Uptime" +msgstr "Durée de fonctionnement" #: sysdeps/names/uptime.c:39 msgid "Idletime" -msgstr "Idletime" +msgstr "Durée d'inactivité" #: sysdeps/names/uptime.c:44 msgid "Time in seconds since system boot" @@ -922,121 +960,250 @@ msgstr "" #: support/error.c:109 msgid "Unknown system error" -msgstr "" +msgstr "Erreur système inconnue" #: support/getopt.c:669 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "" +msgstr "%s: l'option `%s' est ambigüe\n" #: support/getopt.c:693 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "" +msgstr "%s: l'option `--%s' ne supporte pas d'arguments\n" #: support/getopt.c:698 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "" +msgstr "%s: l'option `%c%s' ne supporte pas d'arguments\n" #: support/getopt.c:715 support/getopt.c:888 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "" +msgstr "%s: l'option `%s' nécessite un argument\n" #. --option #: support/getopt.c:744 #, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "" +msgstr "%s: option inconnue `--%s'\n" #. +option or -option #: support/getopt.c:748 #, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "" +msgstr "%s: option inconnue `%c%s'\n" #. 1003.2 specifies the format of this message. #: support/getopt.c:774 #, c-format msgid "%s: illegal option -- %c\n" -msgstr "" +msgstr "%s: option illégale -- %c\n" #: support/getopt.c:777 #, c-format msgid "%s: invalid option -- %c\n" -msgstr "" +msgstr "%s: option non valide -- %c\n" #. 1003.2 specifies the format of this message. #: support/getopt.c:807 support/getopt.c:937 #, c-format msgid "%s: option requires an argument -- %c\n" -msgstr "" +msgstr "%s: l'option nécessite un argument -- %c\n" #: support/getopt.c:854 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "" +msgstr "%s: l'option `-W %s' is ambigüe\n" #: support/getopt.c:872 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "" +msgstr "%s: l'option `-W %s' ne supporte pas d'arguments\n" #: lib/read.c:75 #, c-format msgid "read %d bytes" -msgstr "" +msgstr "%d octets lus" #: lib/read_data.c:49 msgid "read data size" -msgstr "" +msgstr "taille des données lues" #: lib/read_data.c:66 #, c-format msgid "read data %d bytes" -msgstr "" +msgstr "lecture de %d octets de données" #: lib/write.c:48 #, c-format msgid "write %d bytes" -msgstr "" +msgstr "écriture de %d octets" -#: src/daemon/gnuserv.c:445 +#: src/daemon/gnuserv.c:446 msgid "Enable debugging" -msgstr "" +msgstr "Active le debuggage" -#: src/daemon/gnuserv.c:445 +#: src/daemon/gnuserv.c:446 msgid "DEBUG" -msgstr "" +msgstr "DEBUG" -#: src/daemon/gnuserv.c:447 +#: src/daemon/gnuserv.c:448 msgid "Enable verbose output" -msgstr "" +msgstr "Active la sortie bavarde" -#: src/daemon/gnuserv.c:447 +#: src/daemon/gnuserv.c:448 msgid "VERBOSE" -msgstr "" +msgstr "BAVARD" -#: src/daemon/gnuserv.c:449 +#: src/daemon/gnuserv.c:450 msgid "Don't fork into background" -msgstr "" +msgstr "Ne pas lancer en tâche de fond" -#: src/daemon/gnuserv.c:449 +#: src/daemon/gnuserv.c:450 msgid "NO-DAEMON" -msgstr "" +msgstr "NON-DEMON" -#: src/daemon/gnuserv.c:451 +#: src/daemon/gnuserv.c:452 msgid "Invoked from inetd" -msgstr "" +msgstr "Invoqué à partir de inetd" -#: src/daemon/gnuserv.c:451 +#: src/daemon/gnuserv.c:452 msgid "INETD" -msgstr "" +msgstr "INETD" -#: src/daemon/gnuserv.c:485 +#: src/daemon/gnuserv.c:486 #, c-format msgid "" "Error on option %s: %s.\n" "Run '%s --help' to see a full list of available command line options.\n" msgstr "" +"Erreur sur l'option %s: %s.\n" +"Executer '%s --help' pour avoir la liste des options de la ligne de " +"commande.\n" + +#~ msgid "SMP CPU Flags" +#~ msgstr "Drapeaux CPU SMP" + +#~ msgid "Start_Data" +#~ msgstr "Début_données" + +#~ msgid "End_Data" +#~ msgstr "Fin_données" + +#~ msgid "Start_Brk" +#~ msgstr "Début_Brk" + +#~ msgid "Brk" +#~ msgstr "Brk" + +#~ msgid "Start_MMap" +#~ msgstr "Début_MMap" + +#~ msgid "Arg_Start" +#~ msgstr "Début_Arg" + +#~ msgid "Arg_End" +#~ msgstr "Fin_Arg" + +#~ msgid "Env_Start" +#~ msgstr "Début_Env" + +#~ msgid "Env_End" +#~ msgstr "Fin_Env" + +#~ msgid "Address of beginning of data segment" +#~ msgstr "Adresse du début du segment de données" + +#~ msgid "Address of end of data segment" +#~ msgstr "Adresse de fin du segment de données" + +#~ msgid "Brk_Start" +#~ msgstr "Début_Brk" + +#~ msgid "Brk_End" +#~ msgstr "Fin_Brk" + +#~ msgid "Start of mmap()ed areas" +#~ msgstr "Début des zones allouées par mmap()" + +#~ msgid "RUID" +#~ msgstr "RUID" + +#~ msgid "RGID" +#~ msgstr "RGID" + +#~ msgid "Has CPU" +#~ msgstr "Utilise la CPU" + +#~ msgid "Processor" +#~ msgstr "Processeur" + +#~ msgid "Last Processor" +#~ msgstr "Processeur préc" + +#~ msgid "effective UID of process" +#~ msgstr "ID Effectif de l'utilisateur du processus" + +#~ msgid "effective GID of process" +#~ msgstr "ID effectif du groupe du processus" + +#~ msgid "has_cpu" +#~ msgstr "Utilise la CPU" + +#~ msgid "processor" +#~ msgstr "processeur" + +#~ msgid "last_processor" +#~ msgstr "processeur précédent" + +#~ msgid "XCPU_Flags" +#~ msgstr "Drap_XCPU" + +#~ msgid "SUid" +#~ msgstr "SUid" + +#~ msgid "SGid" +#~ msgstr "SGid" + +#~ msgid "FsUid" +#~ msgstr "FsUid" + +#~ msgid "FsGid" +#~ msgstr "FsGid" + +#~ msgid "NGroups" +#~ msgstr "NGroupes" + +#~ msgid "Groups" +#~ msgstr "Groupes" + +#~ msgid "Saved User ID" +#~ msgstr "ID d'utilisateur sauvegardé" + +#~ msgid "Saved Group ID" +#~ msgstr "ID de groupe sauvegardé" + +#~ msgid "Filesystem User ID" +#~ msgstr "ID d'utilisateur du système de fichiers" + +#~ msgid "Filesystem Group ID" +#~ msgstr "ID de groupe du système de fichiers" + +#~ msgid "Number of additional process groups" +#~ msgstr "Nombre de groupes supplémentaires" + +#~ msgid "Additional process groups" +#~ msgstr "Groupes supplémentaires" + +#~ msgid "Pointer Size" +#~ msgstr "Taille du pointeur" + +#~ msgid "Pointer Size on the Server (in bits)" +#~ msgstr "Taille du pointeur sur le serveur (en bits)" + +#~ msgid "Boot time" +#~ msgstr "Date de démarrage" + +#~ msgid "Boot time (seconds sice epoch)" +#~ msgstr "Date de démarrage (en secondes depuis le 01/01/1970)" diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog index a8334f50..f0e1d919 100644 --- a/src/daemon/ChangeLog +++ b/src/daemon/ChangeLog @@ -1,3 +1,8 @@ +1999-07-29 Martin Baulig + + * Makefile.am: Link the `libgtop_daemon' and the `libgtop_server' + statically if possible. + 1999-05-07 Martin Baulig * server.c (main): There's some problem with uname () - some systems diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 8fb7571a..50c7a7fb 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -41,11 +41,19 @@ libgtop_daemon_LDADD = $(top_builddir)/lib/libgtop.la \ $(GLIB_LIBS)\ @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ +if ENABLE_STATIC +libgtop_daemon_LDFLAGS = -static +endif + libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \ $(top_builddir)/sysdeps/common/libgtop_suid_common.la \ @LIBSUPPORT@ +if ENABLE_STATIC +libgtop_server_LDFLAGS = -static +endif + EXTRA_DIST = server_config.h.in server_config.pl install-exec-hook: diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c index 7df0a7ef..0ed7778d 100644 --- a/src/daemon/gnuserv.c +++ b/src/daemon/gnuserv.c @@ -219,7 +219,7 @@ permitted (u_long host_addr, int fd) * GNU_SECURE protocol.... */ - if (verbose_output) + if (verbose_output) { if (changed_uid || invoked_from_inetd) syslog_message (LOG_WARNING, "Xauth authentication not allowed, " @@ -228,6 +228,7 @@ permitted (u_long host_addr, int fd) syslog_message (LOG_WARNING, "Xauth authentication failed, " "trying GNU_SECURE auth..."); + } } /* Other auth protocols go here, and should execute only if @@ -243,7 +244,7 @@ permitted (u_long host_addr, int fd) if (enable_debug) syslog_message (LOG_DEBUG, "Trying %lx - %lx", host_addr, permitted_hosts [i]); - if (permitted_hosts [i] == NULL) + if (permitted_hosts [i] == 0L) return (FALSE); if (host_addr == permitted_hosts [i]) return (TRUE); diff --git a/src/daemon/slave.c b/src/daemon/slave.c index ffec70c6..f8d5a492 100644 --- a/src/daemon/slave.c +++ b/src/daemon/slave.c @@ -26,12 +26,12 @@ void handle_slave_connection (int input, int output) { - glibtop *server = glibtop_global_server; - int64_t *param_ptr; - const void *ptr; + glibtop *server G_GNUC_UNUSED = glibtop_global_server; + int64_t *param_ptr G_GNUC_UNUSED; + const void *ptr G_GNUC_UNUSED; - unsigned short max_len; - pid_t pid; + unsigned short max_len G_GNUC_UNUSED; + pid_t pid G_GNUC_UNUSED; glibtop_response _resp, *resp = &_resp; glibtop_command _cmnd, *cmnd = &_cmnd; @@ -119,8 +119,8 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp, const void *parameter) { glibtop *server = glibtop_global_server; - unsigned device; - pid_t pid; + unsigned device G_GNUC_UNUSED; + pid_t pid G_GNUC_UNUSED; switch (cmnd->command) { case GLIBTOP_CMND_SYSDEPS: diff --git a/sysdeps/freebsd/AUTHORS b/sysdeps/freebsd/AUTHORS index 45311cea..9da8aceb 100644 --- a/sysdeps/freebsd/AUTHORS +++ b/sysdeps/freebsd/AUTHORS @@ -1 +1,2 @@ -Josh Sled +Martin Baulig (martin@home-of-linux.org) +Josh Sled (jsled@scam.XCF.Berkeley.EDU) diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog index 8fa3675c..c7fdef82 100644 --- a/sysdeps/freebsd/ChangeLog +++ b/sysdeps/freebsd/ChangeLog @@ -1,3 +1,15 @@ +1999-07-29 Martin Baulig + + * proctime.c (glibtop_get_proc_time_p): Fix bug reported by + Takis Psarogiannakopoulos: `start_time' are seconds since the + epoch as it is stated in the manual. + +Tue Jun 15 16:04:10 1999 Timur Bakeyev + + * procuid.c: A fix to a ommitted case, when nor NetBSD, nor + LibGTop >= 1.1.0. This should be investigated closely to cover + more cases.... + 1999-05-26 Martin Baulig More NetBSD 1.4 fixes. diff --git a/sysdeps/freebsd/proctime.c b/sysdeps/freebsd/proctime.c index 5af034e3..d7fbecfe 100644 --- a/sysdeps/freebsd/proctime.c +++ b/sysdeps/freebsd/proctime.c @@ -188,7 +188,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, buf->cutime = tv2sec (pstats.p_cru.ru_utime); buf->cstime = tv2sec (pstats.p_cru.ru_stime); - buf->start_time = tv2sec (pstats.p_start); + buf->start_time = (u_int64_t) pstats.p_start.tv_sec; buf->flags |= _glibtop_sysdeps_proc_time_user; #else diff --git a/sysdeps/freebsd/procuid.c b/sysdeps/freebsd/procuid.c index 4ef63375..03c4598a 100644 --- a/sysdeps/freebsd/procuid.c +++ b/sysdeps/freebsd/procuid.c @@ -38,9 +38,11 @@ static const unsigned long _glibtop_sysdeps_proc_uid_groups = #if LIBGTOP_VERSION_CODE >= 1001000 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) (1L << GLIBTOP_PROC_UID_NGROUPS) + (1L << GLIBTOP_PROC_UID_GROUPS); -#endif #else -0; +0L; +#endif +#else /* LIBGTOP_VERSION_CODE < 1001000 */ +0L; #endif /* Init function. */ diff --git a/sysdeps/guile/names/guile-names.pl b/sysdeps/guile/names/guile-names.pl index 07fcdffc..bdfb2941 100644 --- a/sysdeps/guile/names/guile-names.pl +++ b/sysdeps/guile/names/guile-names.pl @@ -113,7 +113,6 @@ sub output { print 'static SCM'; print 'glibtop_guile_types_' . $feature . ' (void)'; print '{'; - print "\tint i;"; print "\tSCM list;"; print ''; diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog index 587d387d..65aa340b 100644 --- a/sysdeps/linux/ChangeLog +++ b/sysdeps/linux/ChangeLog @@ -1,3 +1,8 @@ +1999-07-29 Martin Baulig + + * proctime.c (glibtop_get_proctime_s): Don't provide `rtime' + any longer since we must not use `rtime = utime + stime'. + 1999-02-20 Martin Baulig * netload.c: Don't include for libc5 systems diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c index a362dc0f..012670ad 100644 --- a/sysdeps/linux/cpu.c +++ b/sysdeps/linux/cpu.c @@ -55,6 +55,7 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf) { char buffer [BUFSIZ], *p; int fd, len, i; + u_int64_t total; glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); @@ -79,7 +80,11 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf) buf->sys = strtoul (p, &p, 0); buf->idle = strtoul (p, &p, 0); - buf->total = buf->user + buf->nice + buf->sys + buf->idle; + total = buf->user; + total += buf->nice; + total += buf->sys; + total += buf->idle; + buf->total = total; buf->frequency = 100; buf->flags = _glibtop_sysdeps_cpu; @@ -94,8 +99,12 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf) buf->xcpu_sys [i] = strtoul (p, &p, 0); buf->xcpu_idle [i] = strtoul (p, &p, 0); - buf->xcpu_total [i] = buf->xcpu_user [i] + buf->xcpu_nice [i] + - buf->xcpu_sys [i] + buf->xcpu_idle [i]; + total = buf->xcpu_user [i]; + total += buf->xcpu_nice [i]; + total += buf->xcpu_sys [i]; + total += buf->xcpu_idle [i]; + + buf->xcpu_total [i] = total; } buf->flags |= _glibtop_sysdeps_cpu_smp; diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c index feff1815..f8b1c8ec 100644 --- a/sysdeps/linux/netload.c +++ b/sysdeps/linux/netload.c @@ -112,8 +112,6 @@ glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, skfd = socket (AF_INET, SOCK_DGRAM, 0); if (skfd) { struct ifreq ifr; - struct sockaddr_in addr; - char *address; unsigned flags; strcpy (ifr.ifr_name, interface); diff --git a/sysdeps/linux/ppp.c b/sysdeps/linux/ppp.c index f450b281..ca476f8e 100644 --- a/sysdeps/linux/ppp.c +++ b/sysdeps/linux/ppp.c @@ -31,6 +31,8 @@ #include #include +#include + #include static const unsigned long _glibtop_sysdeps_ppp = diff --git a/sysdeps/linux/proctime.c b/sysdeps/linux/proctime.c index 10d1e3b5..83ea92b8 100644 --- a/sysdeps/linux/proctime.c +++ b/sysdeps/linux/proctime.c @@ -28,9 +28,8 @@ static const unsigned long _glibtop_sysdeps_proc_time = (1L << GLIBTOP_PROC_TIME_UTIME) + (1L << GLIBTOP_PROC_TIME_CUTIME) + (1L << GLIBTOP_PROC_TIME_STIME) + (1L << GLIBTOP_PROC_TIME_CSTIME) + -(1L << GLIBTOP_PROC_TIME_RTIME) + (1L << GLIBTOP_PROC_TIME_FREQUENCY) + -(1L << GLIBTOP_PROC_TIME_TIMEOUT) + (1L << GLIBTOP_PROC_TIME_IT_REAL_VALUE) + -(1L << GLIBTOP_PROC_TIME_START_TIME); +(1L << GLIBTOP_PROC_TIME_FREQUENCY) + (1L << GLIBTOP_PROC_TIME_TIMEOUT) + +(1L << GLIBTOP_PROC_TIME_IT_REAL_VALUE) + (1L << GLIBTOP_PROC_TIME_START_TIME); static const unsigned long _glibtop_sysdeps_proc_time_smp = (1L << GLIBTOP_PROC_TIME_XCPU_UTIME) + (1L << GLIBTOP_PROC_TIME_XCPU_STIME); @@ -71,8 +70,6 @@ glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid) buf->cutime = strtoul (p, &p, 0); buf->cstime = strtoul (p, &p, 0); - buf->rtime = buf->utime + buf->stime; - p = skip_multiple_token (p, 2); buf->timeout = strtoul (p, &p, 0);