jcs's openbsd hax
openbsd

Combine three almost identical synopsis lines into a single one, and three almost identical entries in the options list likewise, bcause all three have identical meaning and almost identical syntax. While here, call the list of signals in signal(3) "complete" rather than "more complete", because that's also true, a stronger statement, and more concise. OK jmc@

schwarze d2877cdf 6a0df33e

+10 -28
+7 -21
bin/kill/kill.1
··· 1 - .\" $OpenBSD: kill.1,v 1.42 2025/04/22 16:49:14 schwarze Exp $ 1 + .\" $OpenBSD: kill.1,v 1.43 2025/04/24 14:15:29 schwarze Exp $ 2 2 .\" $NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $ 3 3 .\" 4 4 .\" Copyright (c) 1980, 1990, 1993 ··· 33 33 .\" 34 34 .\" @(#)kill.1 8.2 (Berkeley) 4/28/95 35 35 .\" 36 - .Dd $Mdocdate: April 22 2025 $ 36 + .Dd $Mdocdate: April 24 2025 $ 37 37 .Dt KILL 1 38 38 .Os 39 39 .Sh NAME ··· 41 41 .Nd terminate or signal a process 42 42 .Sh SYNOPSIS 43 43 .Nm kill 44 - .Op Fl s Ar signal_name 44 + .Op Fl Ar signal_number | Fl Ar signal_name | Fl s Ar signal_name 45 45 .Ar pid ... 46 46 .Nm kill 47 47 .Fl l 48 48 .Op Ar exit_status 49 - .Nm kill 50 - .Fl Ar signal_name 51 - .Ar pid ... 52 - .Nm kill 53 - .Fl Ar signal_number 54 - .Ar pid ... 55 49 .Sh DESCRIPTION 56 50 The 57 51 .Nm ··· 80 74 or a signal number. 81 75 .Pp 82 76 If no operand is given, display the names of all the signals. 83 - .It Fl s Ar signal_name 84 - A symbolic signal name specifying the signal to be sent instead of the 85 - default 86 - .Cm TERM . 87 - .It Fl Ar signal_name 88 - A symbolic signal name specifying the signal to be sent instead of the 89 - default 77 + .It Fl Ar signal_number | Fl Ar signal_name | Fl s Ar signal_name 78 + A non-negative decimal integer or a symbolic name 79 + specifying the signal to be sent instead of the default 90 80 .Cm TERM . 91 - .It Fl Ar signal_number 92 - A non-negative decimal integer specifying the signal to be sent instead 93 - of the default 94 - .Dv SIGTERM . 95 81 .El 96 82 .Pp 97 83 The following PIDs have special meanings: ··· 118 104 .It 15 Ta Cm TERM Ta Pq software termination signal 119 105 .El 120 106 .Pp 121 - For a more complete list, consult the 107 + For a complete list, consult the 122 108 .Xr signal 3 123 109 manual page. 124 110 .Pp
+3 -7
bin/kill/kill.c
··· 1 - /* $OpenBSD: kill.c,v 1.14 2017/03/29 22:40:15 millert Exp $ */ 1 + /* $OpenBSD: kill.c,v 1.15 2025/04/24 14:15:29 schwarze Exp $ */ 2 2 /* $NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 jtc Exp $ */ 3 3 4 4 /* ··· 174 174 void 175 175 usage(void) 176 176 { 177 - (void)fprintf(stderr, "usage: %s [-s signal_name] pid ...\n", 178 - __progname); 177 + (void)fprintf(stderr, "usage: %s [-signal_number | -signal_name |" 178 + " -s signal_name] pid ...\n", __progname); 179 179 (void)fprintf(stderr, " %s -l [exit_status]\n", __progname); 180 - (void)fprintf(stderr, " %s -signal_name pid ...\n", 181 - __progname); 182 - (void)fprintf(stderr, " %s -signal_number pid ...\n", 183 - __progname); 184 180 exit(1); 185 181 }