Extend killall with support for -v and -i

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/lib.c b/lib/lib.c
index 148a7652..5b591d44 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -158,7 +158,7 @@ void xprintf(char *format, ...)
 
 void xputs(char *s)
 {
-  if (EOF == puts(s)) perror_exit("write");
+  if (EOF == puts(s) || fflush(stdout)) perror_exit("write");
 }
 
 void xputc(char c)
@@ -975,7 +975,7 @@ int yesno(char *prompt, int def)
 }
 
 // Execute a callback for each PID that matches a process name from a list.
-void for_each_pid_with_name_in(char **names, int (*callback)(pid_t pid))
+void for_each_pid_with_name_in(char **names, int (*callback)(pid_t pid, char *name))
 {
   DIR *dp;
   struct dirent *entry;
@@ -999,7 +999,7 @@ void for_each_pid_with_name_in(char **names, int (*callback)(pid_t pid))
 
     for (curname = names; *curname; curname++)
       if (!strcmp(basename(cmd), *curname)) 
-          if (!callback(atol(entry->d_name))) goto done;
+          if (!callback(atol(entry->d_name), *curname)) goto done;
   }
 done:
   closedir(dp);
diff --git a/lib/lib.h b/lib/lib.h
index 7cc4d5ca..17aaea25 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -144,7 +144,7 @@ void replace_tempfile(int fdin, int fdout, char **tempname);
 void crc_init(unsigned int *crc_table, int little_endian);
 void terminal_size(unsigned *x, unsigned *y);
 int yesno(char *prompt, int def);
-void for_each_pid_with_name_in(char **names, int (*callback)(pid_t pid));
+void for_each_pid_with_name_in(char **names, int (*callback)(pid_t pid, char *name));
 unsigned long xstrtoul(const char *nptr, char **endptr, int base);
 
 // getmountlist.c