Changes in / [196ef08:cd22764] in mainline

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/kill/kill.c (modified) (3 diffs)
• uspace/app/killall/Makefile (deleted)
• uspace/app/killall/killall.c (deleted)

boot/Makefile.common

@@ -126 +126 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/kill/kill \
-        $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/sbi/sbi \

uspace/Makefile

@@ -39 +39 @@
         app/init \
         app/kill \
-        app/killall \
         app/klog \
         app/mkfat \

uspace/app/kill/kill.c

@@ -31 +31 @@
  */
 /**
- * @file Forcefully terminate a task.
+ * @file Forecfully terminate a task.
  */
 
@@ -37 +37 @@
 #include <stdio.h>
 #include <task.h>
-#include <str_error.h>
 
-#define NAME  "kill"
+#define NAME "kill"
 
 static void print_syntax(void)
@@ -60 +59 @@
         if (*eptr != '\0') {
                 printf("Invalid task ID argument '%s'.\n", argv[1]);
-                return 2;
+                return 1;
         }
 
         rc = task_kill(taskid);
         if (rc != EOK) {
-                printf("Failed to kill task ID %" PRIu64 ": %s\n",
-                    taskid, str_error(rc));
-                return 3;
+                printf("Failed to kill task with ID %llu (error %d)\n",
+                    (unsigned long long) taskid, rc);
+                return 2;
         }