Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kill: print --table as vertical #6216

Merged
merged 4 commits into from
Apr 14, 2024
Merged

kill: print --table as vertical #6216

merged 4 commits into from
Apr 14, 2024

Conversation

m-haisham
Copy link
Contributor

Issue #6202

Table (-L) format is wrong

Should be an actual table, not a grid

--- STDOUT_GNU	2024-04-07 19:12:25.820911283 +0200
+++ STDOUT_UUTILS	2024-04-07 19:12:25.824911280 +0200
@@ -1,62 +1,5 @@
- 1 HUP      Hangup
- 2 INT      Interrupt
- 3 QUIT     Quit
- 4 ILL      Illegal instruction
- 5 TRAP     Trace/breakpoint trap
- 6 ABRT     Aborted
- 7 BUS      Bus error
- 8 FPE      Floating point exception
- 9 KILL     Killed
-10 USR1     User defined signal 1
-11 SEGV     Segmentation fault
-12 USR2     User defined signal 2
-13 PIPE     Broken pipe
-14 ALRM     Alarm clock
-15 TERM     Terminated
-16 STKFLT   Stack fault
-17 CHLD     Child exited
-18 CONT     Continued
-19 STOP     Stopped (signal)
-20 TSTP     Stopped
-21 TTIN     Stopped (tty input)
-22 TTOU     Stopped (tty output)
-23 URG      Urgent I/O condition
-24 XCPU     CPU time limit exceeded
-25 XFSZ     File size limit exceeded
-26 VTALRM   Virtual timer expired
-27 PROF     Profiling timer expired
-28 WINCH    Window changed
-29 POLL     I/O possible
-30 PWR      Power failure
-31 SYS      Bad system call
-34 RTMIN    Real-time signal 0
-35 RTMIN+1  Real-time signal 1
-36 RTMIN+2  Real-time signal 2
-37 RTMIN+3  Real-time signal 3
-38 RTMIN+4  Real-time signal 4
-39 RTMIN+5  Real-time signal 5
-40 RTMIN+6  Real-time signal 6
-41 RTMIN+7  Real-time signal 7
-42 RTMIN+8  Real-time signal 8
-43 RTMIN+9  Real-time signal 9
-44 RTMIN+10 Real-time signal 10
-45 RTMIN+11 Real-time signal 11
-46 RTMIN+12 Real-time signal 12
-47 RTMIN+13 Real-time signal 13
-48 RTMIN+14 Real-time signal 14
-49 RTMIN+15 Real-time signal 15
-50 RTMAX-14 Real-time signal 16
-51 RTMAX-13 Real-time signal 17
-52 RTMAX-12 Real-time signal 18
-53 RTMAX-11 Real-time signal 19
-54 RTMAX-10 Real-time signal 20
-55 RTMAX-9  Real-time signal 21
-56 RTMAX-8  Real-time signal 22
-57 RTMAX-7  Real-time signal 23
-58 RTMAX-6  Real-time signal 24
-59 RTMAX-5  Real-time signal 25
-60 RTMAX-4  Real-time signal 26
-61 RTMAX-3  Real-time signal 27
-62 RTMAX-2  Real-time signal 28
-63 RTMAX-1  Real-time signal 29
-64 RTMAX    Real-time signal 30
+ 0 EXIT     1 HUP      2 INT      3 QUIT     4 ILL      5 TRAP     6 ABRT    
+ 7 BUS      8 FPE      9 KILL    10 USR1    11 SEGV    12 USR2    13 PIPE    
+14 ALRM    15 TERM    16 STKFLT  17 CHLD    18 CONT    19 STOP    20 TSTP    
+21 TTIN    22 TTOU    23 URG     24 XCPU    25 XFSZ    26 VTALRM  27 PROF    
+28 WINCH   29 POLL    30 PWR     31 SYS     

This PR changes the --table output to be vertical but does not add the signal descriptions.

Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

Copy link
Member

@tertsdiepraam tertsdiepraam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks! Tests look good too. I think this change allows us to simplify a bit more.

src/uu/kill/src/kill.rs Outdated Show resolved Hide resolved
@BenWiederhake
Copy link
Collaborator

Fixes #6219.

@m-haisham
Copy link
Contributor Author

The failed test seems to be unrelated to this tool.

@cakebaker cakebaker linked an issue Apr 13, 2024 that may be closed by this pull request
src/uu/kill/src/kill.rs Outdated Show resolved Hide resolved
Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

@cakebaker cakebaker merged commit 333e4d9 into uutils:main Apr 14, 2024
64 checks passed
@cakebaker
Copy link
Contributor

Thanks :)

sylvestre pushed a commit to sylvestre/coreutils that referenced this pull request Apr 21, 2024
* kill: print --table as vertical

* kill: remove signal padding on --table

* kill: skip exit signal in --table

* kill: replace "skip" with "filter"

---------

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
sylvestre pushed a commit to sylvestre/coreutils that referenced this pull request Apr 21, 2024
* kill: print --table as vertical

* kill: remove signal padding on --table

* kill: skip exit signal in --table

* kill: replace "skip" with "filter"

---------

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
sylvestre pushed a commit to sylvestre/coreutils that referenced this pull request Apr 21, 2024
* kill: print --table as vertical

* kill: remove signal padding on --table

* kill: skip exit signal in --table

* kill: replace "skip" with "filter"

---------

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kill: Table output (-L) format is wrong
4 participants