21.2 changes

diff --git a/ChangeLog b/ChangeLog
index 03d7c5b7a707a8437f886ce2a1a0acc931d610ed..2f3cca1f336a01b94d0b90ab84b73a7020df97e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Changes in 21.2
+===============
+2002-09-27 Craig Small <csmall@small.dropbear.id.au>
+       * Big bug in pstree, pstree -a would often fail badly. swapped variable
+         not set.
+       * Removed pidof.1 and a variable not used.
+       * Thanks to Peter Breitenlohner for all this info and Adam Conrad for
+         the test ppc machine.
+
 Changes in 21.1
 ===============
 2002-09-05 Craig Small <csmall@small.dropbear.id.au>

diff --git a/Makefile.am b/Makefile.am
index 5daa71a3b26a9ec86749ab30a237b7d2211be404..3eff62a597d7276101c67173a0bbddcfed7138e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,3 @@ SUBDIRS = doc src po
 
 EXTRA_DIST= config.rpath ABOUT-NLS 
 
-ACLOCAL_AMFLAGS = -I m4

diff --git a/Makefile.in b/Makefile.in
index 218f63a8210bcd3b93cf2352a75f0c7640166a41..fe9bb87809c9db2ee1453be78b022ff045c86dcd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,8 +106,6 @@ install_sh = @install_sh@
 SUBDIRS = doc src po 
 
 EXTRA_DIST = config.rpath ABOUT-NLS 
-
-ACLOCAL_AMFLAGS = -I m4
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index f80603fbb252e08b110b63c9e65d4c3409e46a66..7e27a93ca7b26689755cbe8b4a54d62d297a790e 100644 (file)
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1660,7 +1660,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=psmisc
-VERSION=21.1
+VERSION=21.2
 
 cat >>confdefs.h <<_ACEOF
 @%:@define PACKAGE "$PACKAGE"

diff --git a/configure b/configure
index b1ded3c124728c0caf7b23cae1d4abc1148b58bb..352e10819b749b055bbf06cfdf6cada07f741539 100755 (executable)
--- a/configure
+++ b/configure
@@ -1660,7 +1660,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=psmisc
-VERSION=21.1
+VERSION=21.2
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"

diff --git a/configure.in b/configure.in
index 83b96125abd2d77a0d5405914afc89a32817f4e8..aac9f3d44c01d99a367f6588abac2be312222991 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/comm.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(psmisc,21.1)
+AM_INIT_AUTOMAKE(psmisc,21.2)
 
 dnl checks for options
 AC_SUBST(FLASK_LINUX)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 69ccd7d22e267cf4e8afe2191ff34a4d264cd9a9..cf09cf35c8572d359d1ecb16e4263df08f89e199 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
 
-man_MANS = fuser.1 killall.1 pidof.1 pstree.1
+man_MANS = fuser.1 killall.1 pstree.1
 
 EXTRA_DIST = $(man_MANS)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4a17b89c79d78e68074622d2be0b08a351b2e657..ecab266c6daf1d31dc5cfba99d1de251bd2e5e5a 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -103,7 +103,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
-man_MANS = fuser.1 killall.1 pidof.1 pstree.1
+man_MANS = fuser.1 killall.1 pstree.1
 
 EXTRA_DIST = $(man_MANS)
 subdir = doc

diff --git a/doc/pidof.1 b/doc/pidof.1
deleted file mode 100644 (file)
index f2b7108..0000000
--- a/doc/pidof.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.TH PIDOF 1 "May 6, 1998" "Linux" "User Commands"
-.SH NAME
-pidof \- finds processes by name and lists their PIDs
-.SH SYNOPSIS
-.ad l
-.B pidof
-.RB [ \-eg ]
-.I name ...
-.br
-.B pidof
-.RB \-V
-.ad b
-.SH DESCRIPTION
-.B pidof
-lists the PIDs of all processes running any of the specified commands.
-.PP
-If the command name contains a slash (\fB/\fP), processes executing that
-particular file will be selected, independent of their name.
-.PP
-\fBpidof\fP returns a non-zero return code if no process has been found 
-for any of the listed commands. If at least one process has been found for
-each command, \fBpidof\fP returns zero.
-.SH OPTIONS
-.IP \fB\-e\fP
-Require an exact match for very long names. If a command name is longer
-than 15 characters, the full name may be unavailable (i.e. it is swapped
-out). In this case, \fBpidof\fP will list everything that matches within
-the first 15 characters. With \fB\-e\fP, such entries are silently skipped.
-.IP \fB\-g\fP
-Show process group IDs instead of process IDs. If multiple processes with
-the same process group ID were found, only the first process is shown.
-.IP \fB\-V\fP
-Display version information.
-.SH FILES
-.nf
-/proc  location of the proc file system
-.fi
-.SH "KNOWN BUGS"
-Selection by file only works for executables that are kept open during
-execution, i.e. impure executables can't be selected this way.
-.SH AUTHOR
-Werner Almesberger <Werner.Almesberger@epfl.ch>
-.SH "SEE ALSO"
-killall(1), fuser(1), ps(1)
-.\"{{{}}}

diff --git a/po/de.gmo b/po/de.gmo
index 722b8c505e1a461197a603a9ad2b0c6b09e41ccd..b513de3614273eca75b3b9f46aa04944865526ab 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index 7bb9118ee16e4bb0a92906ee931d6848372664d8..b7d7c677dbe2ecb3008832e6be56af763384a56e 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: 2002-04-12 21:33+1000\n"
 "Last-Translator: Wolfgang Schorer <wcc@wolfgangs.com>\n"
 "Language-Team: woolfy <woolfy@users.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr "ueberspringe teilweise Uebereinstimmung von %s(%d)\n"
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr "%s(%s%d) mit dem Signal %d abgebrochen\n"
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s ist leer (nicht gemountet ?)\n"
@@ -45,62 +45,62 @@ msgstr "%s: Kein Prozess abgebrochen\n"
 msgid "Maximum number of names is %d\n"
 msgstr "Die maximale Anzahl der Namen ist %d\n"
 
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr "-4 Flag verwendet, die Proc Datei %s ist aber nicht lesbar\n"
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr "-6 Flag verwendet, die Proc Datei %s ist aber nicht lesbar\n"
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr "Prozess %d abbrechen? (y/n) "
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr "Abbruch von %d"
 
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr "Keine automatische Loeschung. Bitte verwenden Sie  umount %s\n"
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr "Keine automatische Loeschung. Bitte verwenden Sie  swapoff %s\n"
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr "Interner Fehler (Typ %d)\n"
 
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr "Kernel mount  "
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr "Kernel Schleife (loop)   "
 
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr "Kernel swap   "
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr "Keine Prozess Referenzen; verwenden Sie -v fuer die komplette Liste\n"
 
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr "Kann die Geraetenummer der Sockets nicht finden"
 
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -148,12 +148,12 @@ msgstr ""
 "  udp/tcp Namen: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
-#: src/fuser.c:964
+#: src/fuser.c:963
 #, fuzzy
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
@@ -173,12 +173,12 @@ msgstr ""
 "Dateien, die\n"
 " COPYING genannt werden.\n"
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr "-m wird ignoriert im Namensraum \"%s\"\n"
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr "%s/%s: Falsche Spezifikation\n"

diff --git a/po/en.gmo b/po/en.gmo
index 2db0c2265be320c712799d3f7c2db4cf25b390cb..252ab07b90f8b472960b2bb3e06cca19e5e64f5b 100644 (file)
Binary files a/po/en.gmo and b/po/en.gmo differ

diff --git a/po/en.po b/po/en.po
index 03711fe8ce87c68ed34731a5183e2ef3ca18f9e3..ba726549ec2348f6829180f298332131b59f8f9b 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: 2001-10-29 15:00+11\n"
 "Last-Translator: Craig Small <csmall@small.dropbear.id.au>\n"
 "Language-Team: English <en@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "skipping partial match %s(%d)\n"
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr "Killed %s(%s%d) with signal %d\n"
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s is empty (not mounted ?)\n"
@@ -44,62 +44,62 @@ msgstr "%s: no process killed\n"
 msgid "Maximum number of names is %d\n"
 msgstr "Maximum number of names is %d\n"
 
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr "-4 flag used but proc file %s is not readable\n"
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr "-6 flag used but proc file %s is not readable\n"
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr "Kill process %d ? (y/n) "
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr "kill %d"
 
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr "No automatic removal. Please use  umount %s\n"
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr "No automatic removal. Please use  swapoff %s\n"
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr "Internal error (type %d)\n"
 
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr "kernel mount  "
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr "kernel loop   "
 
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr "kernel swap   "
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr "No process references; use -v for the complete list\n"
 
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr "can't find sockets' device number"
 
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -147,12 +147,12 @@ msgstr ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
-#: src/fuser.c:964
+#: src/fuser.c:963
 #, fuzzy
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
@@ -171,12 +171,12 @@ msgstr ""
 "of the GNU General Public License.\n"
 "For more information about these matters, see the files named COPYING.\n"
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr "ignoring -m in name space \"%s\"\n"
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr "%s/%s: invalid specificiation\n"

diff --git a/po/fr.gmo b/po/fr.gmo
index 9f0051e38c4d17aa801503d4556fc7280b921940..619b742ee82a8c9d310d20ccb33fd47aeef2b151 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index d2ea1bb96e694bc45051c54d16850f503d2d6f78..f8c7b43fadb650dcdffc9b7e204c10adb4b9432d 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: 2002-04-12 21:33+1000\n"
 "Last-Translator: Marc Léger <sorata@users.sourceforge.net>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -28,7 +28,7 @@ msgstr "Ignore la correspondance partielle %s(%d)\n"
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr "Tué %s(%s%d) avec le signal %d\n"
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s est vide (non monté ?)\n"
@@ -43,64 +43,64 @@ msgstr "%s: aucun processus tu
 msgid "Maximum number of names is %d\n"
 msgstr "Le nombre maximum de noms est %d\n"
 
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr "drapeau -4 utilisé mais le fichier proc %s est illisible\n"
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr "drapeau -6 utilisé mais le fichier proc %s est illisible\n"
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr "Tuer le processus %d ? (y/n) "
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr "tuer %d"
 
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr "Pas de démontage automatique. Utiliser SVP  umount %s\n"
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr ""
 "Pas de démontage automatique du fichier d'échange. Utiliser SVP  swapoff %s\n"
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr "Erreur interne (type %d)\n"
 
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr "montage du noyau   "
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr "boucle du noyau   "
 
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr "fichier d'échange du noyau   "
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr ""
 "Pas de références sur le processus; utiliser -v pour la liste complète\n"
 
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr "ne peut pas trouver le numéro du périphérique des sockets"
 
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -149,12 +149,12 @@ msgstr ""
 "  noms udp/tcp: [port_local][,[hôte_distant][,[port_distant]]]\n"
 "\n"
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
-#: src/fuser.c:964
+#: src/fuser.c:963
 #, fuzzy
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
@@ -174,12 +174,12 @@ msgstr ""
 "Pour plus de précisions à propos de ces problèmes, voir les fichiers nommés "
 "COPYING.\n"
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr "ignore -m dans l'espace de noms \"%s\"\n"
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr "%s/%s: spécification invalide\n"

diff --git a/po/it.gmo b/po/it.gmo
index bb44aee70dc8e502ed845764bcd1ae4cdf9a8ce6..795e16cf6abe5dbb8339323ddb288fe5955e2379 100644 (file)
Binary files a/po/it.gmo and b/po/it.gmo differ

diff --git a/po/it.po b/po/it.po
index bc4da166fb0a8d07dcd1c6be8a6ac301f40aabe2..72800931efaddfe93dbd14e60b074ec67bda3752 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc version 20\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: 2001-10-28 18:57--700\n"
 "Last-Translator: Daniele Pagano <dan@esaurito.com>\n"
 "Language-Team: esaurito <esaurito@users.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "ignorata corrispondenza parziale %s(%d)\n"
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr "Terminato %s(%s%d) con segnale %d\n"
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s è vuoto (non montato?)\n"
@@ -45,67 +45,67 @@ msgid "Maximum number of names is %d\n"
 msgstr "Il massimo numero di nomi è %d\n"
 
 # 'proc' non tradotto: termine specifico di Linux
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr "usata opzione -4  ma file proc %s non leggibile\n"
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr "usata opzione -6  ma file proc %s non leggibile\n"
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr "Termina processo %d ? (y/n) "
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr "termina %d"
 
 # nomi comandi non tradotti
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr "Impossible rimuovere automaticamente. Usare umount %s\n"
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr "Impossible rimuovere automaticamente. Usare swapoff %s\n"
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr "Errore interno (tipo %d)\n"
 
 # kernel e mount non tradotti: termini specifici
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr "mount del kernel"
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr "ciclo del kernel"
 
 # assunto 'swap' sta per 'swap filesystem'
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr "file di scambio del kernel"
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr "Nessun riferimento al processo; usare -v per lista completa\n"
 
 # socket non tradotto: termine tecnico
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr "impossibile trovare numero della periferica del socket"
 
 # tradotto 'namespace' con 'contesto'; modificata indentazione descrizioni
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -153,13 +153,13 @@ msgstr ""
 "  udp/tcp nomi: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
 # Traduzione mia (non ufficiale) del messaggio GNU
-#: src/fuser.c:964
+#: src/fuser.c:963
 #, fuzzy
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
@@ -178,12 +178,12 @@ msgstr ""
 "Per ulteriori informazioni in merito, consultare il file COPYING (in lingua "
 "inglese).\n"
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr "ignorato -m nel contesto \"%s\"\n"
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr "%s/%s: specificazione non valida\n"

diff --git a/po/psmisc.pot b/po/psmisc.pot
index f8ceae574e1b8ba7131eddb14a498b3740edee09..6e761c50f89c84252bf7d7c323c4449c9f19cdd1 100644 (file)
--- a/po/psmisc.pot
+++ b/po/psmisc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr ""
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr ""
@@ -45,62 +45,62 @@ msgstr ""
 msgid "Maximum number of names is %d\n"
 msgstr ""
 
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr ""
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr ""
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr ""
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr ""
 
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr ""
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr ""
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr ""
 
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr ""
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr ""
 
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr ""
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr ""
 
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr ""
 
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -126,12 +126,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr ""
 
-#: src/fuser.c:964
+#: src/fuser.c:963
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
 "\n"
@@ -142,12 +142,12 @@ msgid ""
 "For more information about these matters, see the files named COPYING.\n"
 msgstr ""
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr ""
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr ""

diff --git a/po/pt.gmo b/po/pt.gmo
index cf43bd4a4d86a3fa2d55f39f8d3b480b2d2395ce..0a42623b5e62e0bada93226f97cddd7d505e8dba 100644 (file)
Binary files a/po/pt.gmo and b/po/pt.gmo differ

diff --git a/po/pt.po b/po/pt.po
index aaa2daf0eafafd9dd2c1ce32758033b74d77e7c3..f9be1a03a7de6c6f59f92b9bf43f49a86c62e079 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 1.0\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: 2001-10-28 22:14-0200\n"
 "Last-Translator: Edesio Costa e Silva <edesio+psmisc@ieee.org>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -28,7 +28,7 @@ msgstr "ignorando resultado parcial %s(%d)\n"
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr "Abortado %s(%s%d) com sinal %d\n"
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s está vazio (não está montado?)\n"
@@ -43,63 +43,63 @@ msgstr "%s: nenhum processo abortado\n"
 msgid "Maximum number of names is %d\n"
 msgstr "Número máximo de nomes é %d\n"
 
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr "opção -4 utilizada mas o arquivo %s não pode ser lido\n"
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr "opção -6 utilizada mas o arquivo %s não pode ser lido\n"
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr "Aborta processo %d ? (y/n) "
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr "kill %d"
 
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr "Não pode ser automaticamente removido. Por favor, utilize  umount %s\n"
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr ""
 "Não pode ser automaticamente removido. Por favor, utilize  swapoff %s\n"
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr "Erro interno (tipo %d)\n"
 
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr "kernel mount  "
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr "kernel loop   "
 
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr "kernel swap   "
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr "Nenhuma referência a processo; utilize -v para uma listagem completa\n"
 
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr "não pode achar o número de dispositivo do socket"
 
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -151,12 +151,12 @@ msgstr ""
 "\"  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\\n\"\n"
 "\"\\n\"\n"
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
-#: src/fuser.c:964
+#: src/fuser.c:963
 #, fuzzy
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
@@ -175,12 +175,12 @@ msgstr ""
 "Para maiores informações sobre estes assuntos, veja os arquivos com nome "
 "COPYING.\n"
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr "ignorando opção -m no espaço de nomes \"%s\"\n"
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr "%s/%s: especificação invalida\n"

diff --git a/po/sv.gmo b/po/sv.gmo
index fe6bb541a8767ec0622333928a0f1ca4b39c7408..82134d4a7c03e81f9bfb83987b1b611edc556ba0 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ

diff --git a/po/sv.po b/po/sv.po
index a272ca3ada445cc1ace2bb287fa2adba87b20b45..084a1aa4a33cf07d78e507adc49fd47ec82fe314 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
-"POT-Creation-Date: 2002-09-26 09:26+1000\n"
+"POT-Creation-Date: 2002-09-27 21:08+1000\n"
 "PO-Revision-Date: 2002-05-04 12:27+0100\n"
 "Last-Translator: Joakim Mared <joakim at bfcom dot se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "hoppar 
 msgid "Killed %s(%s%d) with signal %d\n"
 msgstr "Avslutade %s(%s%d) med signal %d\n"
 
-#: src/killall.c:330 src/fuser.c:492
+#: src/killall.c:330 src/fuser.c:491
 #, c-format
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s är tom (inte monterad ?)\n"
@@ -44,62 +44,62 @@ msgstr "%s: ingen process avslutad\n"
 msgid "Maximum number of names is %d\n"
 msgstr "Maximalt antal namn är %d\n"
 
-#: src/fuser.c:244
+#: src/fuser.c:243
 #, c-format
 msgid "-4 flag used but proc file %s is not readable\n"
 msgstr "-4 används men proc-fil %s kan inte läsas\n"
 
-#: src/fuser.c:253
+#: src/fuser.c:252
 #, c-format
 msgid "-6 flag used but proc file %s is not readable\n"
 msgstr "-6 används men proc-fil %s kan inte läsas\n"
 
-#: src/fuser.c:590
+#: src/fuser.c:589
 #, c-format
 msgid "Kill process %d ? (y/n) "
 msgstr "Avsluta process %d ? (y/n) "
 
-#: src/fuser.c:620
+#: src/fuser.c:619
 #, c-format
 msgid "kill %d"
 msgstr "avsluta %d"
 
-#: src/fuser.c:624 src/fuser.c:628
+#: src/fuser.c:623 src/fuser.c:627
 #, c-format
 msgid "No automatic removal. Please use  umount %s\n"
 msgstr "Ingen automatisk avmontering. Använd  umount %s\n"
 
-#: src/fuser.c:632
+#: src/fuser.c:631
 #, c-format
 msgid "No automatic removal. Please use  swapoff %s\n"
 msgstr "Ingen automatisk avmontering av swap. Använd  swapoff %s\n"
 
-#: src/fuser.c:735
+#: src/fuser.c:734
 #, c-format
 msgid "Internal error (type %d)\n"
 msgstr "Internt fel (typ %d)\n"
 
-#: src/fuser.c:765
+#: src/fuser.c:764
 msgid "kernel mount  "
 msgstr "monteringspunkt för kärna  "
 
-#: src/fuser.c:768
+#: src/fuser.c:767
 msgid "kernel loop   "
 msgstr "loop i kärna   "
 
-#: src/fuser.c:771
+#: src/fuser.c:770
 msgid "kernel swap   "
 msgstr "växlingsutrymme för kärna   "
 
-#: src/fuser.c:791
+#: src/fuser.c:790
 msgid "No process references; use -v for the complete list\n"
 msgstr "Processreferens saknas; använd -v för komplett lista\n"
 
-#: src/fuser.c:929
+#: src/fuser.c:928
 msgid "can't find sockets' device number"
 msgstr "kunde inte hitta uttagets (socket) enhetsnummer"
 
-#: src/fuser.c:938
+#: src/fuser.c:937
 msgid ""
 "usage: fuser [ -a | -s ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
@@ -148,12 +148,12 @@ msgstr ""
 "  udp/tcp namn: [lokal_port][,[fjärrvärd][,[fjärrport]]]\n"
 "\n"
 
-#: src/fuser.c:962
+#: src/fuser.c:961
 #, c-format
 msgid "fuser (psmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
-#: src/fuser.c:964
+#: src/fuser.c:963
 #, fuzzy
 msgid ""
 "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n"
@@ -171,12 +171,12 @@ msgstr ""
 "GNU General Public License\n"
 "För mer information om detta, se filen COPYING.\n"
 
-#: src/fuser.c:1142
+#: src/fuser.c:1141
 #, c-format
 msgid "ignoring -m in name space \"%s\"\n"
 msgstr "ignorerar -m i utrymme \"%s\"\n"
 
-#: src/fuser.c:1150
+#: src/fuser.c:1149
 #, c-format
 msgid "%s/%s: invalid specificiation\n"
 msgstr "%s/%s: ogiltig specifikation\n"

diff --git a/src/fuser.c b/src/fuser.c
index bc88ac828cf511de1fab7e7dc05eeb85e53f98a6..58bd402de07cb29a160390e88017bb257096b059 100644 (file)
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -164,7 +164,6 @@ parse_net_file (SPACE_DSC * dsc,char *filename, NET_CACHE **lastptr,int version
   char line[MAX_LINE + 1];
   char rmt_addr[128];
   char addr6[128];
-  struct in6_addr in6;
 
   if (!(file = fopen (filename, "r")))
     {
@@ -182,7 +181,7 @@ parse_net_file (SPACE_DSC * dsc,char *filename, NET_CACHE **lastptr,int version
          exit (1);
        }
       if (sscanf (line, "%*d: %*x:%x %64[0-9A-Fa-f]:%x %*x %*x:%*x %*x:%*x %*x %*d %*d "
-                 "%ld", &new->lcl_port, rmt_addr, &new->rmt_port,
+                 "%Ld", &new->lcl_port, rmt_addr, &new->rmt_port,
                  &new->ino) != 4)
        {
          free (new);

diff --git a/src/pstree.c b/src/pstree.c
index ce678138faba8d37b05d76f82a5af312fbe143ee..b252846fbf6825719fbd2749e74755f34767f11d 100644 (file)
--- a/src/pstree.c
+++ b/src/pstree.c
@@ -393,7 +393,8 @@ dump_tree (PROC * current, int level, int rep, int leaf, int last,
     }
   if (current->highlight && (tmp = tgetstr ("md", NULL)))
     tputs (tmp, 1, putchar);
-  if ((swapped && print_args) && current->argc < 0)
+  swapped = info = print_args;
+  if (swapped  && current->argc < 0)
     out_char ('(');  
   comm_len = 0;
   for (here = current->comm; *here; here++)
@@ -414,15 +415,14 @@ dump_tree (PROC * current, int level, int rep, int leaf, int last,
        comm_len += 4;
       }
   offset = cur_x;
-  info = pids || (user_change && prev_uid != current->uid);
-  if (info)
-    out_char (swapped ? ',' : '(');
   if (pids)
+  {
+    out_char(info++ ? ',' : '(');
     (void) out_int (current->pid);
+  }
   if (user_change && prev_uid != current->uid)
     {
-      if (pids)
-       out_char (',');
+      out_char (info++ ? ',' : '(');
       if ((pw = getpwuid (current->uid)))
        out_string (pw->pw_name);
       else
@@ -430,16 +430,15 @@ dump_tree (PROC * current, int level, int rep, int leaf, int last,
     }
 #ifdef FLASK_LINUX
   if ( show_sids ) {
-      out_char(',');
-      out_sid(current->sid);
+    out_char (info++ ? ',' : '(');
+    out_sid(current->sid);
   }
   if ( show_scontext ) {
-      out_char(',');
-      out_scontext(current->sid);
+    out_char (info++ ? ',' : '(');
+    out_scontext(current->sid);
   }
 #endif /*FLASK_LINUX*/
-  /*XXX if (info || swapped) */
-  if (swapped && print_args && current->argc < 0) 
+  if ((swapped && print_args && current->argc < 0) || (!swapped && info))
     out_char (')');
   if (current->highlight && (tmp = tgetstr ("me", NULL)))
     tputs (tmp, 1, putchar);