12
12
#include < signal.h>
13
13
#include < stdio.h>
14
14
#include < stdlib.h>
15
- #include < string.h>
16
15
#include < unistd.h>
17
16
18
17
static void print_usage_and_exit ()
@@ -27,9 +26,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
27
26
TRY (Core::System::pledge (" stdio proc" ));
28
27
29
28
int argc = arguments.argc ;
30
- char ** argv = arguments.argv ;
29
+ auto strings = arguments.strings ;
31
30
32
- if (argc == 2 && ! strcmp (argv [1 ], " -l" ) ) {
31
+ if (argc == 2 && strings [1 ] == " -l" ) {
33
32
for (size_t i = 0 ; i < NSIG; ++i) {
34
33
if (i && !(i % 5 ))
35
34
outln (" " );
@@ -45,29 +44,29 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
45
44
int pid_argi = 1 ;
46
45
if (argc == 3 ) {
47
46
pid_argi = 2 ;
48
- if (argv [1 ][0 ] != ' -' )
47
+ if (strings [1 ][0 ] != ' -' )
49
48
print_usage_and_exit ();
50
49
51
50
Optional<unsigned > number;
52
51
53
- if (isalpha (argv [1 ][1 ])) {
54
- int value = getsignalbyname (&argv [1 ][1 ]);
52
+ if (isalpha (strings [1 ][1 ])) {
53
+ int value = getsignalbyname (&strings [1 ][1 ]);
55
54
if (value >= 0 && value < NSIG)
56
55
number = value;
57
56
}
58
57
59
58
if (!number.has_value ())
60
- number = StringView (&argv [1 ][ 1 ] ).to_uint ();
59
+ number = strings [1 ]. substring_view ( 1 , 1 ).to_uint ();
61
60
62
61
if (!number.has_value ()) {
63
- warnln (" '{}' is not a valid signal name or number" , &argv [1 ][1 ]);
62
+ warnln (" '{}' is not a valid signal name or number" , &strings [1 ][1 ]);
64
63
return 2 ;
65
64
}
66
65
signum = number.value ();
67
66
}
68
- auto pid_opt = String (argv [pid_argi]) .to_int ();
67
+ auto pid_opt = strings [pid_argi].to_int ();
69
68
if (!pid_opt.has_value ()) {
70
- warnln (" '{}' is not a valid PID" , argv [pid_argi]);
69
+ warnln (" '{}' is not a valid PID" , strings [pid_argi]);
71
70
return 3 ;
72
71
}
73
72
pid_t pid = pid_opt.value ();
0 commit comments