If arguments are given without any option arguments, it is tested if
it is a valid pid number, and add it to pidlist. If it is not a pid
number, then it is threated as a process name the system is scanned
for processes with a matching name.
Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
+static int add_pid_to_pidlist(int pidi, struct list_head *pidlist)
+{
+ struct pidlist *pid = alloc_pidlist();
+
+ if (pid == NULL) {
+ perror("malloc");
+ return -1;
+ }
+ pid->pid = pidi;
+
+ list_add_tail(&pid->list, pidlist);
+
+ return 0;
+}
+
void read_args(int argc, char *argv[], struct parse_opts *opts)
{
void read_args(int argc, char *argv[], struct parse_opts *opts)
{
+ int option_index = 0, c;
static struct option long_options[] = {
{ .val = 'p', .name = "pid", .has_arg = 1, },
{ .val = 'P', .name = "process", .has_arg = 1, },
static struct option long_options[] = {
{ .val = 'p', .name = "pid", .has_arg = 1, },
{ .val = 'P', .name = "process", .has_arg = 1, },
while (1) {
c = getopt_long(argc, argv, short_options, long_options,
while (1) {
c = getopt_long(argc, argv, short_options, long_options,
- struct pidlist *pid = alloc_pidlist();
-
- if (pid == NULL) {
- perror("malloc");
- return;
+ int pid = pidstr_is_ok(optarg);
+ if (!pid) {
+ fprintf(stderr, "Invalid pid number %s\n",
+ optarg);
+ break;
- pid->pid = atoi(optarg);
opts->parse_mask |= PARSE_PID;
opts->parse_mask |= PARSE_PID;
- list_add_tail(&pid->list, &opts->pidlist);
+ add_pid_to_pidlist(pid, &opts->pidlist);
+
+ while (optind < argc) {
+ printf("%s ", argv[optind]);
+ int pid = pidstr_is_ok(argv[optind]);
+
+ if (pid) {
+ opts->parse_mask |= PARSE_PID;
+ add_pid_to_pidlist(pid, &opts->pidlist);
+ } else {
+ get_all_pids_by_name(opts, argv[optind]);
+ opts->parse_mask |= PARSE_PID;
+ }
+ optind++;
+ }
}
int main(int argc, char *argv[])
}
int main(int argc, char *argv[])
read_args(argc, argv, &opts);
read_args(argc, argv, &opts);
- if (argc < 3) {
- printf("A pid needs to be given as an argument\n");
+ if (argc < 2) {
+ printf("A pid or process name "
+ "needs to be given as an argument\n");
print_help_and_die(argv[0]);
}
print_help_and_die(argv[0]);
}