Changeset 196ef08 in mainline

Timestamp:

2011-01-05T14:00:37Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4765152, b1d15e7, dffabf0

Parents:

cd22764 (diff), c4faa0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

kill improvement & killall

Files:

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

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 Forecfully terminate a task.
+ * @file Forcefully 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)
@@ -59 +60 @@
         if (*eptr != '\0') {
                 printf("Invalid task ID argument '%s'.\n", argv[1]);
-                return 1;
+                return 2;
         }
 
         rc = task_kill(taskid);
         if (rc != EOK) {
-                printf("Failed to kill task with ID %llu (error %d)\n",
-                    (unsigned long long) taskid, rc);
-                return 2;
+                printf("Failed to kill task ID %" PRIu64 ": %s\n",
+                    taskid, str_error(rc));
+                return 3;
         }