Changeset 192565b in mainline for uspace/app

Timestamp:

2013-05-27T13:18:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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:

Merge mainline changes.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cmp/cmp.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• bdsh/cmds/modules/sleep/sleep.c (modified) (1 diff)
• bnchmark/bnchmark.c (modified) (1 diff)
• dnscfg/Makefile (added)
• dnscfg/dnscfg.c (added)
• dnsres/Makefile (added)
• dnsres/dnsres.c (added)
• edit/edit.c (modified) (10 diffs)
• inet/inet.c (modified) (9 diffs)
• init/init.c (modified) (1 diff)
• mkbd/main.c (modified) (2 diffs)
• msim/arch_helenos/input.c (modified) (1 diff)
• nettest1/nettest1.c (modified) (5 diffs)
• nettest2/nettest2.c (modified) (5 diffs)
• nettest3/nettest3.c (modified) (3 diffs)
• nterm/conn.c (modified) (5 diffs)
• nterm/nterm.c (modified) (2 diffs)
• ping/ping.c (modified) (13 diffs)
• taskdump/symtab.c (modified) (1 diff)
• tester/ipc/starve.c (modified) (1 diff)
• tetris/scores.c (modified) (3 diffs)
• tetris/screen.c (modified) (3 diffs)
• top/screen.c (modified) (2 diffs)
• trace/ipc_desc.c (modified) (1 diff)
• trace/ipc_desc.h (modified) (1 diff)
• trace/ipcp.c (modified) (2 diffs)
• trace/syscalls.c (modified) (2 diffs)
• trace/syscalls.h (modified) (2 diffs)
• trace/trace.c (modified) (6 diffs)
• vdemo/vdemo.c (modified) (1 diff)
• vlaunch/Makefile (modified) (1 diff)
• vlaunch/gfx/helenos.tga (added)
• vlaunch/vlaunch.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -117 +117 @@
 static void waitkey()
 {
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         
         while (true) {
-                if (!console_get_kbd_event(console, &ev)) {
+                if (!console_get_event(console, &ev)) {
                         return;
                 }
-                if (ev.type == KEY_PRESS) {
-                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        kev = &ev.ev.key;
+                        
+                        if (kev->key == KC_ESCAPE || kev->key == KC_Q) {
                                 should_quit = true;
                                 return;
                         }
-                        if (ev.key == KC_C) {
+                        if (kev->key == KC_C) {
                                 paging_enabled = false;
                                 return;
                         }
-                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
-                            ev.key == KC_PAGE_DOWN) {
+                        if (kev->key == KC_ENTER || kev->key == KC_SPACE ||
+                            kev->key == KC_PAGE_DOWN) {
                                 return;
                         }

uspace/app/bdsh/cmds/modules/cmp/cmp.c

@@ -107 +107 @@
 
                 if (offset[0] != offset[1] ||
-                    bcmp(buffer[0], buffer[1], offset[0])) {
+                    memcmp(buffer[0], buffer[1], offset[0]) != 0) {
                         rc = 1;
                         goto end;

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -152 +152 @@
 
         while (true) {
-                kbd_event_t ev;
+                cons_event_t ev;
                 console_flush(con);
-                console_get_kbd_event(con, &ev);
-                if ((ev.type != KEY_PRESS)
-                    || (ev.mods & (KM_CTRL | KM_ALT)) != 0) {
+                console_get_event(con, &ev);
+                if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS ||
+                    (ev.ev.key.mods & (KM_CTRL | KM_ALT)) != 0) {
                         continue;
                 }
 
-                switch(ev.key) {
+                switch(ev.ev.key.key) {
                 case KC_Y:
                         printf("y\n");

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -315 +315 @@
 {
         if (stat(path, &de->s)) {
-                cli_error(CL_ENOENT, path);
+                cli_error(CL_ENOENT, "%s", path);
                 return LS_BOGUS;
         }

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -114 +114 @@
         int ret;
         unsigned int argc;
-        useconds_t duration;
+        useconds_t duration = 0;
 
         /* Count the arguments */

uspace/app/bnchmark/bnchmark.c

@@ -142 +142 @@
 {
         int rc;
-        umseconds_t milliseconds_taken;
+        umseconds_t milliseconds_taken = 0;
         char *path = NULL;
         measure_func_t fn = NULL;

uspace/app/edit/edit.c

@@ -80 +80 @@
         tag_t sel_start;
 
+        /** Active keyboard modifiers */
+        keymod_t keymod;
+
         /** 
          * Ideal column where the caret should try to get. This is used
@@ -119 +122 @@
 static void cursor_setvis(bool visible);
 
+static void key_handle_press(kbd_event_t *ev);
 static void key_handle_unmod(kbd_event_t const *ev);
 static void key_handle_ctrl(kbd_event_t const *ev);
@@ -124 +128 @@
 static void key_handle_shift_ctrl(kbd_event_t const *ev);
 static void key_handle_movement(unsigned int key, bool shift);
+
+static void pos_handle(pos_event_t *ev);
 
 static int file_save(char const *fname);
@@ -182 +188 @@
 int main(int argc, char *argv[])
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         bool new_file;
         int rc;
@@ -245 +251 @@
 
         while (!done) {
-                console_get_kbd_event(con, &ev);
+                console_get_event(con, &ev);
                 pane.rflags = 0;
 
-                if (ev.type == KEY_PRESS) {
-                        /* Handle key press. */
-                        if (((ev.mods & KM_ALT) == 0) &&
-                            ((ev.mods & KM_SHIFT) == 0) &&
-                             (ev.mods & KM_CTRL) != 0) {
-                                key_handle_ctrl(&ev);
-                        } else if (((ev.mods & KM_ALT) == 0) &&
-                            ((ev.mods & KM_CTRL) == 0) &&
-                             (ev.mods & KM_SHIFT) != 0) {
-                                key_handle_shift(&ev);
-                        } else if (((ev.mods & KM_ALT) == 0) &&
-                            ((ev.mods & KM_CTRL) != 0) &&
-                             (ev.mods & KM_SHIFT) != 0) {
-                                key_handle_shift_ctrl(&ev);
-                        } else if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                                key_handle_unmod(&ev);
-                        }
+                switch (ev.type) {
+                case CEV_KEY:
+                        pane.keymod = ev.ev.key.mods;
+                        if (ev.ev.key.type == KEY_PRESS)
+                                key_handle_press(&ev.ev.key);
+                        break;
+                case CEV_POS:
+                        pos_handle(&ev.ev.pos);
+                        break;
                 }
 
@@ -286 +284 @@
 
         return 0;
+}
+
+/* Handle key press. */
+static void key_handle_press(kbd_event_t *ev)
+{
+        if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_SHIFT) == 0) &&
+             (ev->mods & KM_CTRL) != 0) {
+                key_handle_ctrl(ev);
+        } else if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_CTRL) == 0) &&
+             (ev->mods & KM_SHIFT) != 0) {
+                key_handle_shift(ev);
+        } else if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_CTRL) != 0) &&
+             (ev->mods & KM_SHIFT) != 0) {
+                key_handle_shift_ctrl(ev);
+        } else if ((ev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                key_handle_unmod(ev);
+        }
 }
 
@@ -462 +480 @@
 }
 
+static void pos_handle(pos_event_t *ev)
+{
+        coord_t bc;
+        spt_t pt;
+        bool select;
+
+        if (ev->type == POS_PRESS && ev->vpos < (unsigned)pane.rows) {
+                bc.row = pane.sh_row + ev->vpos;
+                bc.column = pane.sh_column + ev->hpos;
+                sheet_get_cell_pt(doc.sh, &bc, dir_before, &pt);
+
+                select = (pane.keymod & KM_SHIFT) != 0;
+
+                caret_move(pt, select, true);
+        }
+}
+
 /** Move caret while preserving or resetting selection. */
 static void caret_move(spt_t new_caret_pt, bool select, bool update_ideal_column)
@@ -592 +627 @@
 static char *prompt(char const *prompt, char const *init_value)
 {
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         char *str;
         wchar_t buffer[INFNAME_MAX_LEN + 1];
@@ -612 +648 @@
 
         while (!done) {
-                console_get_kbd_event(con, &ev);
-
-                if (ev.type == KEY_PRESS) {
+                console_get_event(con, &ev);
+
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        kev = &ev.ev.key;
+
                         /* Handle key press. */
-                        if (((ev.mods & KM_ALT) == 0) &&
-                             (ev.mods & KM_CTRL) != 0) {
+                        if (((kev->mods & KM_ALT) == 0) &&
+                             (kev->mods & KM_CTRL) != 0) {
                                 ;
-                        } else if ((ev.mods & (KM_CTRL | KM_ALT)) == 0) {
-                                switch (ev.key) {
+                        } else if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
+                                switch (kev->key) {
                                 case KC_ESCAPE:
                                         return NULL;
@@ -634 +672 @@
                                         break;
                                 default:
-                                        if (ev.c >= 32 && nc < max_len) {
-                                                putchar(ev.c);
+                                        if (kev->c >= 32 && nc < max_len) {
+                                                putchar(kev->c);
                                                 console_flush(con);
-                                                buffer[nc++] = ev.c;
+                                                buffer[nc++] = kev->c;
                                         }
                                         break;

uspace/app/inet/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <errno.h>
+#include <inet/addr.h>
 #include <inet/inetcfg.h>
 #include <loc.h>
@@ -54 +55 @@
 }
 
-static int naddr_parse(const char *text, inet_naddr_t *naddr)
-{
-        unsigned long a[4], bits;
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '/')
-                return EINVAL;
-        ++cp;
-
-        bits = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        naddr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                naddr->ipv4 = (naddr->ipv4 << 8) | a[i];
-        }
-
-        if (bits > 31)
-                return EINVAL;
-
-        naddr->bits = bits;
-        return EOK;
-}
-
-static int addr_parse(const char *text, inet_addr_t *addr)
-{
-        unsigned long a[4];
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        addr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                addr->ipv4 = (addr->ipv4 << 8) | a[i];
-        }
-
-        return EOK;
-}
-
-static int naddr_format(inet_naddr_t *naddr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d/%d", naddr->ipv4 >> 24,
-            (naddr->ipv4 >> 16) & 0xff, (naddr->ipv4 >> 8) & 0xff,
-            naddr->ipv4 & 0xff, naddr->bits);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
 static int addr_create_static(int argc, char *argv[])
 {
@@ -178 +88 @@
         }
 
-        rc = naddr_parse(addr_spec, &naddr);
+        rc = inet_naddr_parse(addr_spec, &naddr);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -267 +177 @@
         route_name = argv[2];
 
-        rc = naddr_parse(dest_str, &dest);
+        rc = inet_naddr_parse(dest_str, &dest);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -274 +184 @@
         }
 
-        rc = addr_parse(router_str, &router);
+        rc = inet_addr_parse(router_str, &router);
         if (rc != EOK) {
                 printf(NAME ": Invalid address format '%s'.\n", router_str);
@@ -366 +276 @@
                 }
 
-                rc = naddr_format(&ainfo.naddr, &astr);
+                rc = inet_naddr_format(&ainfo.naddr, &astr);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -430 +340 @@
                 }
 
-                rc = naddr_format(&srinfo.dest, &dest_str);
+                rc = inet_naddr_format(&srinfo.dest, &dest_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -437 +347 @@
                 }
 
-                rc = addr_format(&srinfo.router, &router_str);
+                rc = inet_addr_format(&srinfo.router, &router_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");

uspace/app/init/init.c

@@ -359 +359 @@
         srv_start("/srv/tcp");
         srv_start("/srv/udp");
+        srv_start("/srv/dnsrsrv");
         
         srv_start("/srv/clipboard");

uspace/app/mkbd/main.c

@@ -178 +178 @@
 
         while (1) {
-                kbd_event_t ev;
-                bool ok = console_get_kbd_event(con, &ev);
+                cons_event_t ev;
+                bool ok = console_get_event(con, &ev);
                 if (!ok) {
                         printf("Connection with console broken: %s.\n",
@@ -186 +186 @@
                 }
 
-                if (ev.key == KC_ESCAPE) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    ev.ev.key.key == KC_ESCAPE) {
                         break;
                 }

uspace/app/msim/arch_helenos/input.c

@@ -91 +91 @@
 bool stdin_poll(char *key)
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         suseconds_t timeout = 0;
         errno = EOK;
         console_flush(input_prompt->console);
-        bool has_input = console_get_kbd_event_timeout(input_prompt->console, &ev, &timeout);
+        bool has_input = console_get_event_timeout(input_prompt->console, &ev, &timeout);
         if (!has_input) {
                 return false;
         }
 
-        if (ev.type != KEY_PRESS)
+        if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS)
                 return false;
 
-        *key = ev.c;
+        *key = ev.ev.key.c;
 
         return true;

uspace/app/nettest1/nettest1.c

@@ -46 +46 @@
 #include <arg_parse.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -75 +76 @@
         printf(
             "Network Networking test 1 aplication - sockets\n"
-            "Usage: echo [options] numeric_address\n"
+            "Usage: nettest1 [options] host\n"
             "Where options are:\n"
             "-f protocol_family | --family=protocol_family\n"
@@ -290 +291 @@
         struct sockaddr_in address_in;
         struct sockaddr_in6 address_in6;
+        dnsr_hostinfo_t *hinfo;
         uint8_t *address_start;
 
@@ -319 +321 @@
         }
 
-        /* If not before the last argument containing the address */
+        /* If not before the last argument containing the host */
         if (index >= argc) {
-                printf("Command line error: missing address\n");
+                printf("Command line error: missing host name\n");
                 nettest1_print_help();
                 return EINVAL;
@@ -348 +350 @@
         }
 
-        /* Parse the last argument which should contain the address */
+        /* Parse the last argument which should contain the host/address */
         rc = inet_pton(family, argv[argc - 1], address_start);
         if (rc != EOK) {
-                fprintf(stderr, "Address parse error %d\n", rc);
-                return rc;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argc - 1], &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", argv[argc - 1]);
+                        return rc;
+                }
+
+                address_in.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 

uspace/app/nettest2/nettest2.c

@@ -47 +47 @@
 #include <stdbool.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -71 +72 @@
         printf(
             "Network Networking test 2 aplication - UDP transfer\n"
-            "Usage: echo [options] address\n"
+            "Usage: nettest2 [options] host\n"
             "Where options are:\n"
             "-f protocol_family | --family=protocol_family\n"
@@ -227 +228 @@
         struct sockaddr_in address_in;
         struct sockaddr_in6 address_in6;
+        dnsr_hostinfo_t *hinfo;
         socklen_t addrlen;
         uint8_t *address_start;
@@ -265 +267 @@
         }
 
-        /* If not before the last argument containing the address */
+        /* If not before the last argument containing the host */
         if (index >= argc) {
-                printf("Command line error: missing address\n");
+                printf("Command line error: missing host name\n");
                 nettest2_print_help();
                 return EINVAL;
@@ -294 +296 @@
         }
 
-        /* Parse the last argument which should contain the address. */
+        /* Parse the last argument which should contain the host/address */
         rc = inet_pton(family, argv[argc - 1], address_start);
         if (rc != EOK) {
-                fprintf(stderr, "Address parse error %d\n", rc);
-                return rc;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argc - 1], &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", argv[argc - 1]);
+                        return rc;
+                }
+
+                address_in.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 

uspace/app/nettest3/nettest3.c

@@ -39 +39 @@
 #include <str.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -60 +61 @@
         int fd;
         char *endptr;
+        dnsr_hostinfo_t *hinfo;
 
         port = 7;
@@ -75 +77 @@
                 rc = inet_pton(AF_INET, argv[1], (uint8_t *)&addr.sin_addr.s_addr);
                 if (rc != EOK) {
-                        fprintf(stderr, "Error parsing address\n");
-                        return 1;
+                        /* Try interpreting as a host name */
+                        rc = dnsr_name2host(argv[1], &hinfo);
+                        if (rc != EOK) {
+                                printf("Error resolving host '%s'.\n", argv[1]);
+                                return rc;
+                        }
+
+                        addr.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
+                        addr.sin_family = AF_INET;
                 }
                 printf("result: rc=%d, family=%d, addr=%x\n", rc,

uspace/app/nterm/conn.c

@@ -33 +33 @@
  */
 
+#include <byteorder.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <fibril.h>
+#include <inet/dnsr.h>
 #include <net/socket.h>
 #include <stdio.h>
@@ -74 +76 @@
 {
         struct sockaddr_in addr;
+        dnsr_hostinfo_t *hinfo = NULL;
         int rc;
         char *endptr;
@@ -81 +84 @@
         rc = inet_pton(addr.sin_family, addr_s, (uint8_t *)&addr.sin_addr);
         if (rc != EOK) {
-                printf("Invalid addres %s\n", addr_s);
-                return EINVAL;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(addr_s, &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", addr_s);
+                        goto error;
+                }
+
+                addr.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 
@@ -88 +97 @@
         if (*endptr != '\0') {
                 printf("Invalid port number %s\n", port_s);
-                return EINVAL;
+                goto error;
         }
 
@@ -95 +104 @@
                 goto error;
 
-        printf("Connecting to address %s port %u\n", addr_s, ntohs(addr.sin_port));
+        printf("Connecting to host %s port %u\n", addr_s, ntohs(addr.sin_port));
 
         rc = connect(conn_fd, (struct sockaddr *)&addr, sizeof(addr));

uspace/app/nterm/nterm.c

@@ -104 +104 @@
 static void print_syntax(void)
 {
-        printf("syntax: nterm <ip-address> <port>\n");
+        printf("syntax: nterm <host> <port>\n");
 }
 
 int main(int argc, char *argv[])
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         int rc;
 
@@ -129 +129 @@
         done = false;
         while (!done) {
-                console_get_kbd_event(con, &ev);
-                if (ev.type == KEY_PRESS)
-                        key_handle(&ev);
+                console_get_event(con, &ev);
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS)
+                        key_handle(&ev.ev.key);
         }
 

uspace/app/ping/ping.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dnsr.h>
+#include <inet/addr.h>
 #include <inet/inetping.h>
 #include <io/console.h>
@@ -68 +70 @@
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <addr>\n");
-}
-
-static int addr_parse(const char *text, inet_addr_t *addr)
-{
-        unsigned long a[4];
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        addr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                addr->ipv4 = (addr->ipv4 << 8) | a[i];
-        }
-
-        return EOK;
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
+        printf("syntax: " NAME " [-r] <host>\n");
 }
 
@@ -125 +86 @@
         int rc;
 
-        rc = addr_format(&sdu->src, &asrc);
+        rc = inet_addr_format(&sdu->src, &asrc);
         if (rc != EOK)
                 return ENOMEM;
 
-        rc = addr_format(&sdu->dest, &adest);
+        rc = inet_addr_format(&sdu->dest, &adest);
         if (rc != EOK) {
                 free(asrc);
@@ -188 +149 @@
 {
         console_ctrl_t *con;
-        kbd_event_t ev;
+        cons_event_t ev;
 
         con = console_init(stdin, stdout);
@@ -194 +155 @@
 
         while (true) {
-                if (!console_get_kbd_event(con, &ev))
+                if (!console_get_event(con, &ev))
                         break;
 
-                if (ev.type == KEY_PRESS && (ev.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.mods & KM_CTRL) != 0) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
+                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
                         /* Ctrl+key */
-                        if (ev.key == KC_Q) {
+                        if (ev.ev.key.key == KC_Q) {
                                 ping_signal_done();
                                 return 0;
@@ -212 +174 @@
 int main(int argc, char *argv[])
 {
+        dnsr_hostinfo_t *hinfo = NULL;
+        char *asrc = NULL;
+        char *adest = NULL;
+        char *sdest = NULL;
         int rc;
         int argi;
@@ -219 +185 @@
                 printf(NAME ": Failed connecting to internet ping service "
                     "(%d).\n", rc);
-                return 1;
+                goto error;
         }
 
@@ -232 +198 @@
         if (argc - argi != 1) {
                 print_syntax();
-                return 1;
+                goto error;
         }
 
         /* Parse destination address */
-        rc = addr_parse(argv[argi], &dest_addr);
-        if (rc != EOK) {
-                printf(NAME ": Invalid address format.\n");
-                print_syntax();
-                return 1;
+        rc = inet_addr_parse(argv[argi], &dest_addr);
+        if (rc != EOK) {
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argi], &hinfo);
+                if (rc != EOK) {
+                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
+                        goto error;
+                }
+
+                dest_addr = hinfo->addr;
         }
 
@@ -247 +218 @@
         if (rc != EOK) {
                 printf(NAME ": Failed determining source address.\n");
-                return 1;
-        }
+                goto error;
+        }
+
+        rc = inet_addr_format(&src_addr, &asrc);
+        if (rc != EOK) {
+                printf(NAME ": Out of memory.\n");
+                goto error;
+        }
+
+        rc = inet_addr_format(&dest_addr, &adest);
+        if (rc != EOK) {
+                printf(NAME ": Out of memory.\n");
+                goto error;
+        }
+
+        if (hinfo != NULL) {
+                rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
+                if (rc < 0) {
+                        printf(NAME ": Out of memory.\n");
+                        goto error;
+                }
+        } else {
+                sdest = adest;
+                adest = NULL;
+        }
+
+        printf("Sending ICMP echo request from %s to %s.\n",
+            asrc, sdest);
 
         fid_t fid;
@@ -256 +253 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating transmit fibril.\n");
-                        return 1;
+                        goto error;
                 }
 
@@ -264 +261 @@
                 if (fid == 0) {
                         printf(NAME ": Failed creating input fibril.\n");
-                        return 1;
+                        goto error;
                 }
 
@@ -282 +279 @@
         if (rc == ETIMEOUT) {
                 printf(NAME ": Echo request timed out.\n");
-                return 1;
-        }
-
+                goto error;
+        }
+
+        free(asrc);
+        free(adest);
+        free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
         return 0;
+error:
+        free(asrc);
+        free(adest);
+        free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
+        return 1;
 }
 

uspace/app/taskdump/symtab.c

@@ -267 +267 @@
                         continue;
 
-                if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {
+                if (saddr <= addr && (best_name == NULL || saddr > best_addr)) {
                         best_name = sname;
                         best_addr = saddr;

uspace/app/tester/ipc/starve.c

@@ -62 +62 @@
                         break;
                 
-                kbd_event_t ev;
+                cons_event_t ev;
                 suseconds_t timeout = 0;
-                bool has_event = console_get_kbd_event_timeout(console, &ev, &timeout);
-                if (has_event && (ev.type == KEY_PRESS)) {
-                        TPRINTF("Key %d pressed, terminating.\n", ev.key);
+                bool has_event = console_get_event_timeout(console, &ev, &timeout);
+                if (has_event && ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
                         break;
                 }

uspace/app/tetris/scores.c

@@ -125 +125 @@
         int j;
         size_t off;
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         
         clear_screen();
@@ -141 +142 @@
         while (1) {
                 console_flush(console);
-                if (!console_get_kbd_event(console, &ev))
+                if (!console_get_event(console, &ev))
                         exit(1);
                 
-                if (ev.type == KEY_RELEASE)
+                if (ev.type != CEV_KEY || ev.ev.key.type == KEY_RELEASE)
                         continue;
                 
-                if (ev.key == KC_ENTER || ev.key == KC_NENTER)
+                kev = &ev.ev.key;
+                
+                if (kev->key == KC_ENTER || kev->key == KC_NENTER)
                         break;
                 
-                if (ev.key == KC_BACKSPACE) {
+                if (kev->key == KC_BACKSPACE) {
                         if (i > 0) {
                                 wchar_t uc;
@@ -166 +169 @@
                                 scores[NUMSPOTS - 1].hs_name[off] = '\0';
                         }
-                } else if (ev.c != '\0') {
+                } else if (kev->c != '\0') {
                         if (i < (MAXLOGNAME - 1)) {
-                                if (chr_encode(ev.c, scores[NUMSPOTS - 1].hs_name,
+                                if (chr_encode(kev->c, scores[NUMSPOTS - 1].hs_name,
                                     &off, STR_BOUNDS(MAXLOGNAME) + 1) == EOK) {
                                         ++i;

uspace/app/tetris/screen.c

@@ -344 +344 @@
         
         while (timeout > 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeout))
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeout))
                         break;
         }
@@ -376 +376 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
                 }
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         
@@ -398 +398 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event(console, &event))
+                cons_event_t event;
+                
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         

uspace/app/top/screen.c

@@ -556 +556 @@
         
         while (c == 0) {
-                kbd_event_t event;
+                cons_event_t event;
                 
                 warning_timeleft -= timeleft;
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
@@ -565 +565 @@
                 warning_timeleft += timeleft;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         

uspace/app/trace/ipc_desc.c

@@ -49 +49 @@
         { IPC_M_DATA_READ,        "DATA_READ" },
         { IPC_M_DEBUG,            "DEBUG" },
-        
-        /* Terminating entry */
-        { 0, NULL }
 };
+
+size_t ipc_methods_len = sizeof(ipc_methods) / sizeof(ipc_m_desc_t);
 
 /** @}

uspace/app/trace/ipc_desc.h

@@ -42 +42 @@
 
 extern ipc_m_desc_t ipc_methods[];
+extern size_t ipc_methods_len;
 
 #endif

uspace/app/trace/ipcp.c

@@ -140 +140 @@
 void ipcp_init(void)
 {
-        ipc_m_desc_t *desc;
-        oper_t *oper;
-
         val_type_t arg_def[OPER_MAX_ARGS] = {
                 V_INTEGER,
@@ -162 +159 @@
         proto_system = proto_new("system");
 
-        desc = ipc_methods;
-        while (desc->number != 0) {
-                oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
-                        OPER_MAX_ARGS, arg_def);
-                proto_add_oper(proto_system, desc->number, oper);
-
-                ++desc;
+        for (size_t i = 0; i < ipc_methods_len; i++) {
+                oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS,
+                    arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def);
+                proto_add_oper(proto_system, ipc_methods[i].number, oper);
         }
 

uspace/app/trace/syscalls.c

@@ -46 +46 @@
 
     [SYS_TASK_GET_ID] = { "task_get_id",                1,      V_ERRNO },
+    [SYS_TASK_SET_NAME] = { "task_set_name",            2,      V_ERRNO },
     [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout",        3,      V_ERRNO },
     [SYS_FUTEX_WAKEUP] = { "futex_wakeup",              1,      V_ERRNO },
@@ -82 +83 @@
 };
 
+const size_t syscall_desc_len = (sizeof(syscall_desc) / sizeof(sc_desc_t));
+
 /** @}
  */

uspace/app/trace/syscalls.h

@@ -36 +36 @@
 #define SYSCALLS_H_
 
+#include <stdbool.h>
+#include <unistd.h>
+
 #include "trace.h"
 
@@ -45 +48 @@
 
 extern const sc_desc_t syscall_desc[];
+extern const size_t syscall_desc_len;
+
+static inline bool syscall_desc_defined(unsigned sc_id)
+{
+        return (sc_id < syscall_desc_len && syscall_desc[sc_id].name != NULL);
+}
 
 #endif

uspace/app/trace/trace.c

@@ -136 +136 @@
         }
 
-        free(task_ldr);
         task_ldr = NULL;
 
@@ -348 +347 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall name and arguments */
-                printf("%s", syscall_desc[sc_id].name);
-                print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                if (syscall_desc_defined(sc_id)) {
+                        printf("%s", syscall_desc[sc_id].name);
+                        print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                }
+                else {
+                        printf("unknown_syscall<%d>", sc_id);
+                        print_sc_args(sc_args, 6);
+                }
         }
 }
@@ -372 +377 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall return value */
-                rv_type = syscall_desc[sc_id].rv_type;
+                if (syscall_desc_defined(sc_id))
+                        rv_type = syscall_desc[sc_id].rv_type;
+                else
+                        rv_type = V_PTR;
                 print_sc_retval(sc_rc, rv_type);
         }
@@ -497 +505 @@
         ldr = loader_connect();
         if (ldr == NULL)
-                return 0;
+                return NULL;
 
         /* Get task ID. */
@@ -557 +565 @@
 static int cev_fibril(void *arg)
 {
+        cons_event_t event;
+
         (void) arg;
         
@@ -567 +577 @@
                 fibril_mutex_unlock(&state_lock);
                 
-                if (!console_get_kbd_event(console, &cev))
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                fibril_mutex_lock(&state_lock);
-                cev_valid = true;
-                fibril_condvar_broadcast(&state_cv);
-                fibril_mutex_unlock(&state_lock);
+                if (event.type == CEV_KEY) {
+                        fibril_mutex_lock(&state_lock);
+                        cev = event.ev.key;
+                        cev_valid = true;
+                        fibril_condvar_broadcast(&state_cv);
+                        fibril_mutex_unlock(&state_lock);
+                }
         }
 }

uspace/app/vdemo/vdemo.c

@@ -141 +141 @@
                     lbl_action->cancel);
 
-                grid->add(grid, &lbl_action->label.widget, 0, 0, 1, 2);
-                grid->add(grid, &btn_confirm->widget, 1, 0, 1, 1);
+                grid->add(grid, &lbl_action->label.widget, 0, 0, 2, 1);
+                grid->add(grid, &btn_confirm->widget, 0, 1, 1, 1);
                 grid->add(grid, &btn_cancel->widget, 1, 1, 1, 1);
-                window_resize(main_window, 200, 70);
+                window_resize(main_window, 200, 76);
 
                 window_exec(main_window);

uspace/app/vlaunch/Makefile

@@ -35 +35 @@
 
 SOURCES = \
-        vlaunch.c
+        vlaunch.c \
+        images.c
+
+IMAGES = \
+        gfx/helenos.tga
+
+PRE_DEPEND = images.c images.h
+EXTRA_CLEAN = images.c images.h
 
 include $(USPACE_PREFIX)/Makefile.common
+
+images.c images.h: $(IMAGES)
+        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^

uspace/app/vlaunch/vlaunch.c

@@ -46 +46 @@
 #include <button.h>
 #include <label.h>
+#include <canvas.h>
 
-#define NAME "vlaunch"
+#include <surface.h>
+#include <source.h>
+#include <drawctx.h>
+#include <codec/tga.h>
+
+#include "images.h"
+
+#define NAME  "vlaunch"
+
+#define LOGO_WIDTH   196
+#define LOGO_HEIGHT  66
 
 static char *winreg = NULL;
@@ -97 +108 @@
         }
         
+        surface_t *logo = decode_tga((void *) helenos_tga, helenos_tga_size, 0);
+        if (!logo) {
+                printf("Unable to decode logo.\n");
+                return 1;
+        }
+        
         winreg = argv[1];
         window_t *main_window = window_open(argv[1], true, true, "vlaunch", 0, 0);
@@ -104 +121 @@
         }
         
-        pixel_t grd_bg = PIXEL(255, 240, 240, 240);
+        pixel_t grd_bg = PIXEL(255, 255, 255, 255);
         pixel_t btn_bg = PIXEL(255, 0, 0, 0);
         pixel_t btn_fg = PIXEL(255, 240, 240, 240);
-        pixel_t lbl_bg = PIXEL(255, 240, 240, 240);
+        pixel_t lbl_bg = PIXEL(255, 255, 255, 255);
         pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
         
+        canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT,
+            logo);
         label_t *lbl_caption = create_label(NULL, "Launch application:", 16,
             lbl_bg, lbl_fg);
@@ -118 +137 @@
         button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
             btn_fg);
-        grid_t *grid = create_grid(window_root(main_window), 4, 1, grd_bg);
+        grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
         
-        if ((!lbl_caption) || (!btn_vterm) || (!btn_vdemo) ||
-            (!btn_vlaunch) || (!grid)) {
+        if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
+            (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
                 window_close(main_window);
                 printf("Cannot create widgets.\n");
@@ -131 +150 @@
         sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch);
         
-        grid->add(grid, &lbl_caption->widget, 0, 0, 1, 1);
-        grid->add(grid, &btn_vterm->widget, 1, 0, 1, 1);
-        grid->add(grid, &btn_vdemo->widget, 2, 0, 1, 1);
-        grid->add(grid, &btn_vlaunch->widget, 3, 0, 1, 1);
+        grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1);
+        grid->add(grid, &lbl_caption->widget, 0, 1, 1, 1);
+        grid->add(grid, &btn_vterm->widget, 0, 2, 1, 1);
+        grid->add(grid, &btn_vdemo->widget, 0, 3, 1, 1);
+        grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
         
-        window_resize(main_window, 180, 130);
+        window_resize(main_window, 210, 130 + LOGO_HEIGHT);
         window_exec(main_window);
+        
         task_retval(0);
         async_manager();