From fd7ab7e5ee463ab72e33c7d437c933e5cc3529ed Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 9 Nov 2004 11:19:12 +0000 Subject: [PATCH] removed compiled po files from archive --- doc/fuser.1 | 40 ++++++++++++------------- doc/killall.1 | 32 ++++++++++---------- doc/pstree.1 | 14 ++++----- po/.cvsignore | 1 + po/POTFILES.in | 1 + po/de.gmo | Bin 2051 -> 0 bytes po/en.gmo | Bin 1888 -> 0 bytes po/fr.gmo | Bin 2021 -> 0 bytes po/it.gmo | Bin 2000 -> 0 bytes po/pt.gmo | Bin 2006 -> 0 bytes po/sv.gmo | Bin 5575 -> 0 bytes src/fuser.c | 18 +++++------ src/killall.c | 79 +++++++++++++++++++++++++------------------------ src/pstree.c | 61 +++++++++++++++++++------------------- src/signals.c | 9 ++---- 15 files changed, 126 insertions(+), 129 deletions(-) delete mode 100644 po/de.gmo delete mode 100644 po/en.gmo delete mode 100644 po/fr.gmo delete mode 100644 po/it.gmo delete mode 100644 po/pt.gmo delete mode 100644 po/sv.gmo diff --git a/doc/fuser.1 b/doc/fuser.1 index dc76514..ef7c3c6 100644 --- a/doc/fuser.1 +++ b/doc/fuser.1 @@ -1,4 +1,4 @@ -.TH FUSER 1 "September 26, 2003" "Linux" "User Commands" +.TH FUSER 1 2004-11-09 "Linux" "User Commands" .SH NAME fuser \- identify processes using files or sockets .SH SYNOPSIS @@ -9,15 +9,15 @@ fuser \- identify processes using files or sockets .RB [ \-n\ \fIspace ] .RB [ \-k .RB [ \-i ] -.RB [ \-\fIsignal\fR ] +.RB [ \-\fIsignal\fR ] ] .RB [ \-muvf ] .I name ... .br -.B fuser +.B fuser .RB \-l .br -.B fuser +.B fuser .RB \-V .ad b .SH DESCRIPTION @@ -43,9 +43,9 @@ is accessed or in case of a fatal error. If at least one access has been found, \fBfuser\fP returns zero. .PP In order to look up processes using TCP and UDP sockets, the corresponding -name space has to be selected with the \fB-n\fP option. By default -\fBfuser\fP will look in both IPv6 and IPv4 sockets. To change the default, -behavour, use the \fB-4\fP and \fB-6\fP options. The socket(s) can +name space has to be selected with the \fB\-n\fP option. By default +\fBfuser\fP will look in both IPv6 and IPv4 sockets. To change the default, +behavour, use the \fB\-4\fP and \fB\-6\fP options. The socket(s) can be specified by the local and remote port, and the remote address. All fields are optional, but commas in front of missing fields must be present: @@ -64,7 +64,7 @@ Same as \-m option, used for POSIX compatibility. .IP \fB\-f\fP Silently ignored, used for POSIX compatibility. .IP \fB\-k\fP -Kill processes accessing the file. Unless changed with \fB-\fP\fIsignal\fP, +Kill processes accessing the file. Unless changed with \fB\-\fP\fIsignal\fP, SIGKILL is sent. An \fBfuser\fP process never kills itself, but may kill other \fBfuser\fP processes. The effective user ID of the process executing \fBfuser\fP is set to its real user ID before attempting to kill. @@ -82,7 +82,7 @@ directory. .IP \fB\-n\ \fIspace\fP Select a different name space. The name spaces \fBfile\fP (file names, the default), \fBudp\fP (local UDP ports), and \fBtcp\fP (local TCP ports) are -supported. For ports, either the port number or the symbolic name can be +supported. For ports, either the port number or the symbolic name can be specified. If there is no ambiguity, the shortcut notation \fIname\fB/\fIspace\fP (e.g. \fIname\fB/\fIproto\fP) can be used. .IP \fB\-s\fP @@ -91,7 +91,7 @@ Silent operation. \fB\-u\fP and \fB\-v\fP are ignored in this mode. .IP \fB\-\fIsignal\fP Use the specified signal instead of SIGKILL when killing processes. Signals can be specified either by name (e.g. \fB\-HUP\fP) or by number -(e.g. \fB\-1\fP). This option is silently ignored if the \fB\-k\fP option +(e.g. \fB\-1\fP). This option is silently ignored if the \fB\-k\fP option is not used. .IP \fB\-u\fP Append the user name of the process owner to each PID. @@ -103,10 +103,10 @@ mount point, a swap file, etc.), \fBkernel\fP is shown instead of the PID. .IP \fB\-V\fP Display version information. .IP \fB\-4\fP -Search only for IPv4 sockets. This option must not be used with the -\fB-6\fP option and only has an effect with the tcp and udp namespaces. +Search only for IPv4 sockets. This option must not be used with the +\fB\-6\fP option and only has an effect with the tcp and udp namespaces. .IP \fB\-6\fP -Search only for IPv6 sockets. This option must not be used with the \fB-4\fP +Search only for IPv6 sockets. This option must not be used with the \fB\-4\fP option and only has an effect with the tcp and udp namespaces. .IP \fB\-\fP Reset all options and set the signal back to SIGKILL. @@ -115,10 +115,10 @@ Reset all options and set the signal back to SIGKILL. /proc location of the proc file system .fi .SH EXAMPLES -\fBfuser -km /home\fP kills all processes accessing the file system /home +\fBfuser \-km /home\fP kills all processes accessing the file system /home in any way. .LP -\fBif fuser -s /dev/ttyS1; then :; else \fIsomething\fP; fi\fR invokes +\fBif fuser \-s /dev/ttyS1; then :; else \fIsomething\fP; fi\fR invokes \fIsomething\fP if no other process is using /dev/ttyS1. .LP \fBfuser telnet/tcp\fP shows all processes at the (local) TELNET port. @@ -143,14 +143,14 @@ searched with kernels older than 1.3.78. \fBudp\fP and \fBtcp\fP currently work with IPv6 and IPv4, but the address fields can only be IPv4 addresses. .PP -Accesses by the kernel are only shown with the \fB-v\fP option. +Accesses by the kernel are only shown with the \fB\-v\fP option. .PP -The \fB-k\fP option only works on processes. If the user is the kernel, +The \fB\-k\fP option only works on processes. If the user is the kernel, \fBfuser\fP will print an advice, but take no action beyond that. .SH BUGS .PP -fuser -m /dev/sgX will show (or kill with the -k flag) all processes, even -if you don't have that device configured. There may be other devices it +fuser \-m /dev/sgX will show (or kill with the \-k flag) all processes, even +if you don't have that device configured. There may be other devices it does this for too. .SH AUTHORS .PP @@ -158,5 +158,5 @@ Werner Almesberger .PP Craig Small .SH "SEE ALSO" -kill(1), killall(1), lsof(8), ps(1), kill(2) +.BR kill "(1), " killall "(1), " lsof "(8), " ps "(1), " kill (2). .\"{{{}}} diff --git a/doc/killall.1 b/doc/killall.1 index 522dcba..ad22f8a 100644 --- a/doc/killall.1 +++ b/doc/killall.1 @@ -1,16 +1,16 @@ -.TH KILLALL 1 "September 26, 2003" "Linux" "User Commands" +.TH KILLALL 1 2004-11-09 "Linux" "User Commands" .SH NAME killall \- kill processes by name .SH SYNOPSIS .ad l .B killall .RB [ \-d , \-\-sid ] -.RB [ \-c , \-\-context ] -.RB [ \-e , --exact ] -.RB [ \-g , \-\-process-group ] +.RB [ \-c , \-\-context ] +.RB [ \-e , \-\-exact ] +.RB [ \-g , \-\-process\-group ] .RB [ \-i , \-\-interactive ] .RB [ \-q , \-\-quiet ] -.RB [ \-s , \-\-signal +.RB [ \-s , \-\-signal .IR signal ] .RB [ \-v , \-\-verbose ] .RB [ \-w , \-\-wait ] @@ -30,12 +30,12 @@ sends a signal to all processes running any of the specified commands. If no signal name is specified, SIGTERM is sent. .PP Signals can be specified either by name (e.g. \fB\-HUP\fP) or by number -(e.g. \fB\-1\fP). +(e.g. \fB\-1\fP). .PP If the command name contains a slash (\fB/\fP), processes executing that particular file will be selected for killing, independent of their name. .PP -\fBkillall\fP returns a zero return code if at least one process has been +\fBkillall\fP returns a zero return code if at least one process has been killed for each listed command. \fBkillall\fP returns non-zero otherwise. .PP A \fBkillall\fP process never kills itself (but may kill other \fBkillall\fP @@ -46,11 +46,11 @@ 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, \fBkillall\fP will kill everything that matches within the first 15 characters. With \fB\-e\fP, such entries are skipped. -\fBkillall\fP prints a message for each skipped entry +\fBkillall\fP prints a message for each skipped entry if \fB\-v\fP is specified in addition to \fB\-e\fP, -.IP "\fB\-I\fP, \fB\-\-ignore-case\fP" +.IP "\fB\-I\fP, \fB\-\-ignore\-case\fP" Do case insensitive process name match. -.IP "\fB\-g\fP, \fB\-\-process-group\fP" +.IP "\fB\-g\fP, \fB\-\-process\-group\fP" Kill the process group to which the process belongs. The kill signal is only sent once per group, even if multiple processes belonging to the same process group were found. @@ -71,10 +71,11 @@ Note that \fBkillall\fP may wait forever if the signal was ignored, had no effect, or if the process stays in zombie state. .IP \fB\-d\fP (Flask only) Specify SID: kill only processes with given SID. Mutually exclusive -with \fB-c\fP argument. Must precede other arguments on command line. +with \fB\-c\fP argument. Must precede other arguments on command line. .IP \fB\-c\fP -(Flask only) Specify security context: kill only processes with given security context. -Mutually exclusive with \fB-d\fP. Must precede other arguments on the command line. +(Flask only) Specify security context: kill only processes with given security +context. Mutually exclusive with \fB\-d\fP. Must precede other arguments on +the command line. .SH FILES .nf /proc location of the proc file system @@ -91,8 +92,9 @@ user. a new process with the same PID between scans. .SH AUTHORS Werner Almesberger wrote the original version -of psmisc. Since version 20 Craig Small +of psmisc. Since version 20 Craig Small can be blamed. .SH "SEE ALSO" -.BR kill (1), fuser (1), pgrep (1), pidof (1), pkill (1), ps (1), kill (2) +.BR kill "(1), " fuser "(1), " pgrep "(1), " pidof "(1), " pkill "(1), " +.BR ps "(1), " kill (2). .\"{{{}}} diff --git a/doc/pstree.1 b/doc/pstree.1 index 391fe35..886d164 100644 --- a/doc/pstree.1 +++ b/doc/pstree.1 @@ -1,9 +1,9 @@ -.TH PSTREE 1 "September 26, 2003" "Linux" "User Commands" +.TH PSTREE 1 2004-11-09 "Linux" "User Commands" .SH NAME pstree \- display a tree of processes .SH SYNOPSIS .ad l -.B pstree +.B pstree .RB [ \-a ] .RB [ \-c ] .RB [ \-h | \-H \fIpid\fB ] @@ -30,7 +30,7 @@ brackets and prefixing them with the repetition count, e.g. init\-+\-getty |\-getty |\-getty - `-getty + `\-getty .sp .fi becomes @@ -42,7 +42,7 @@ becomes .PP If \fBpstree\fR is called as \fBpstree.x11\fR then it will prompt the user at the end of the line to press return and will not return until that -has happened. This is useful for when \fBpstree\fR is run in a xterminal. +has happened. This is useful for when \fBpstree\fR is run in a xterminal. .SH OPTIONS .IP \fB\-a\fP @@ -77,8 +77,8 @@ Show uid transitions. Whenever the uid of a process differs from the uid of its parent, the new uid is shown in parentheses after the process name. .IP \fB\-U\fP Use UTF-8 (Unicode) line drawing characters. Under Linux 1.1-54 and above, -UTF-8 mode is entered on the console with \fBecho -e '\\033%8'\fP and left -with \fBecho -e '\\033%@'\fP +UTF-8 mode is entered on the console with \fBecho \-e '\\033%8'\fP and left +with \fBecho \-e '\\033%@'\fP .IP \fB\-V\fP Display version information. .IP \fB\-s\fP @@ -93,5 +93,5 @@ Display version information. Werner Almesberger Craig Small .SH "SEE ALSO" -ps(1), top(1) +.BR ps "(1), " top (1). .\"{{{}}} diff --git a/po/.cvsignore b/po/.cvsignore index 0bcec22..61133ca 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1,3 +1,4 @@ +*.gmo Makefile.in Makefile POTFILES diff --git a/po/POTFILES.in b/po/POTFILES.in index e546f96..efefcc6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ src/killall.c src/fuser.c src/pstree.c +src/signals.c diff --git a/po/de.gmo b/po/de.gmo deleted file mode 100644 index fc6b15a98506e548f198e5ad6da09b9e26339e2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2051 zcmbW1J#QRE7{?a~ZwKKeAS4jrhlrDHkv-q}0Jg+}?1zGpm_d zUu;pOf)7APm4-T^rN}o3h=L9Y(Nj=R^Pk=I*+di}tDF7Z%se~K%gld%J9XmQ0MF}a zZ=?N)_72(?PvC{;C(w`o489Bg3BCcId@=|+;QI{+;G5{*0sZ`U;2ih^=)d~~48gy^ zGax+`1n+^{;3-gp-u@2w5_q@ay@vO}XEFW&^y~c!4iL-VAff-s({MVBtn!v2z4q-q#}%qFJNjmgT?uhB-h+v2v&%bZl15803&krFvqW%1KDG>Ovb z9685`I@hR0hjua+mVJsub}9-z8o|S(SeI3SE8|$Gd56L%lvc+Rc6Oc;-jgvm!2}~X zK#qmYrHvP>j}W*vQl%8;*qAC-Y>dD+r`z^)E0~}7T*b$rXnu>LT3P-dO4yE(rf$$t<>^E4+cGI-p$HliUG8>PX z1_d8Le3N6^+hiO7?9G8!pBSb*gc8RLWkQ1MUV?jUrmPZnXDE^EZDaBqA+fcUd*P3K z?LA{V6sFSSV}DzV6HBi1IP;02ShYB3@)N_MVISp8ptGr5I-LKU28ZJOcT!i8LGHyW zaFbk82V$JT+|UikRaMz|z51f?OtMw!wlssKN;`B}I>)oJD7bn^z>o3yF-30*rK(C_ zXCoNLrOb0g=%XCe3U7+-MbGNL^bJ{0rAesPIU7eZuT!)};F_vczFDgr$39~@Vp{Ne zU-Xi0W)214bPol83Dqy5>^-fpFG0!Je_QzbgmI*0Hf4z`?NdLDI$9_59CfSBakKi% F;2%wdDjEO) diff --git a/po/en.gmo b/po/en.gmo deleted file mode 100644 index a4fb65cfdce0439b44f64d66da94a50dc06dd832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1888 zcmeH`J&)B!6oySgNHCBOf{+jpP7qhS8!~ro7SOKw49gZPa$yClC zvusP5B3-&v`3F&oG>ODN07Ma`$uB@DC{pttU&E$L=o$I=@ywh#=bba2zYgyHAwoL@ zI|lm=b{uwh7hY&jKpuYzeg^&x9tID*6GcPtRL?u$5%eE|JpUtj0{jK!bD?&$92|iMK?}0~L-0fJr=CCed<4Fa@y8&?`vbfVE&qV5@4|c2@oz!SzXh_s?|c3Z zvcBj2{GL72e8)kKcL`*DcR|+o9mx8A1zF#pAnSV$vcCNg!#vva3y}3K;l=U30wJ$k z%j4W)*axtE-1%4I+V6*8o%W2tdASKia6t}0c;kvL0} zN|w}mgc-M?bD)W?6iu^n8mD9-$CZNn`8RT3g*sE>2HrN__&Y`-t zsKt=hDkZ(*EfV=H+1SYh8UBxV+ZDKT&ZU_ND2zdAZN903pP@qC*SYG&L=z;y9vfe4 zpU-uRAly1_N)j~=rqhapkyvwb;7`WUCaR+2<=IlL{2eDd+ZGs zx>&|R^WP$_%b+s2Cuaqog@n?DY+>ninj{Gv#ck}H1Mm2yB2C1ZB}&g_Npd<(W>sVQ4oDzUC)ozaRZEA2Pv zqB2)2J+!X89FJBS{JvKNy?1P598z)FtL(9G@5od@sEEc0=R zJCr{_105Cr0O$|}5)~C73Of30C@3hXc;2}$2MI)0H~ZYozBBLhKJPyJ+u75fCAglz zcoySZjB^+t+=UyipMbpnGw?a!@4zR4XYNjt7VyO>UIRXj`7Izn{~Y){@M|FN`vsT+ z{{X%Mq*F=q0_5akk9)SxC<_S0-wQr=bp*>`@p9# z9|5<4pG@%wAoDwQ?}XnuAm`fvGLIf`A220H{=b0CZv)Ajz_)-ruYivOKL)a1 zp91kqzQXM#;5R_fi?O`UR|DgIj0bsg;$rO|!hkgKdTffIoIEi7&zhjrvBh z$2HC^!1itAM~3C5!;~)4^6{!(p|}hp^9MJSKP0Dyd`1&=yW*y*LPa`MeQC)INQ+8F zS@`ighD7kDLd`i?R|Z0Xgum)4>A8BI9RTD#S0T$Q!4KJB`p zD$+N?(4{?-QRCpt%Q+SynyuFd)x8A1CdbYm(a;M#HBQU*+y7}Nm+#1Jq z)@ZGht*=kw_J#9l&kF5I;f>9xD{M~t;~_-aamETSF0o>+ryEF8s&$= zI_Y0m&ZJvguWqNEMKIGFNSp5J+!W9>qph^BJlln&^E6V0WUFadP5bdlqq%w<4Hgxf z*$x(Aqlu6QJ@Z;{3=n`WD6H~Tc});6ARA@pIEtXLXH$TTbpBa8Frot raB^+d>3Q|H?eMWFMY6}=4N0Y-+@OQ5HX6C{*@%{x_;kl6vEBa$;-DmB diff --git a/po/it.gmo b/po/it.gmo deleted file mode 100644 index 070ce6ade1bbf035adb66d942cb495a6e6d30692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2000 zcmb7^&u<(x6vqcBzZOcNAS8Z2BBE{t-t0DQk`ASfNOOo_Au0h02?=>;yc3fddt`gk zCO3NF#*JG~T;Re1aYX`&KL8L1Zv7KDaOk<;=b24XAp{+*_cNaNY`^#HuWy|`@l}H7 z8MGJCenfi-?UVcPhvzqtzyA)t4E_Z^3!c0`Ne19+9X|k{L;nWI_M6}<;13{=`vVl< z-{2b{J&+`?f@APBXhHVB0X_kK-SPX5KZ6hB`>!C+_b2!Hn-P@4EW)e#{lk9O}|6Qml~Mo7tt?mOdYv{Ps&xijxc zds0;$_Ni}dpvpETsGKe@^k7_^_bF+!Crh1^uT`d}I@2;}YuKEUu~a*oDeq}lm!-;k zi8x2oQWn&BOfzXhbfBp&6}7AJGET`{PD%y$<$H49M0C!`l9Y4SQ9tb0m^VkX?_hnb z(4Y6{(q-!JFPa64pApER;hGLR5roA-0QWEa&@C6(6JL^SKRiyn44zXI6r3)H`LAu#atQl8!%h}IV7Q|*QK2pwO^HXYLqP@0HXNSG3s_C-7Su(r77Ny72mFI2^)JTt)Ug{gK~DjE3UuDvegt z^D9EE!0%n@gV=V`_)-SzQo16IRybW-vXD5B7jtRWl$VXu!45K8UBVDkG_p`)TgfV= znUOBe-qyI#e&B86GBvfXPy?gFrQUdRym6HCXfW)pTO2@x0C4V73hH`TtV^lQo0RQH z=T&%1dn;B~&tDLuBWI3ws+`y`naxq?lvXD?u!QKBZ)vZw!Ls}ef`|m zgOdTLC`Z`|5YlVROoSE@xk?*M(MuXHgCtwG10hRnYpX++EOs|eR;r@V6R7ha1D5}D zzy@nj;T*CikwMV4ZN<3Vh7pg@-FoaSNcd2a8FKQ970FWWC7XNzz1NjxAt+}l*NC;! zT&(C&)fRT#ALJlji&LnMWD5BrpaFg8B|aaQ=jJ_(J0?`!4dW{;INSi3b{3c_OG&kI z8r!Qg2?3X#n*UY3*c?_b%M_Uh<%^ytw diff --git a/po/pt.gmo b/po/pt.gmo deleted file mode 100644 index 6ac038f6559a69841edf9e376c12ba5d153125a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2006 zcmbtUJ!~9B6kZ_w9T-SJAS8YshEvXR*1ofYgO`C%VtgIQ>mLK31%3(S zeLnz0;P1c_K)Ndko¥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 diff --git a/src/fuser.c b/src/fuser.c index 6a4fc36..94c2a5a 100644 --- a/src/fuser.c +++ b/src/fuser.c @@ -31,14 +31,8 @@ #include /* for MKDEV */ #include /* for LOOP_MAJOR */ #endif -#ifdef ENABLE_NLS -#include -#include -#define _(String) gettext (String) -#else -#define _(String) (String) -#endif +#include "i18n.h" #include "comm.h" #include "loop.h" /* for loop_info */ #include "signals.h" @@ -668,7 +662,8 @@ show_files_or_kill (void) { if (header && (file->flags & FLAG_VERB)) { - fprintf (stderr, _("\n%*s USER PID ACCESS COMMAND\n"), NAME_FIELD, ""); + fprintf (stderr, _("\n%*s USER PID ACCESS COMMAND\n"), + NAME_FIELD, ""); header = 0; } length = 0; @@ -995,10 +990,11 @@ void print_version() { fprintf(stderr, _("fuser (psmisc) %s\n"), VERSION); fprintf(stderr, _( - "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n" + "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n")); + fprintf(stderr, _( "PSmisc comes with ABSOLUTELY NO WARRANTY.\n" - "This is free software, and you are welcome to redistribute it under the terms\n" - "of the GNU General Public License.\n" + "This is free software, and you are welcome to redistribute it under\n" + "the terms of the GNU General Public License.\n" "For more information about these matters, see the files named COPYING.\n")); } diff --git a/src/killall.c b/src/killall.c index 6a75524..0f60d21 100644 --- a/src/killall.c +++ b/src/killall.c @@ -25,14 +25,8 @@ #include #include #endif /*FLASK_LINUX*/ -#ifdef ENABLE_NLS -#include -#include -#define _(String) gettext (String) -#else -#define _(String) (String) -#endif +#include "i18n.h" #include "comm.h" #include "signals.h" @@ -390,13 +384,13 @@ kill_all (int signal, int names, char **namelist) static void usage_pidof (void) { - fprintf (stderr, _("usage: pidof [ -eg ] name ...\n")); - fprintf (stderr, _(" pidof -V\n\n")); - fprintf (stderr, _(" -e require exact match for very long names;\n")); - fprintf (stderr, _(" skip if the command line is unavailable\n")); - fprintf (stderr, - _(" -g show process group ID instead of process ID\n")); - fprintf (stderr, _(" -V display version information\n\n")); + fprintf (stderr, _( + "usage: pidof [ -eg ] name ...\n" + " pidof -V\n\n" + " -e require exact match for very long names;\n" + " skip if the command line is unavailable\n" + " -g show process group ID instead of process ID\n" + " -V display version information\n\n")); } @@ -404,26 +398,31 @@ static void usage_killall (void) { #ifdef FLASK_LINUX - fprintf(stderr,_("Usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n")); + fprintf(stderr, _( + "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n")); #else /*FLASK_LINUX*/ - fprintf (stderr, _("usage: killall [ OPTIONS ] [ -- ] name ...\n")); + fprintf(stderr, _( + "usage: killall [ OPTIONS ] [ -- ] name ...\n")); #endif /*FLASK_LINUX*/ - fprintf (stderr, _(" killall -l, --list\n")); - fprintf (stderr, _(" killall -V --version\n\n")); - fprintf (stderr, _(" -e,--exact require exact match for very long names\n")); - fprintf (stderr, _(" -I,--ignore-case- case insensitive process name match\n")); - fprintf (stderr, _(" -g,--process-group kill process group instead of process\n")); - fprintf (stderr, _(" -i,--interactive ask for confirmation before killing\n")); - fprintf (stderr, _(" -l,--list list all known signal names\n")); - fprintf (stderr, _(" -q,--quiet don't print complaints\n")); - fprintf (stderr, _(" -s,--signal send signal instead of SIGTERM\n")); - fprintf (stderr, _(" -v,--verbose report if the signal was successfully sent\n")); - fprintf (stderr, _(" -V,--version display version information\n")); - fprintf (stderr, _(" -w,--wait wait for processes to die\n\n")); + fprintf(stderr, _( + " killall -l, --list\n" + " killall -V --version\n\n" + " -e,--exact require exact match for very long names\n" + " -I,--ignore-case case insensitive process name match\n" + " -g,--process-group kill process group instead of process\n" + " -i,--interactive ask for confirmation before killing\n" + " -l,--list list all known signal names\n" + " -q,--quiet don't print complaints\n" + " -s,--signal send signal instead of SIGTERM\n" + " -v,--verbose report if the signal was successfully sent\n" + " -V,--version display version information\n" + " -w,--wait wait for processes to die\n\n")); #ifdef FLASK_LINUX - fprintf (stderr, _(" -d,--sid kill only process(es) having sid\n")); - fprintf (stderr, _(" -c,--context kill only process(es) having scontext\n")); - fprintf(stderr, _(" (-s, -c are mutually exclusive and must precede other arguments)\n\n")); + fprintf(stderr, _( + " -d,--sid kill only process(es) having sid\n" + " -c,--context kill only process(es) having scontext\n" + " (-s, -c are mutually exclusive and must precede other arguments)\n\n" + )); #endif /*FLASK_LINUX*/ } @@ -441,11 +440,13 @@ usage (void) void print_version() { fprintf(stderr, "%s (psmisc) %s\n", pidof ? "pidof" : "killall", VERSION); - fprintf(stderr, _("Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n")); - fprintf(stderr, _("PSmisc comes with ABSOLUTELY NO WARRANTY.\n")); - fprintf(stderr, _("This is free software, and you are welcome to redistribute it under the terms\n")); - fprintf(stderr, _("of the GNU General Public License.\n")); - fprintf(stderr, _("For more information about these matters, see the files named COPYING.\n")); + fprintf(stderr, _( + "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n")); + fprintf(stderr, _( + "PSmisc comes with ABSOLUTELY NO WARRANTY.\n" + "This is free software, and you are welcome to redistribute it under\n" + "the terms of the GNU General Public License.\n" + "For more information about these matters, see the files named COPYING.\n")); } int @@ -559,7 +560,8 @@ main (int argc, char **argv) lsid = strtol(optarg, buf, 0); if ( **buf ) { - (void) fprintf(stderr, _("%s: SID (%s) must be numeric\n"), name, *argv); + (void) fprintf(stderr, _("%s: SID (%s) must be numeric\n"), + name, *argv); (void) fflush(stderr); return( 1 ); } @@ -569,7 +571,8 @@ main (int argc, char **argv) len = strlen(optarg); rv = security_sid_to_context(sid, buf, &len); if ( rv < 0 && (errno != ENOSPC) ) { - (void) fprintf(stderr, "%s: security_sid_to_context(%d) %s\n", name, (int) sid, strerror(errno)); + (void) fprintf(stderr, "%s: security_sid_to_context(%d) %s\n", + name, (int) sid, strerror(errno)); (void) fflush(stderr); free(buf); return( 1 ); diff --git a/src/pstree.c b/src/pstree.c index 618fa7f..76260ff 100644 --- a/src/pstree.c +++ b/src/pstree.c @@ -23,14 +23,8 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#include -#define _(String) gettext (String) -#else -#define _(String) (String) -#endif +#include "i18n.h" #include "comm.h" #ifdef FLASK_LINUX @@ -716,38 +710,43 @@ read_stdin (void) static void usage (void) { - fprintf (stderr, _("usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n")); - fprintf (stderr, _(" [ -A | -G | -U ] [ pid | user]\n")); - fprintf (stderr, _(" pstree -V\n\n")); - fprintf (stderr, _(" -a show command line arguments\n")); - fprintf (stderr, _(" -A use ASCII line drawing characters\n")); - fprintf (stderr, _(" -c don't compact identical subtrees\n")); - fprintf (stderr, _(" -h highlight current process and its ancestors\n")); - fprintf (stderr, _(" -H pid highlight process \"pid\" and its ancestors\n")); - fprintf (stderr, _(" -G use VT100 line drawing characters\n")); - fprintf (stderr, _(" -l don't truncate long lines\n")); - fprintf (stderr, _(" -n sort output by PID\n")); - fprintf (stderr, _(" -p show PIDs; implies -c\n")); - fprintf (stderr, _(" -u show uid transitions\n")); + fprintf (stderr, _( + "usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n" + " [ -A | -G | -U ] [ pid | user]\n" + " pstree -V\n\n" + " -a show command line arguments\n" + " -A use ASCII line drawing characters\n" + " -c don't compact identical subtrees\n" + " -h highlight current process and its ancestors\n" + " -H pid highlight process \"pid\" and its ancestors\n" + " -G use VT100 line drawing characters\n" + " -l don't truncate long lines\n" + " -n sort output by PID\n" + " -p show PIDs; implies -c\n" + " -u show uid transitions\n")); #ifdef FLASK_LINUX - fprintf (stderr, _(" -s show Flask SIDs\n")); - fprintf (stderr, _(" -x show Flask security contexts\n")); + fprintf (stderr, _( + " -s show Flask SIDs\n" + " -x show Flask security contexts\n")); #endif /*FLASK_LINUX*/ - fprintf (stderr, _(" -U use UTF-8 (Unicode) line drawing characters\n")); - fprintf (stderr, _(" -V display version information\n")); - fprintf (stderr, _(" pid start at pid, default 1 (init)\n")); - fprintf (stderr, _(" user show only trees rooted at processes of that user\n\n")); + fprintf (stderr, _( + " -U use UTF-8 (Unicode)) line drawing characters\n" + " -V display version information\n" + " pid start at pid, default 1 (init))\n" + " user show only trees rooted at processes of that user\n\n")); exit (1); } void print_version() { fprintf(stderr, _("pstree (psmisc) %s\n"), VERSION); - fprintf(stderr, _("Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n")); - fprintf(stderr, _("pstree comes with ABSOLUTELY NO WARRANTY.\n")); - fprintf(stderr, _("This is free software, and you are welcome to redistribute it under the terms\n")); - fprintf(stderr, _("of the GNU General Public License.\n")); - fprintf(stderr, _("For more information about these matters, see the files named COPYING.\n")); + fprintf(stderr, _( + "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n")); + fprintf(stderr, _( + "PSmisc comes with ABSOLUTELY NO WARRANTY.\n" + "This is free software, and you are welcome to redistribute it under\n" + "the terms of the GNU General Public License.\n" + "For more information about these matters, see the files named COPYING.\n")); } diff --git a/src/signals.c b/src/signals.c index 69949ea..774bcaa 100644 --- a/src/signals.c +++ b/src/signals.c @@ -8,13 +8,8 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#include -#define _(String) gettext (String) -#else -#define _(String) (String) -#endif + +#include "i18n.h" #include "signals.h" -- 2.50.1