Changeset 8ff0bd2 for uspace/app – HelenOS

uspace/app/bdsh/Makefile

-              rd2c67e7
+              r8ff0bd2
 USPACE_PREFIX = ../..
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) -I. -Icmds/ \
+        -Icmds/builtins -Icmds/modules
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a \
+        $(LIBFMTUTIL_PREFIX)/libfmtutil.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) \
+        -I$(LIBFMTUTIL_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
 BINARY = bdsh
 …
         cmds/mod_cmds.c \
         cmds/builtin_cmds.c \
+        compl.c \
         errors.c \
         input.c \
         util.c \
         exec.c \
+        scli.c
+        scli.c \
+        tok.c
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/bdsh/cmds/builtin_cmds.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
 #include "cmds.h"
 #include "builtin_aliases.h"
+#include "scli.h"
 extern volatile unsigned int cli_interactive;
 …
                 cmd->help(extended);
                 return CL_EOK;
         } else
+        } else {
                 return CL_ENOENT;
+        }
+}
 int run_builtin(int builtin, char *argv[], cliuser_t *usr)
+int run_builtin(int builtin, char *argv[], cliuser_t *usr, iostate_t *new_iostate)
+{
+        int rc;
         builtin_t *cmd = builtins;
         cmd += builtin;
+        iostate_t *old_iostate = get_iostate();
+        set_iostate(new_iostate);
+        if (NULL != cmd->entry) {
+                rc = ((int)cmd->entry(argv, usr));
+        } else {
+                rc = CL_ENOENT;
+        }
+        set_iostate(old_iostate);
+        if (NULL != cmd->entry)
+                return((int)cmd->entry(argv, usr));
+        return CL_ENOENT;
+        return rc;
+}

uspace/app/bdsh/cmds/builtins/cd/cd.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

uspace/app/bdsh/cmds/builtins/exit/exit.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

uspace/app/bdsh/cmds/cmds.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef CMDS_H
 #define CMDS_H
 …
 extern char *alias_for_module(const char *);
 extern int help_module(int, unsigned int);
 extern int run_module(int, char *[]);
+extern int run_module(int, char *[], iostate_t *);
 /* Prototypes for builtin launchers */
 …
 extern char *alias_for_builtin(const char *);
 extern int help_builtin(int, unsigned int);
 extern int run_builtin(int, char *[], cliuser_t *);
+extern int run_builtin(int, char *[], cliuser_t *, iostate_t *);
 #endif

uspace/app/bdsh/cmds/mod_cmds.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
                 mod->help(extended);
                 return CL_EOK;
         } else
+        } else {
                 return CL_ENOENT;
+        }
+}
 /* Invokes the module entry point modules[module], passing argv[] as an argument
  * stack. */
 int run_module(int module, char *argv[])
+int run_module(int module, char *argv[], iostate_t *new_iostate)
+{
+        int rc;
         module_t *mod = modules;
         mod += module;
+        iostate_t *old_iostate = get_iostate();
+        set_iostate(new_iostate);
+        if (NULL != mod->entry)
+                return ((int)mod->entry(argv));
+        if (NULL != mod->entry) {
+                rc = ((int)mod->entry(argv));
+        } else {
+                rc = CL_ENOENT;
+        }
+        set_iostate(old_iostate);
         return CL_ENOENT;
+        return rc;
+}

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

-              rd2c67e7
+              r8ff0bd2
 #include <libblock.h>
 #include <devmap.h>
+#include <loc.h>
 #include <errno.h>
 #include <assert.h>
 …
         unsigned int argc;
         unsigned int i, j;
         devmap_handle_t handle;
+        service_id_t service_id;
         aoff64_t offset;
         uint8_t *blk;
 …
                 size = 256;
         rc = devmap_device_get_handle(argv[1], &handle, 0);
+        rc = loc_service_get_id(argv[1], &service_id, 0);
         if (rc != EOK) {
                 printf("%s: Error resolving device `%s'.\n", cmdname, argv[1]);
 …
+        }
         rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf("%s: Error initializing libblock.\n", cmdname);
 …
+        }
         rc = block_get_bsize(handle, &block_size);
+        rc = block_get_bsize(service_id, &block_size);
         if (rc != EOK) {
                 printf("%s: Error determining device block size.\n", cmdname);
 …
         if (blk == NULL) {
                 printf("%s: Error allocating memory.\n", cmdname);
                 block_fini(handle);
+                block_fini(service_id);
                 return CMD_FAILURE;
+        }
 …
         while (size > 0) {
                 rc = block_read_direct(handle, ba, 1, blk);
+                rc = block_read_direct(service_id, ba, 1, blk);
                 if (rc != EOK) {
                         printf("%s: Error reading block %" PRIuOFF64 "\n", cmdname, ba);
                         free(blk);
                         block_fini(handle);
+                        block_fini(service_id);
                         return CMD_FAILURE;
+                }
 …
         free(blk);
         block_fini(handle);
+        block_fini(service_id);
         return CMD_SUCCESS;

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * Copyright (c) 2011, Martin Sucha
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
         size_t blen, int vb)
+{
         int fd1, fd2, bytes = 0;
         off64_t total = 0;
+        int fd1, fd2, bytes;
+        off64_t total;
         int64_t copied = 0;
         char *buff = NULL;
 …
+        }
+        for (;;) {
+                ssize_t res;
+                size_t written = 0;
+                bytes = read(fd1, buff, blen);
+                if (bytes <= 0)
+        while ((bytes = read_all(fd1, buff, blen)) > 0) {
+                if ((bytes = write_all(fd2, buff, bytes)) < 0)
                         break;
                 copied += bytes;
-                res = bytes;
-                do {
-                        /*
-                         * Theoretically, it may not be enough to call write()
-                         * only once. Also the previous read() may have
-                         * returned less data than requested.
-                         */
-                        bytes = write(fd2, buff + written, res);
-                        if (bytes < 0)
-                                goto err;
-                        written += bytes;
-                        res -= bytes;
-                } while (res > 0);
-                /* TODO: re-insert assert() once this is stand alone,
-                 * removed as abort() exits the entire shell
-                 */
-                if (res != 0) {
-                        printf("\n%zd more bytes than actually exist were copied\n", res);
-                        goto err;
+                }
+        }
         if (bytes < 0) {
-err:
                 printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
 #include <stdlib.h>
 #include <str.h>
+#include <fmtutil.h>
 #include "config.h"
 …
 static void help_survival(void)
+{
+        printf("Don't panic!\n\n");
+        printf("This is Bdsh, the Brain dead shell, currently "
+        print_wrapped_console(
+            "Don't panic!\n\n"
+            "This is Bdsh, the Brain dead shell, currently "
             "the primary user interface to HelenOS. Bdsh allows you to enter "
             "commands and supports history (Up, Down arrow keys), "
             "line editing (Left Arrow, Right Arrow, Home, End, Backspace), "
             "selection (Shift + movement keys), copy and paste (Ctrl-C, "
             "Ctrl-V), similar to common desktop environments.\n\n");
         printf("The most basic filesystem commands are Bdsh builtins. Type "
+            "Ctrl-V), similar to common desktop environments.\n\n"
+            "The most basic filesystem commands are Bdsh builtins. Type "
             "'help commands' [Enter] to see the list of Bdsh builtin commands. "
             "Other commands are external executables located in the /app and "
             "/srv directories. Type 'ls /app' [Enter] and 'ls /srv' [Enter] "
             "to see their list. You can execute an external command simply "
             "by entering its name (e.g. type 'tetris' [Enter]).\n\n");
         printf("HelenOS has virtual consoles (VCs). You can switch between "
             "these using the F1-F11 keys.\n\n");
         printf("This is but a small glimpse of what you can do with HelenOS. "
+            "by entering its name (e.g. type 'tetris' [Enter]).\n\n"
+            "HelenOS has virtual consoles (VCs). You can switch between "
+            "these using the F1-F11 keys.\n\n"
+            "This is but a small glimpse of what you can do with HelenOS. "
             "To learn more please point your browser to the HelenOS User's "
+            "Guide: http://trac.helenos.org/trac.fcgi/wiki/UsersGuide\n\n");
+            "Guide: http://trac.helenos.org/wiki/UsersGuide\n\n",
+            ALIGN_LEFT);
+}

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
                 /* fill the name field */
                 tosort[nbdirs].name = (char *) malloc(str_length(dp->d_name) + 1);
+                tosort[nbdirs].name = (char *) malloc(str_size(dp->d_name) + 1);
                 if (!tosort[nbdirs].name) {
                         cli_error(CL_ENOMEM, "ls: failed to scan %s", d);
                         goto out;
+                }
                 str_cpy(tosort[nbdirs].name, str_length(dp->d_name) + 1, dp->d_name);
+                str_cpy(tosort[nbdirs].name, str_size(dp->d_name) + 1, dp->d_name);
                 len = snprintf(buff, PATH_MAX - 1, "%s/%s", d, tosort[nbdirs].name);
                 buff[len] = '\0';

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <stdio.h>

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

rd2c67e7	r8ff0bd2
26	26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27	27	*/
28
29	28
30	29	#include <stdio.h>

uspace/app/bdsh/cmds/modules/module_aliases.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef MODULE_ALIASES_H
 #define MODULE_ALIASES_H

uspace/app/bdsh/cmds/modules/modules.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef MODULES_H
 #define MODULES_H

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

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

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

uspace/app/bdsh/config.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /* Various things that are used in many places including a few
  * tidbits left over from autoconf prior to the HelenOS port */
 …
 #define EXIT_FAILURE 1
 #endif
-/* Work around for getenv() */
-#define PATH "/srv:/app"
-#define PATH_DELIM ":"
 /* Used in many places */

uspace/app/bdsh/errors.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
 #include "errors.h"
 #include "errstr.h"
+#include "scli.h"
 volatile int cli_errno = CL_EOK;

uspace/app/bdsh/errors.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef ERRORS_H
 #define ERRORS_H

uspace/app/bdsh/errstr.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef ERRSTR_H
 #define ERRSTR_H

uspace/app/bdsh/exec.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
 #include <str_error.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 #include "config.h"
 …
 static char *find_command(char *);
 static int try_access(const char *);
+const char *search_dir[] = { "/app", "/srv", NULL };
 /* work-around for access() */
 …
 static char *find_command(char *cmd)
+{
+        char *path_tok;
+        char *path[PATH_MAX];
+        int n = 0, i = 0;
+        size_t x = str_size(cmd) + 2;
+        size_t i;
         found = (char *)malloc(PATH_MAX);
 …
+        }
-        path_tok = str_dup(PATH);
-        /* Extract the PATH env to a path[] array */
-        path[n] = strtok(path_tok, PATH_DELIM);
-        while (NULL != path[n]) {
-                if ((str_size(path[n]) + x ) > PATH_MAX) {
-                        cli_error(CL_ENOTSUP,
-                                "Segment %d of path is too large, search ends at segment %d",
-                                n, n-1);
-                        break;
+                }
-                path[++n] = strtok(NULL, PATH_DELIM);
+        }
         /* We now have n places to look for the command */
         for (i=0; path[i]; i++) {
+        for (i = 0; search_dir[i] != NULL; i++) {
                 memset(found, 0, sizeof(found));
                 snprintf(found, PATH_MAX, "%s/%s", path[i], cmd);
+                snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
                 if (-1 != try_access(found)) {
-                        free(path_tok);
                         return (char *) found;
+                }
 …
         /* We didn't find it, just give it back as-is. */
-        free(path_tok);
         return (char *) cmd;
+}
 unsigned int try_exec(char *cmd, char **argv)
+unsigned int try_exec(char *cmd, char **argv, iostate_t *io)
+{
         task_id_t tid;
         task_exit_t texit;
         char *tmp;
+        int rc, retval;
+        int rc, retval, i;
+        int file_handles[3];
+        int *file_handles_p[4];
+        FILE *files[3];
         tmp = str_dup(find_command(cmd));
         free(found);
+        files[0] = io->stdin;
+        files[1] = io->stdout;
+        files[2] = io->stderr;
+        for (i = 0; i < 3 && files[i] != NULL; i++) {
+                if (fhandle(files[i], &file_handles[i]) == EOK) {
+                        file_handles_p[i] = &file_handles[i];
+                }
+                else {
+                        file_handles_p[i] = NULL;
+                }
+        }
+        file_handles_p[i] = NULL;
         rc = task_spawnv(&tid, tmp, (const char **) argv);
+        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_handles_p);
         free(tmp);

uspace/app/bdsh/exec.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef EXEC_H
 #define EXEC_H
 #include <task.h>
+#include "scli.h"
+extern unsigned int try_exec(char *, char **);
+extern const char *search_dir[];
+extern unsigned int try_exec(char *, char **, iostate_t *);
 #endif

uspace/app/bdsh/input.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
 #include "config.h"
+#include "compl.h"
 #include "util.h"
 #include "scli.h"
 …
 #include "errors.h"
 #include "exec.h"
+#include "tok.h"
 extern volatile unsigned int cli_quit;
 …
 /** Text input field. */
 static tinput_t *tinput;
+/* Private helpers */
+static int run_command(char **, cliuser_t *, iostate_t *);
+static void print_pipe_usage(void);
 /* Tokenizes input from console, sees if the first word is a built-in, if so
  * invokes the built-in entry point (a[0]) passing all arguments in a[] to
  * the handler */
+int tok_input(cliuser_t *usr)
+{
+int process_input(cliuser_t *usr)
+{
+        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens == NULL)
+                return ENOMEM;
         char *cmd[WORD_MAX];
-        int n = 0, i = 0;
         int rc = 0;
+        char *tmp;
+        if (NULL == usr->line)
+        tokenizer_t tok;
+        unsigned int i, pipe_count, processed_pipes;
+        unsigned int pipe_pos[2];
+        char *redir_from = NULL;
+        char *redir_to = NULL;
+        if (usr->line == NULL) {
+                free(tokens);
                 return CL_EFAIL;
+        tmp = str_dup(usr->line);
+        cmd[n] = strtok(tmp, " ");
+        while (cmd[n] && n < WORD_MAX) {
+                cmd[++n] = strtok(NULL, " ");
+        }
+        /* We have rubbish */
+        if (NULL == cmd[0]) {
+                rc = CL_ENOENT;
+                goto finit;
+        }
+        /* Its a builtin command ? */
+        if ((i = (is_builtin(cmd[0]))) > -1) {
+                rc = run_builtin(i, cmd, usr);
+                goto finit;
+        /* Its a module ? */
+        } else if ((i = (is_module(cmd[0]))) > -1) {
+                rc = run_module(i, cmd);
+                goto finit;
+        }
+        /* See what try_exec thinks of it */
+        rc = try_exec(cmd[0], cmd);
+        }
+        rc = tok_init(&tok, usr->line, tokens, WORD_MAX);
+        if (rc != EOK) {
+                goto finit;
+        }
+        size_t tokens_length;
+        rc = tok_tokenize(&tok, &tokens_length);
+        if (rc != EOK) {
+                goto finit;
+        }
+        if (tokens_length > 0 && tokens[0].type == TOKTYPE_SPACE) {
+                tokens++;
+                tokens_length--;
+        }
+        if (tokens_length > 0 && tokens[tokens_length-1].type == TOKTYPE_SPACE) {
+                tokens_length--;
+        }
+        /* Until full support for pipes is implemented, allow for a simple case:
+         * [from <file> |] command [| to <file>]
+         *
+         * First find the pipes and check that there are no more
+         */
+        for (i = 0, pipe_count = 0; i < tokens_length; i++) {
+                if (tokens[i].type == TOKTYPE_PIPE) {
+                        if (pipe_count >= 2) {
+                                print_pipe_usage();
+                                rc = ENOTSUP;
+                                goto finit;
+                        }
+                        pipe_pos[pipe_count] = i;
+                        pipe_count++;
+                }
+        }
+        unsigned int cmd_token_start = 0;
+        unsigned int cmd_token_end = tokens_length;
+        processed_pipes = 0;
+        /* Check if the first part (from <file> |) is present */
+        if (pipe_count > 0 && (pipe_pos[0] == 3 || pipe_pos[0] == 4) && str_cmp(tokens[0].text, "from") == 0) {
+                /* Ignore the first three tokens (from, file, pipe) and set from */
+                redir_from = tokens[2].text;
+                cmd_token_start = pipe_pos[0]+1;
+                processed_pipes++;
+        }
+        /* Check if the second part (| to <file>) is present */
+        if ((pipe_count - processed_pipes) > 0 &&
+            (pipe_pos[processed_pipes] == tokens_length - 4 ||
+            (pipe_pos[processed_pipes] == tokens_length - 5 &&
+            tokens[tokens_length-4].type == TOKTYPE_SPACE )) &&
+            str_cmp(tokens[tokens_length-3].text, "to") == 0) {
+                /* Ignore the last three tokens (pipe, to, file) and set to */
+                redir_to = tokens[tokens_length-1].text;
+                cmd_token_end = pipe_pos[processed_pipes];
+                processed_pipes++;
+        }
+        if (processed_pipes != pipe_count) {
+                print_pipe_usage();
+                rc = ENOTSUP;
+                goto finit;
+        }
+        /* Convert tokens of the command to string array */
+        unsigned int cmd_pos = 0;
+        for (i = cmd_token_start; i < cmd_token_end; i++) {
+                if (tokens[i].type != TOKTYPE_SPACE) {
+                        cmd[cmd_pos++] = tokens[i].text;
+                }
+        }
+        cmd[cmd_pos++] = NULL;
+        if (cmd[0] == NULL) {
+                print_pipe_usage();
+                rc = ENOTSUP;
+                goto finit;
+        }
+        iostate_t new_iostate = {
+                .stdin = stdin,
+                .stdout = stdout,
+                .stderr = stderr
+        };
+        FILE *from = NULL;
+        FILE *to = NULL;
+        if (redir_from) {
+                from = fopen(redir_from, "r");
+                if (from == NULL) {
+                        printf("Cannot open file %s\n", redir_from);
+                        rc = errno;
+                        goto finit_with_files;
+                }
+                new_iostate.stdin = from;
+        }
+        if (redir_to) {
+                to = fopen(redir_to, "w");
+                if (to == NULL) {
+                        printf("Cannot open file %s\n", redir_to);
+                        rc = errno;
+                        goto finit_with_files;
+                }
+                new_iostate.stdout = to;
+        }
+        rc = run_command(cmd, usr, &new_iostate);
+finit_with_files:
+        if (from != NULL) {
+                fclose(from);
+        }
+        if (to != NULL) {
+                fclose(to);
+        }
 finit:
         if (NULL != usr->line) {
 …
                 usr->line = (char *) NULL;
+        }
         if (NULL != tmp)
                 free(tmp);
+        tok_fini(&tok);
+        free(tokens);
         return rc;
+}
+void print_pipe_usage()
+{
+        printf("Invalid syntax!\n");
+        printf("Usage of redirection (pipes in the future):\n");
+        printf("from filename | command ...\n");
+        printf("from filename | command ... | to filename\n");
+        printf("command ... | to filename\n");
+}
+int run_command(char **cmd, cliuser_t *usr, iostate_t *new_iostate)
+{
+        int id = 0;
+        /* We have rubbish */
+        if (NULL == cmd[0]) {
+                return CL_ENOENT;
+        }
+        /* Is it a builtin command ? */
+        if ((id = (is_builtin(cmd[0]))) > -1) {
+                return run_builtin(id, cmd, usr, new_iostate);
+        }
+        /* Is it a module ? */
+        if ((id = (is_module(cmd[0]))) > -1) {
+                return run_module(id, cmd, new_iostate);
+        }
+        /* See what try_exec thinks of it */
+        return try_exec(cmd[0], cmd, new_iostate);
+}
 …
         int rc;
+        console_flush(tinput->console);
+        console_set_style(tinput->console, STYLE_EMPHASIS);
+        printf("%s", usr->prompt);
+        console_flush(tinput->console);
+        console_set_style(tinput->console, STYLE_NORMAL);
+        tinput_set_prompt(tinput, usr->prompt);
         rc = tinput_read(tinput, &str);
 …
+        }
+        tinput_set_compl_ops(tinput, &compl_ops);
         return 0;
+}

uspace/app/bdsh/input.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef INPUT_H
 #define INPUT_H
 …
 extern void get_input(cliuser_t *);
 extern int tok_input(cliuser_t *);
+extern int process_input(cliuser_t *);
 extern int input_init(void);

uspace/app/bdsh/scli.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
 /* See scli.h */
 static cliuser_t usr;
+static iostate_t *iostate;
+static iostate_t stdiostate;
 /* Globals that are modified during start-up that modules/builtins
 …
+}
+iostate_t *get_iostate(void)
+{
+        return iostate;
+}
+void set_iostate(iostate_t *ios)
+{
+        iostate = ios;
+        stdin = ios->stdin;
+        stdout = ios->stdout;
+        stderr = ios->stderr;
+}
 int main(int argc, char *argv[])
+{
         int ret = 0;
+        stdiostate.stdin = stdin;
+        stdiostate.stdout = stdout;
+        stdiostate.stderr = stderr;
+        iostate = &stdiostate;
         if (cli_init(&usr))
 …
                 get_input(&usr);
                 if (NULL != usr.line) {
                         ret = tok_input(&usr);
+                        ret = process_input(&usr);
                         cli_set_prompt(&usr);
                         usr.lasterr = ret;

uspace/app/bdsh/scli.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef SCLI_H
 #define SCLI_H
 …
 #include "config.h"
 #include <stdint.h>
+#include <stdio.h>
 typedef struct {
 …
 } cliuser_t;
+typedef struct {
+        FILE *stdin;
+        FILE *stdout;
+        FILE *stderr;
+} iostate_t;
 extern const char *progname;
+extern iostate_t *get_iostate(void);
+extern void set_iostate(iostate_t *);
 #endif

uspace/app/bdsh/util.c

-              rd2c67e7
+              r8ff0bd2
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> - All rights reserved
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 …
         return 0;
+}

uspace/app/bdsh/util.h

-              rd2c67e7
+              r8ff0bd2
+/*
+ * Copyright (c) 2008 Tim Post
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef UTIL_H
 #define UTIL_H

uspace/app/blkdump/blkdump.c

-              rd2c67e7
+              r8ff0bd2
 #include <libblock.h>
 #include <mem.h>
 #include <devmap.h>
+#include <loc.h>
 #include <byteorder.h>
 #include <sys/types.h>
 …
         int rc;
         char *dev_path;
         devmap_handle_t handle;
+        service_id_t service_id;
         size_t block_size;
         char *endptr;
 …
         dev_path = *argv;
         rc = devmap_device_get_handle(dev_path, &handle, 0);
+        rc = loc_service_get_id(dev_path, &service_id, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving device `%s'.\n", dev_path);
 …
+        }
         rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
 …
+        }
         rc = block_get_bsize(handle, &block_size);
+        rc = block_get_bsize(service_id, &block_size);
         if (rc != EOK) {
                 printf(NAME ": Error determining device block size.\n");
 …
+        }
         rc = block_get_nblocks(handle, &dev_nblocks);
+        rc = block_get_nblocks(service_id, &dev_nblocks);
         if (rc != EOK) {
                 printf(NAME ": Warning, failed to obtain block device size.\n");
 …
         if (data == NULL) {
                 printf(NAME ": Error allocating data buffer of %" PRIuOFF64 " bytes", (aoff64_t) block_size);
                 block_fini(handle);
+                block_fini(service_id);
                 return 3;
+        }
 …
         limit = block_offset + block_count;
         for (current = block_offset; current < limit; current++) {
                 rc = block_read_direct(handle, current, 1, data);
+                rc = block_read_direct(service_id, current, 1, data);
                 if (rc != EOK) {
                         printf(NAME ": Error reading block at %" PRIuOFF64 " \n", current);
 …
         free(data);
         block_fini(handle);
+        block_fini(service_id);
         return 0;

uspace/app/bnchmark/bnchmark.c

rd2c67e7	r8ff0bd2
41	41	#include <stdlib.h>
42	42	#include <mem.h>
43		#include <~~devmap~~.h>
	43	#include <loc.h>
44	44	#include <byteorder.h>
45	45	#include <sys/types.h>

uspace/app/devctl/Makefile

-              rd2c67e7
+              r8ff0bd2
+#
+# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2011 Jiri Svoboda
 # All rights reserved.
+#
 …
+#
 USPACE_PREFIX = ../../../..
 BINARY = fhc
+USPACE_PREFIX = ../..
+BINARY = devctl
 SOURCES = \
         fhc.c
+        devctl.c
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/edit/sheet.c

-              rd2c67e7
+              r8ff0bd2
                 return ENOMEM;
         list_initialize(&sh->tags_head);
+        list_initialize(&sh->tags);
         return EOK;
 …
         char *ipp;
         size_t sz;
-        link_t *link;
         tag_t *tag;
         char *newp;
 …
         /* Adjust tags. */
+        link = sh->tags_head.next;
+        while (link != &sh->tags_head) {
+        list_foreach(sh->tags, link) {
                 tag = list_get_instance(link, tag_t, link);
 …
                 else if (tag->b_off == pos->b_off && dir == dir_before)
                         tag->b_off += sz;
-                link = link->next;
+        }
 …
         char *spp;
         size_t sz;
-        link_t *link;
         tag_t *tag;
         char *newp;
 …
         /* Adjust tags. */
+        link = sh->tags_head.next;
+        while (link != &sh->tags_head) {
+        list_foreach(sh->tags, link) {
                 tag = list_get_instance(link, tag_t, link);
 …
                 else if (tag->b_off >= spos->b_off)
                         tag->b_off = spos->b_off;
-                link = link->next;
+        }
 …
         tag->b_off = pt->b_off;
         tag->sh = sh;
         list_append(&tag->link, &sh->tags_head);
+        list_append(&tag->link, &sh->tags);
+}

uspace/app/edit/sheet.h

-              rd2c67e7
+              r8ff0bd2
         char *data;
         link_t tags_head;
+        list_t tags;
 } sheet_t;
 …
         /* Note: This structure is opaque for the user. */
         /** Link to list of all tags in the sheet (see sheet_t.tags_head) */
+        /** Link to list of all tags in the sheet (see sheet_t.tags) */
         link_t link;
         sheet_t *sh;

uspace/app/ext2info/ext2info.c

-              rd2c67e7
+              r8ff0bd2
 #include <libblock.h>
 #include <mem.h>
 #include <devmap.h>
+#include <loc.h>
 #include <byteorder.h>
 #include <sys/types.h>
 …
         char *endptr;
         char *dev_path;
         devmap_handle_t handle;
+        service_id_t service_id;
         ext2_filesystem_t filesystem;
         int arg_flags;
 …
         dev_path = *argv;
         rc = devmap_device_get_handle(dev_path, &handle, 0);
+        rc = loc_service_get_id(dev_path, &service_id, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving device `%s'.\n", dev_path);
 …
+        }
         rc = ext2_filesystem_init(&filesystem, handle);
+        rc = ext2_filesystem_init(&filesystem, service_id);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libext2.\n");
 …
         printf("  Directory contents:\n");
         rc = ext2_directory_iterator_init(&it, fs, inode_ref);
+        rc = ext2_directory_iterator_init(&it, fs, inode_ref, 0);
         if (rc != EOK) {
                 printf("Failed initializing directory iterator\n");

uspace/app/init/init.c

-              rd2c67e7
+              r8ff0bd2
 #include <macros.h>
 #include <str.h>
 #include <devmap.h>
+#include <loc.h>
 #include <str_error.h>
 #include "init.h"
 …
 #define ROOT_MOUNT_POINT  "/"
 #define DEVFS_FS_TYPE      "devfs"
 #define DEVFS_MOUNT_POINT  "/dev"
+#define LOCFS_FS_TYPE      "locfs"
+#define LOCFS_MOUNT_POINT  "/loc"
 #define TMPFS_FS_TYPE      "tmpfs"
 …
 #define APP_GETTERM  "/app/getterm"
+/** Print banner */
 static void info_print(void)
+{
 …
+}
+/** Report mount operation success */
 static bool mount_report(const char *desc, const char *mntpt,
     const char *fstype, const char *dev, int rc)
 …
+}
+/** Mount root filesystem
+ *
+ * The operation blocks until the root filesystem
+ * server is ready for mounting.
+ *
+ * @param[in] fstype Root filesystem type.
+ *
+ * @return True on success.
+ * @return False on failure.
+ *
+ */
 static bool mount_root(const char *fstype)
+{
 …
+}
+static bool mount_devfs(void)
+{
+        int rc = mount(DEVFS_FS_TYPE, DEVFS_MOUNT_POINT, "", "",
+/** Mount locfs filesystem
+ *
+ * The operation blocks until the locfs filesystem
+ * server is ready for mounting.
+ *
+ * @return True on success.
+ * @return False on failure.
+ *
+ */
+static bool mount_locfs(void)
+{
+        int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
             IPC_FLAG_BLOCKING);
         return mount_report("Device filesystem", DEVFS_MOUNT_POINT, DEVFS_FS_TYPE,
             NULL, rc);
+        return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
+            LOCFS_FS_TYPE, NULL, rc);
+}
 …
         rc = task_wait(id, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Error waiting for %s (%s(\n", NAME, fname,
+                printf("%s: Error waiting for %s (%s)\n", NAME, fname,
                     str_error(rc));
                 return;
 …
+}
 static void console(const char *dev)
+{
         printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, dev);
         /* Wait for the input device to be ready */
         devmap_handle_t handle;
         int rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, dev,
                     str_error(rc));
                 return;
+        }
         rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, dev, NULL);
+static void console(const char *svc)
+{
+        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, svc);
+        /* Wait for the input service to be ready */
+        service_id_t service_id;
+        int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, svc,
+                    str_error(rc));
+                return;
+        }
+        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, svc, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
                     dev, str_error(rc));
+        }
+}
 static void getterm(const char *dev, const char *app, bool wmsg)
+{
         char term[DEVMAP_NAME_MAXLEN];
+                    svc, str_error(rc));
+        }
+}
+static void getterm(const char *svc, const char *app, bool wmsg)
+{
+        char term[LOC_NAME_MAXLEN];
         int rc;
         snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc);
         printf("%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app);
         /* Wait for the terminal device to be ready */
         devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
+        /* Wait for the terminal service to be ready */
+        service_id_t service_id;
+        rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, term,
 …
+        }
         spawn("/srv/devfs");
+        spawn("/srv/locfs");
         spawn("/srv/taskmon");
         if (!mount_devfs()) {
+        if (!mount_locfs()) {
                 printf("%s: Exiting\n", NAME);
                 return -2;
 …
         spawn("/srv/apic");
         spawn("/srv/i8259");
-        spawn("/srv/fhc");
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
         srv_start("/srv/s3c24ser");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
         srv_start("/srv/s3c24ts");
         spawn("/srv/fb");
         spawn("/srv/kbd");
         console("hid_in/kbd");
+        spawn("/srv/input");
+        console("hid/input");
         spawn("/srv/clip");
 …
 #ifdef CONFIG_MOUNT_DATA
+        /* Make sure fat is running. */
+        if (str_cmp(STRING(RDFMT), "fat") != 0) {
+                srv_start("/srv/fat");
+        }
         mount_data();
 #else

uspace/app/klog/klog.c

-              rd2c67e7
+              r8ff0bd2
  * Receives kernel klog notifications.
+ *
+ * @param callid IPC call ID.
+ * @param call   IPC call structure.
+ * @param callid IPC call ID
+ * @param call   IPC call structure
+ * @param arg    Local argument
+ *
  */

uspace/app/locinfo/Makefile

-              rd2c67e7
+              r8ff0bd2
+#
 # Copyright (c) 2010 Jiri Svoboda
+# Copyright (c) 2011 Jiri Svoboda
 # All rights reserved.
+#
 …
+#
 USPACE_PREFIX = ../../..
+USPACE_PREFIX = ../..
 EXTRA_CFLAGS = -Iinclude
 BINARY = adb_ms
+BINARY = locinfo
 SOURCES = \
+        adb_mouse.c \
+        adb_dev.c
+        locinfo.c
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/locinfo/locinfo.c

-              rd2c67e7
+              r8ff0bd2
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
+ *
 …
  */
+/** @addtogroup tester
+ * @brief Test devman service.
+/** @addtogroup locinfo
  * @{
  */
+/**
+ * @file
+/** @file locinfo.c Print information from location service.
  */
-#include <inttypes.h>
 #include <errno.h>
+#include <str_error.h>
+#include <loc.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <str.h>
 #include <sys/types.h>
+#include <async.h>
+#include <devman.h>
+#include <str.h>
+#include <vfs/vfs.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include "../tester.h"
+#include <sys/typefmt.h>
+#define DEVICE_PATH_NORMAL "/virt/null/a"
+#define DEVICE_CLASS "virt-null"
+#define DEVICE_CLASS_NAME "1"
+#define DEVICE_PATH_CLASSES DEVICE_CLASS "/" DEVICE_CLASS_NAME
+#define NAME "locinfo"
 const char *test_devman1(void)
+int main(int argc, char *argv[])
+{
+        devman_handle_t handle_primary;
+        devman_handle_t handle_class;
+        category_id_t *cat_ids;
+        size_t cat_cnt;
+        service_id_t *svc_ids;
+        size_t svc_cnt;
+        size_t i, j;
+        char *cat_name;
+        char *svc_name;
         int rc;
+        TPRINTF("Asking for handle of `%s'...\n", DEVICE_PATH_NORMAL);
+        rc = devman_device_get_handle(DEVICE_PATH_NORMAL, &handle_primary, 0);
+        rc = loc_get_categories(&cat_ids, &cat_cnt);
         if (rc != EOK) {
+                TPRINTF(" ...failed: %s.\n", str_error(rc));
+                if (rc == ENOENT) {
+                        TPRINTF("Have you compiled the test drivers?\n");
+                }
+                return "Failed getting device handle";
+                printf(NAME ": Error getting list of categories.\n");
+                return 1;
+        }
+        TPRINTF("Asking for handle of `%s' by class..\n", DEVICE_PATH_CLASSES);
+        rc = devman_device_get_handle_by_class(DEVICE_CLASS, DEVICE_CLASS_NAME,
+            &handle_class, 0);
+        if (rc != EOK) {
+                TPRINTF(" ...failed: %s.\n", str_error(rc));
+                return "Failed getting device class handle";
+        for (i = 0; i < cat_cnt; i++) {
+                rc = loc_category_get_name(cat_ids[i], &cat_name);
+                if (rc != EOK)
+                        cat_name = str_dup("<unknown>");
+                if (cat_name == NULL) {
+                        printf(NAME ": Error allocating memory.\n");
+                        return 1;
+                }
+                printf("%s (%" PRIun "):\n", cat_name, cat_ids[i]);
+                rc = loc_category_get_svcs(cat_ids[i], &svc_ids, &svc_cnt);
+                if (rc != EOK) {
+                        printf(NAME ": Failed getting list of services in "
+                            "category %s, skipping.\n", cat_name);
+                        free(cat_name);
+                        continue;
+                }
+                for (j = 0; j < svc_cnt; j++) {
+                        rc = loc_service_get_name(svc_ids[j], &svc_name);
+                        if (rc != EOK) {
+                                printf(NAME ": Unknown service name (SID %"
+                                    PRIun ").\n", svc_ids[j]);
+                                continue;
+                        }
+                        printf("\t%s (%" PRIun ")\n", svc_name, svc_ids[j]);
+                }
+                free(svc_ids);
+                free(cat_name);
+        }
+        TPRINTF("Received handles %" PRIun " and %" PRIun ".\n",
+            handle_primary, handle_class);
+        if (handle_primary != handle_class) {
+                return "Retrieved different handles for the same device";
+        }
+        return NULL;
+        free(cat_ids);
+        return 0;
+}

uspace/app/lsusb/main.c

-              rd2c67e7
+              r8ff0bd2
 #include <getopt.h>
 #include <devman.h>
 #include <devmap.h>
+#include <loc.h>
 #include <usb/dev/hub.h>
 #include <usb/hc.h>
 …
 #define MAX_USB_ADDRESS USB11_ADDRESS_MAX
-#define MAX_FAILED_ATTEMPTS 10
 #define MAX_PATH_LENGTH 1024
 static void print_found_hc(size_t class_index, const char *path)
+static void print_found_hc(service_id_t sid, const char *path)
+{
+        // printf(NAME ": host controller %zu is `%s'.\n", class_index, path);
+        printf("Bus %02zu: %s\n", class_index, path);
+        printf("Bus %" PRIun ": %s\n", sid, path);
+}
 static void print_found_dev(usb_address_t addr, const char *path)
+{
-        // printf(NAME ":     device with address %d is `%s'.\n", addr, path);
         printf("  Device %02d: %s\n", addr, path);
+}
 …
+                }
                 char path[MAX_PATH_LENGTH];
                 rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
+                rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
                 if (rc != EOK) {
                         continue;
 …
 int main(int argc, char *argv[])
+{
+        size_t class_index = 0;
+        size_t failed_attempts = 0;
+        category_id_t usbhc_cat;
+        service_id_t *svcs;
+        size_t count;
+        size_t i;
+        int rc;
+        while (failed_attempts < MAX_FAILED_ATTEMPTS) {
+                class_index++;
+        rc = loc_category_get_id(USB_HC_CATEGORY, &usbhc_cat, 0);
+        if (rc != EOK) {
+                printf(NAME ": Error resolving category '%s'",
+                    USB_HC_CATEGORY);
+                return 1;
+        }
+        rc = loc_category_get_svcs(usbhc_cat, &svcs, &count);
+        if (rc != EOK) {
+                printf(NAME ": Error getting list of host controllers.\n");
+                return 1;
+        }
+        for (i = 0; i < count; i++) {
                 devman_handle_t hc_handle = 0;
                 int rc = usb_ddf_get_hc_handle_by_class(class_index, &hc_handle);
+                int rc = usb_ddf_get_hc_handle_by_sid(svcs[i], &hc_handle);
                 if (rc != EOK) {
+                        failed_attempts++;
+                        printf(NAME ": Error resolving handle of HC with SID %"
+                            PRIun ", skipping.\n", svcs[i]);
                         continue;
+                }
                 char path[MAX_PATH_LENGTH];
                 rc = devman_get_device_path(hc_handle, path, MAX_PATH_LENGTH);
+                rc = devman_fun_get_path(hc_handle, path, MAX_PATH_LENGTH);
                 if (rc != EOK) {
+                        printf(NAME ": Error resolving path of HC with SID %"
+                            PRIun ", skipping.\n", svcs[i]);
                         continue;
+                }
                 print_found_hc(class_index, path);
+                print_found_hc(svcs[i], path);
                 print_hc_devices(hc_handle);
+        }
+        free(svcs);
         return 0;

uspace/app/mkbd/main.c

-              rd2c67e7
+              r8ff0bd2
 #include <getopt.h>
 #include <devman.h>
 #include <devmap.h>
+#include <loc.h>
 #include <usb/dev/hub.h>
 #include <usb/hid/iface.h>
 …
 #include <usb/hid/hiddescriptor.h>
 #include <usb/hid/usages/consumer.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <assert.h>
 …
         usb_hid_report_path_free(path);
+}
+static int wait_for_quit_fibril(void *arg)
+{
+        console_ctrl_t *con = console_init(stdin, stdout);
+        printf("Press <ESC> to quit the application.\n");
+        while (1) {
+                kbd_event_t ev;
+                bool ok = console_get_kbd_event(con, &ev);
+                if (!ok) {
+                        printf("Connection with console broken: %s.\n",
+                            str_error(errno));
+                        break;
+                }
+                if (ev.key == KC_ESCAPE) {
+                        break;
+                }
+        }
+        console_done(con);
+        exit(0);
+        return EOK;
+}
 …
         char path[MAX_PATH_LENGTH];
         rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
+        rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
         if (rc != EOK) {
                 return ENOMEM;
 …
+        }
+        fid_t quit_fibril = fibril_create(wait_for_quit_fibril, NULL);
+        if (quit_fibril == 0) {
+                printf("Failed to start extra fibril.\n");
+                return -1;
+        }
+        fibril_add_ready(quit_fibril);
         size_t actual_size;
         int event_nr;

uspace/app/mkfat/fat.h

-              rd2c67e7
+              r8ff0bd2
 #define BS_BLOCK                0
 #define BS_SIZE                 512
+#define DIRENT_SIZE             32
+#define DIRENT_SIZE             32
+#define FAT12_CLST_MAX    4085
+#define FAT16_CLST_MAX    65525
+#define FAT12   12
+#define FAT16   16
+#define FAT32   32
+#define FAT_CLUSTER_DOUBLE_SIZE(a) ((a) / 4)
 typedef struct fat_bs {

uspace/app/mkfat/mkfat.c

-              rd2c67e7
+              r8ff0bd2
  * @brief       Tool for creating new FAT file systems.
+ *
  * Currently we can only create 16-bit FAT.
+ * Currently we can create 12/16/32-bit FAT.
  */
 …
 #include <libblock.h>
 #include <mem.h>
 #include <devmap.h>
+#include <loc.h>
 #include <byteorder.h>
 #include <sys/types.h>
 …
 #define div_round_up(a, b) (((a) + (b) - 1) / (b))
 /** Predefined file-system parameters */
+/** Default file-system parameters */
 enum {
         sector_size             = 512,
         sectors_per_cluster     = 8,
         fat_count               = 2,
         reserved_clusters       = 2,
         media_descriptor        = 0xF8 /**< fixed disk */
+        default_sector_size             = 512,
+        default_sectors_per_cluster     = 4,
+        default_fat_count               = 2,
+        default_reserved_clusters       = 2,
+        default_media_descriptor        = 0xF8 /**< fixed disk */
 };
 /** Configurable file-system parameters */
 typedef struct fat_cfg {
+        int fat_type; /* FAT12 = 12, FAT16 = 16, FAT32 = 32 */
+        size_t sector_size;
         uint32_t total_sectors;
         uint16_t root_ent_max;
+        uint16_t addt_res_sectors;
+        uint32_t addt_res_sectors;
+        uint8_t sectors_per_cluster;
+        uint16_t reserved_sectors;
+        uint32_t rootdir_sectors;
+        uint32_t fat_sectors;
+        uint32_t total_clusters;
+        uint8_t fat_count;
 } fat_cfg_t;
-/** Derived file-system parameters */
-typedef struct fat_params {
-        struct fat_cfg cfg;
-        uint16_t reserved_sectors;
-        uint16_t rootdir_sectors;
-        uint32_t fat_sectors;
-        uint16_t total_clusters;
-} fat_params_t;
 static void syntax_print(void);
+static int fat_params_compute(struct fat_cfg const *cfg,
+    struct fat_params *par);
+static int fat_blocks_write(struct fat_params const *par,
+    devmap_handle_t handle);
+static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
+static int fat_params_compute(struct fat_cfg *cfg);
+static int fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id);
+static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs);
 int main(int argc, char **argv)
+{
-        struct fat_params par;
         struct fat_cfg cfg;
         int rc;
         char *dev_path;
+        devmap_handle_t handle;
+        size_t block_size;
+        service_id_t service_id;
         char *endptr;
         aoff64_t dev_nblocks;
+        cfg.sector_size = default_sector_size;
+        cfg.sectors_per_cluster = default_sectors_per_cluster;
+        cfg.fat_count = default_fat_count;
         cfg.total_sectors = 0;
         cfg.addt_res_sectors = 0;
         cfg.root_ent_max = 128;
+        cfg.fat_type = FAT16;
         if (argc < 2) {
 …
         --argc; ++argv;
         if (str_cmp(*argv, "--size") == 0) {
                 --argc; ++argv;
 …
+        }
+        if (str_cmp(*argv, "--type") == 0) {
+                --argc; ++argv;
+                if (*argv == NULL) {
+                        printf(NAME ": Error, argument missing.\n");
+                        syntax_print();
+                        return 1;
+                }
+                cfg.fat_type = strtol(*argv, &endptr, 10);
+                if (*endptr != '\0') {
+                        printf(NAME ": Error, invalid argument.\n");
+                        syntax_print();
+                        return 1;
+                }
+                --argc; ++argv;
+        }
         if (argc != 1) {
                 printf(NAME ": Error, unexpected argument.\n");
 …
         dev_path = *argv;
+        rc = devmap_device_get_handle(dev_path, &handle, 0);
+        printf("Device: %s\n", dev_path);
+        rc = loc_service_get_id(dev_path, &service_id, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving device `%s'.\n", dev_path);
 …
+        }
         rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
 …
+        }
         rc = block_get_bsize(handle, &block_size);
+        rc = block_get_bsize(service_id, &cfg.sector_size);
         if (rc != EOK) {
                 printf(NAME ": Error determining device block size.\n");
 …
+        }
         rc = block_get_nblocks(handle, &dev_nblocks);
+        rc = block_get_nblocks(service_id, &dev_nblocks);
         if (rc != EOK) {
                 printf(NAME ": Warning, failed to obtain block device size.\n");
 …
                 printf(NAME ": Block device has %" PRIuOFF64 " blocks.\n",
                     dev_nblocks);
+                cfg.total_sectors = dev_nblocks;
+        }
+        if (block_size != 512) {
+                printf(NAME ": Error. Device block size is not 512 bytes.\n");
+                return 2;
+                if (!cfg.total_sectors || dev_nblocks < cfg.total_sectors)
+                        cfg.total_sectors = dev_nblocks;
+        }
 …
+        }
+        printf(NAME ": Creating FAT filesystem on device %s.\n", dev_path);
+        rc = fat_params_compute(&cfg, &par);
+        if (cfg.fat_type != FAT12 && cfg.fat_type != FAT16 && cfg.fat_type != FAT32) {
+                printf(NAME ": Error. Unknown FAT type.\n");
+                return 2;
+        }
+        printf(NAME ": Creating FAT%d filesystem on device %s.\n", cfg.fat_type, dev_path);
+        rc = fat_params_compute(&cfg);
         if (rc != EOK) {
                 printf(NAME ": Invalid file-system parameters.\n");
 …
+        }
         rc = fat_blocks_write(&par, handle);
+        rc = fat_blocks_write(&cfg, service_id);
         if (rc != EOK) {
                 printf(NAME ": Error writing device.\n");
 …
+        }
         block_fini(handle);
+        block_fini(service_id);
         printf("Success.\n");
 …
 static void syntax_print(void)
+{
         printf("syntax: mkfat [--size <num_blocks>] <device_name>\n");
+        printf("syntax: mkfat [--size <sectors>] [--type 12|16|32] <device_name>\n");
+}
 …
  * file system params.
  */
 static int fat_params_compute(struct fat_cfg const *cfg, struct fat_params *par)
+static int fat_params_compute(struct fat_cfg *cfg)
+{
         uint32_t fat_bytes;
 …
         /*
+         * Make a conservative guess on the FAT size needed for the file
+         * system. The optimum could be potentially smaller since we
+         * do not subtract size of the FAT itself when computing the
+         * size of the data region.
+         */
+        par->reserved_sectors = 1 + cfg->addt_res_sectors;
+        par->rootdir_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
+            sector_size);
+        non_data_sectors_lb = par->reserved_sectors + par->rootdir_sectors;
+        par->total_clusters = div_round_up(cfg->total_sectors - non_data_sectors_lb,
+            sectors_per_cluster);
+        fat_bytes = (par->total_clusters + 2) * 2;
+        par->fat_sectors = div_round_up(fat_bytes, sector_size);
+        par->cfg = *cfg;
+         * Make a conservative guess on the FAT size needed for the file
+         * system. The optimum could be potentially smaller since we
+         * do not subtract size of the FAT itself when computing the
+         * size of the data region.
+         */
+        cfg->reserved_sectors = 1 + cfg->addt_res_sectors;
+        if (cfg->fat_type != FAT32) {
+                cfg->rootdir_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
+                        cfg->sector_size);
+        } else
+                cfg->rootdir_sectors = 0;
+        non_data_sectors_lb = cfg->reserved_sectors + cfg->rootdir_sectors;
+        cfg->total_clusters = div_round_up(cfg->total_sectors - non_data_sectors_lb,
+            cfg->sectors_per_cluster);
+        if ((cfg->fat_type == FAT12 && cfg->total_clusters > FAT12_CLST_MAX) ||
+            (cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
+            cfg->total_clusters > FAT16_CLST_MAX)) ||
+            (cfg->fat_type == FAT32 && cfg->total_clusters <= FAT16_CLST_MAX))
+                return ENOSPC;
+        fat_bytes = div_round_up((cfg->total_clusters + 2) *
+            FAT_CLUSTER_DOUBLE_SIZE(cfg->fat_type), 2);
+        cfg->fat_sectors = div_round_up(fat_bytes, cfg->sector_size);
         return EOK;
 …
 /** Create file system with the given parameters. */
 static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
+static int fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id)
+{
         aoff64_t addr;
 …
         struct fat_bs bs;
         fat_bootsec_create(par, &bs);
         rc = block_write_direct(handle, BS_BLOCK, 1, &bs);
+        fat_bootsec_create(cfg, &bs);
+        rc = block_write_direct(service_id, BS_BLOCK, 1, &bs);
         if (rc != EOK)
                 return EIO;
 …
         addr = BS_BLOCK + 1;
         buffer = calloc(sector_size, 1);
+        buffer = calloc(cfg->sector_size, 1);
         if (buffer == NULL)
                 return ENOMEM;
+        memset(buffer, 0, cfg->sector_size);
         /* Reserved sectors */
         for (i = 0; i < par->reserved_sectors - 1; ++i) {
                 rc = block_write_direct(handle, addr, 1, buffer);
+        for (i = 0; i < cfg->reserved_sectors - 1; ++i) {
+                rc = block_write_direct(service_id, addr, 1, buffer);
                 if (rc != EOK)
                         return EIO;
 …
         /* File allocation tables */
         for (i = 0; i < fat_count; ++i) {
+        for (i = 0; i < cfg->fat_count; ++i) {
                 printf("Writing allocation table %d.\n", i + 1);
                 for (j = 0; j < par->fat_sectors; ++j) {
                         memset(buffer, 0, sector_size);
+                for (j = 0; j < cfg->fat_sectors; ++j) {
+                        memset(buffer, 0, cfg->sector_size);
                         if (j == 0) {
                                 buffer[0] = media_descriptor;
+                                buffer[0] = default_media_descriptor;
                                 buffer[1] = 0xFF;
                                 buffer[2] = 0xFF;
+                                buffer[3] = 0xFF;
+                                if (cfg->fat_type == FAT16) {
+                                        buffer[3] = 0xFF;
+                                } else if (cfg->fat_type == FAT32) {
+                                        buffer[3] = 0x0F;
+                                        buffer[4] = 0xFF;
+                                        buffer[5] = 0xFF;
+                                        buffer[6] = 0xFF;
+                                        buffer[7] = 0x0F;
+                                        buffer[8] = 0xF8;
+                                        buffer[9] = 0xFF;
+                                        buffer[10] = 0xFF;
+                                        buffer[11] = 0x0F;
+                                }
+                        }
                         rc = block_write_direct(handle, addr, 1, buffer);
+                        rc = block_write_direct(service_id, addr, 1, buffer);
                         if (rc != EOK)
                                 return EIO;
 …
+        }
+        /* Root directory */
         printf("Writing root directory.\n");
+        memset(buffer, 0, sector_size);
+        /* Root directory */
+        for (i = 0; i < par->rootdir_sectors; ++i) {
+                rc = block_write_direct(handle, addr, 1, buffer);
+                if (rc != EOK)
+                        return EIO;
+                ++addr;
+        memset(buffer, 0, cfg->sector_size);
+        if (cfg->fat_type != FAT32) {
+                size_t idx;
+                for (idx = 0; idx < cfg->rootdir_sectors; ++idx) {
+                        rc = block_write_direct(service_id, addr, 1, buffer);
+                        if (rc != EOK)
+                                return EIO;
+                        ++addr;
+                }
+        } else {
+                for (i = 0; i < cfg->sectors_per_cluster; i++) {
+                        rc = block_write_direct(service_id, addr, 1, buffer);
+                        if (rc != EOK)
+                                return EIO;
+                        ++addr;
+                }
+        }
 …
 /** Construct boot sector with the given parameters. */
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs)
+static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs)
+{
         memset(bs, 0, sizeof(*bs));
 …
         /* BIOS Parameter Block */
+        bs->bps = host2uint16_t_le(sector_size);
+        bs->spc = sectors_per_cluster;
+        bs->rscnt = host2uint16_t_le(par->reserved_sectors);
+        bs->fatcnt = fat_count;
+        bs->root_ent_max = host2uint16_t_le(par->cfg.root_ent_max);
+        if (par->cfg.total_sectors < 0x10000)
+                bs->totsec16 = host2uint16_t_le(par->cfg.total_sectors);
+        else
+                bs->totsec16 = host2uint16_t_le(0);
+        bs->mdesc = media_descriptor;
+        bs->sec_per_fat = host2uint16_t_le(par->fat_sectors);
+        bs->bps = host2uint16_t_le(cfg->sector_size);
+        bs->spc = cfg->sectors_per_cluster;
+        bs->rscnt = host2uint16_t_le(cfg->reserved_sectors);
+        bs->fatcnt = cfg->fat_count;
+        bs->root_ent_max = host2uint16_t_le(cfg->root_ent_max);
+        if (cfg->total_sectors < 0x10000) {
+                bs->totsec16 = host2uint16_t_le(cfg->total_sectors);
+                bs->totsec32 = 0;
+        } else {
+                bs->totsec16 = 0;
+                bs->totsec32 = host2uint32_t_le(cfg->total_sectors);
+        }
+        bs->mdesc = default_media_descriptor;
         bs->sec_per_track = host2uint16_t_le(63);
+        bs->signature = host2uint16_t_be(0x55AA);
         bs->headcnt = host2uint16_t_le(6);
         bs->hidden_sec = host2uint32_t_le(0);
+        if (par->cfg.total_sectors >= 0x10000)
+                bs->totsec32 = host2uint32_t_le(par->cfg.total_sectors);
+        else
+                bs->totsec32 = host2uint32_t_le(0);
+        /* Extended BPB */
+        bs->pdn = 0x80;
+        bs->ebs = 0x29;
+        bs->id = host2uint32_t_be(0x12345678);
+        memcpy(bs->label, "HELENOS_NEW", 11);
+        memcpy(bs->type, "FAT16   ", 8);
+        bs->signature = host2uint16_t_be(0x55AA);
+        if (cfg->fat_type == FAT32) {
+                bs->sec_per_fat = 0;
+                bs->fat32.sectors_per_fat = host2uint32_t_le(cfg->fat_sectors);
+                bs->fat32.pdn = 0x80;
+                bs->fat32.ebs = 0x29;
+                bs->fat32.id = host2uint32_t_be(0x12345678);
+                bs->fat32.root_cluster = 2;
+                memcpy(bs->fat32.label, "HELENOS_NEW", 11);
+                memcpy(bs->fat32.type, "FAT32   ", 8);
+        } else {
+                bs->sec_per_fat = host2uint16_t_le(cfg->fat_sectors);
+                bs->pdn = 0x80;
+                bs->ebs = 0x29;
+                bs->id = host2uint32_t_be(0x12345678);
+                memcpy(bs->label, "HELENOS_NEW", 11);
+                memcpy(bs->type, "FAT   ", 8);
+        }
+}

uspace/app/ping/ping.c

-              rd2c67e7
+              r8ff0bd2
 #include <async.h>
-#include <async_obsolete.h>
 #include <stdio.h>
 #include <str.h>
 …
             config.dest_str, config.size, config.size);
         int icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
         if (icmp_phone < 0) {
+        async_sess_t *sess = icmp_connect_module();
+        if (!sess) {
                 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME,
                     str_error(icmp_phone));
                 return icmp_phone;
+                    str_error(errno));
+                return errno;
+        }
 …
                             str_error(ret));
                         async_obsolete_hangup(icmp_phone);
+                        async_hangup(sess);
                         return ret;
+                }
                 /* Ping! */
                 int result = icmp_echo_msg(icmp_phone, config.size, config.timeout,
+                int result = icmp_echo_msg(sess, config.size, config.timeout,
                     config.ttl, config.tos, !config.fragments, config.dest_raw,
                     config.dest_len);
 …
                             str_error(ret));
                         async_obsolete_hangup(icmp_phone);
+                        async_hangup(sess);
                         return ret;
+                }
 …
+        }
         async_obsolete_hangup(icmp_phone);
+        async_hangup(sess);
         return 0;

uspace/app/sbi/src/compat.h

-              rd2c67e7
+              r8ff0bd2
 #ifdef __HELENOS__
+#define list sbi_list
+#define list_t sbi_list_t
 /*
  * Avoid name conflicts with ADT library.
 …
 #define list_prepend sbi_list_prepend
 #define list_remove sbi_list_remove
+#define list_first sbi_list_first
+#define list_last sbi_list_last
 #endif

uspace/app/sbi/src/input.c

-              rd2c67e7
+              r8ff0bd2
 int input_get_line(input_t *input, char **line)
+{
+        const char *prompt;
         const char *sp;
         char *dp;
 …
                 /* Interactive mode */
                 if (input->line_no == 0)
                         printf("sbi> ");
+                        prompt = "sbi> ";
                 else
                         printf("...  ");
+                        prompt = "...  ";
                 fflush(stdout);
                 if (os_input_line(&line_p) != EOK)
+                if (os_input_line(prompt, &line_p) != EOK)
                         return EIO;

uspace/app/sbi/src/list_t.h

rd2c67e7	r8ff0bd2
30	30	#define LIST_T_H_
31	31
	32	#include "compat.h"
	33
32	34	typedef struct list_node {
33	35	struct list_node prev, next;

uspace/app/sbi/src/os/helenos.c

-              rd2c67e7
+              r8ff0bd2
  * @param ptr   Place to store pointer to new string.
  */
 int os_input_line(char **ptr)
+int os_input_line(const char *prompt, char **ptr)
+{
         char *line;
 …
                 if (tinput == NULL)
                         return EIO;
+                tinput_set_prompt(tinput, prompt);
+        }

uspace/app/sbi/src/os/os.h

rd2c67e7	r8ff0bd2
38	38	char *os_chr_to_astr(wchar_t chr);
39	39	void os_input_disp_help(void);
40		int os_input_line(char **ptr);
	40	int os_input_line(const char prompt, char *ptr);
41	41	int os_exec(char * const cmd[]);
42	42

uspace/app/sbi/src/os/posix.c

-              rd2c67e7
+              r8ff0bd2
  * @param ptr   Place to store pointer to new string.
  */
+int os_input_line(char **ptr)
+{
+int os_input_line(const char *prompt, char **ptr)
+{
+        printf("%s", prompt);
         if (fgets(os_input_buffer, OS_INPUT_BUFFER_SIZE, stdin) == NULL)
                 os_input_buffer[0] = '\0';

uspace/app/sysinfo/sysinfo.c

-              rd2c67e7
+              r8ff0bd2
         int rc;
         char *ipath;
         sysinfo_item_tag_t tag;
+        sysinfo_item_val_type_t tag;
         if (argc != 2) {
 …
         ipath = argv[1];
         tag = sysinfo_get_tag(ipath);
+        tag = sysinfo_get_val_type(ipath);
         /* Silence warning */
 …
         case SYSINFO_VAL_DATA:
                 rc = print_item_data(ipath);
+                break;
+        default:
+                printf("Error: Sysinfo item '%s' with unknown value type.\n",
+                    ipath);
+                rc = 2;
                 break;
+        }

uspace/app/taskdump/elf_core.c

-              rd2c67e7
+              r8ff0bd2
 /*
  * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
+ *
 …
  * Looking at core files produced by Linux, these don't have section headers,
  * only program headers, although objdump shows them as having sections.
+ * Basically at the beginning there should be a note segment (which we
+ * do not write) and one loadable segment per memory area (which we do write).
+ *
+ * The note segment probably contains register state, etc. -- we don't
+ * deal with these yet. Nevertheless you can use these core files with
+ * objdump or gdb.
+ */
+ * Basically at the beginning there should be a note segment followed
+ * by one loadable segment per memory area.
+ *
+ * The note segment contains a series of records with register state,
+ * process info etc. We only write one record NT_PRSTATUS which contains
+ * process/register state (anything which is not register state we fill
+ * with zeroes).
+ */
+#include <align.h>
+#include <elf/elf.h>
+#include <elf/elf_linux.h>
 #include <stdio.h>
 #include <stdlib.h>
 …
 #include <udebug.h>
 #include <macros.h>
+#include <elf.h>
 #include "include/elf_core.h"
+#include <libarch/istate.h>
+#include "elf_core.h"
 static off64_t align_foff_up(off64_t, uintptr_t, size_t);
 static int write_all(int, void *, size_t);
+static int align_pos(int, size_t);
 static int write_mem_area(int, as_area_info_t *, async_sess_t *);
 …
  */
 int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n,
     async_sess_t *sess)
+    async_sess_t *sess, istate_t *istate)
+{
         elf_header_t elf_hdr;
 …
         elf_word flags;
         elf_segment_header_t *p_hdr;
+        elf_prstatus_t pr_status;
+        elf_note_t note;
+        size_t word_size;
         int fd;
         int rc;
+        ssize_t rc;
         unsigned int i;
+        n_ph = n;
+        p_hdr = malloc(sizeof(elf_segment_header_t) * n);
+#ifdef __32_BITS__
+        word_size = 4;
+#endif
+#ifdef __64_BITS__
+        /*
+         * This should be 8 per the 64-bit ELF spec, but the Linux kernel
+         * screws up and uses 4 anyway (and screws up elf_note_t as well)
+         * and we are trying to be compatible with Linux GDB target. Sigh.
+         */
+        word_size = 4;
+#endif
+        memset(&pr_status, 0, sizeof(pr_status));
+        istate_to_elf_regs(istate, &pr_status.regs);
+        n_ph = n + 1;
+        p_hdr = malloc(sizeof(elf_segment_header_t) * n_ph);
         if (p_hdr == NULL) {
                 printf("Failed allocating memory.\n");
 …
          *      ELF header
          *      program headers
+         *      note segment
          * repeat:
          *      (pad for alignment)
          *      segment data
+         *      core segment
          * end repeat
          */
 …
         foff = elf_hdr.e_phoff + n_ph * sizeof(elf_segment_header_t);
+        for (i = 1; i <= n; ++i) {
+                foff = align_foff_up(foff, ainfo[i - 1].start_addr, PAGE_SIZE);
+        memset(&p_hdr[0], 0, sizeof(p_hdr[0]));
+        p_hdr[0].p_type = PT_NOTE;
+        p_hdr[0].p_offset = foff;
+        p_hdr[0].p_vaddr = 0;
+        p_hdr[0].p_paddr = 0;
+        p_hdr[0].p_filesz = sizeof(elf_note_t)
+            + ALIGN_UP((str_size("CORE") + 1), word_size)
+            + ALIGN_UP(sizeof(elf_prstatus_t), word_size);
+        p_hdr[0].p_memsz = 0;
+        p_hdr[0].p_flags = 0;
+        p_hdr[0].p_align = 1;
+        foff += p_hdr[0].p_filesz;
+        for (i = 0; i < n; ++i) {
+                foff = align_foff_up(foff, ainfo[i].start_addr, PAGE_SIZE);
                 flags = 0;
                 if (ainfo[i - 1].flags & AS_AREA_READ)
+                if (ainfo[i].flags & AS_AREA_READ)
                         flags |= PF_R;
                 if (ainfo[i - 1].flags & AS_AREA_WRITE)
+                if (ainfo[i].flags & AS_AREA_WRITE)
                         flags |= PF_W;
                 if (ainfo[i - 1].flags & AS_AREA_EXEC)
+                if (ainfo[i].flags & AS_AREA_EXEC)
                         flags |= PF_X;
                 memset(&p_hdr[i - 1], 0, sizeof(p_hdr[i - 1]));
                 p_hdr[i - 1].p_type = PT_LOAD;
                 p_hdr[i - 1].p_offset = foff;
                 p_hdr[i - 1].p_vaddr = ainfo[i - 1].start_addr;
                 p_hdr[i - 1].p_paddr = 0;
                 p_hdr[i - 1].p_filesz = ainfo[i - 1].size;
                 p_hdr[i - 1].p_memsz = ainfo[i - 1].size;
                 p_hdr[i - 1].p_flags = flags;
                 p_hdr[i - 1].p_align = PAGE_SIZE;
                 foff += ainfo[i - 1].size;
+                memset(&p_hdr[i + 1], 0, sizeof(p_hdr[i + 1]));
+                p_hdr[i + 1].p_type = PT_LOAD;
+                p_hdr[i + 1].p_offset = foff;
+                p_hdr[i + 1].p_vaddr = ainfo[i].start_addr;
+                p_hdr[i + 1].p_paddr = 0;
+                p_hdr[i + 1].p_filesz = ainfo[i].size;
+                p_hdr[i + 1].p_memsz = ainfo[i].size;
+                p_hdr[i + 1].p_flags = flags;
+                p_hdr[i + 1].p_align = PAGE_SIZE;
+                foff += ainfo[i].size;
+        }
         rc = write_all(fd, &elf_hdr, sizeof(elf_hdr));
         if (rc != EOK) {
+        if (rc != sizeof(elf_hdr)) {
                 printf("Failed writing ELF header.\n");
                 free(p_hdr);
 …
         for (i = 0; i < n_ph; ++i) {
                 rc = write_all(fd, &p_hdr[i], sizeof(p_hdr[i]));
                 if (rc != EOK) {
+                if (rc != sizeof(p_hdr[i])) {
                         printf("Failed writing program header.\n");
                         free(p_hdr);
 …
+        }
+        for (i = 0; i < n_ph; ++i) {
+        if (lseek(fd, p_hdr[0].p_offset, SEEK_SET) == (off64_t) -1) {
+                printf("Failed writing memory data.\n");
+                free(p_hdr);
+                return EIO;
+        }
+        /*
+         * Write note header
+         */
+        note.namesz = str_size("CORE") + 1;
+        note.descsz = sizeof(elf_prstatus_t);
+        note.type = NT_PRSTATUS;
+        rc = write_all(fd, &note, sizeof(elf_note_t));
+        if (rc != sizeof(elf_note_t)) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+        rc = write_all(fd, "CORE", note.namesz);
+        if (rc != (ssize_t) note.namesz) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+        rc = align_pos(fd, word_size);
+        if (rc != EOK) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+        rc = write_all(fd, &pr_status, sizeof(elf_prstatus_t));
+        if (rc != sizeof(elf_prstatus_t)) {
+                printf("Failed writing register data.\n");
+                free(p_hdr);
+                return EIO;
+        }
+        for (i = 1; i < n_ph; ++i) {
                 if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off64_t) -1) {
                         printf("Failed writing memory data.\n");
 …
                         return EIO;
+                }
                 if (write_mem_area(fd, &ainfo[i], sess) != EOK) {
+                if (write_mem_area(fd, &ainfo[i - 1], sess) != EOK) {
                         printf("Failed writing memory data.\n");
                         free(p_hdr);
 …
         off64_t rva = vaddr % page_size;
         off64_t rfo = foff % page_size;
         if (rva >= rfo)
                 return (foff + (rva - rfo));
         return (foff + (page_size + (rva - rfo)));
+}
 …
         size_t total;
         uintptr_t addr;
         int rc;
+        ssize_t rc;
         addr = area->start_addr;
 …
                 rc = write_all(fd, buffer, to_copy);
                 if (rc != EOK) {
+                if (rc != (ssize_t) to_copy) {
                         printf("Failed writing memory contents.\n");
                         return EIO;
 …
+}
+/** Write until the buffer is written in its entirety.
+ *
+ * This function fails if it cannot write exactly @a len bytes to the file.
+ *
+ * @param fd            The file to write to.
+ * @param buf           Data, @a len bytes long.
+ * @param len           Number of bytes to write.
+ *
+ * @return              EOK on error, return value from write() if writing
+ *                      failed.
+ */
+static int write_all(int fd, void *data, size_t len)
+static int align_pos(int fd, size_t align)
+{
         int cnt = 0;
+        do {
                 data += cnt;
                 len -= cnt;
                 cnt = write(fd, data, len);
+        } while (cnt > 0 && (len - cnt) > 0);
         if (cnt < 0)
+                return cnt;
         if (len - cnt > 0)
                 return EIO;
+        off64_t cur_pos;
+        size_t rem, adv;
+        cur_pos = lseek(fd, 0, SEEK_CUR);
+        if (cur_pos < 0)
+                return -1;
+        rem = cur_pos % align;
+        adv = align - rem;
+        cur_pos = lseek(fd, adv, SEEK_CUR);
+        if (cur_pos < 0)
+                return -1;
         return EOK;
+}
 /** @}
  */

uspace/app/taskdump/include/elf_core.h

-              rd2c67e7
+              r8ff0bd2
 #include <async.h>
+#include <elf/elf_linux.h>
+#include <libarch/istate.h>
 extern int elf_core_save(const char *, as_area_info_t *, unsigned int,
     async_sess_t *);
+    async_sess_t *, istate_t *);
 #endif

uspace/app/taskdump/include/symtab.h

-              rd2c67e7
+              r8ff0bd2
 #define SYMTAB_H_
+#include <elf/elf.h>
 #include <sys/types.h>
-#include <elf.h>
 typedef struct {

uspace/app/taskdump/symtab.c

-              rd2c67e7
+              r8ff0bd2
  */
+#include <elf/elf.h>
 #include <stdio.h>
 #include <stdlib.h>
 …
 #include <fcntl.h>
-#include <elf.h>
 #include "include/symtab.h"
 …
     elf_section_header_t *shdr);
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr);
-static int read_all(int fd, void *buf, size_t len);
 /** Load symbol table from an ELF file.
 …
         rc = read_all(fd, &elf_hdr, sizeof(elf_header_t));
         if (rc != EOK) {
+        if (rc != sizeof(elf_header_t)) {
                 printf("failed reading elf header\n");
                 free(stab);
 …
         rc = read_all(fd, sec_hdr, sizeof(elf_section_header_t));
         if (rc != EOK)
+        if (rc != sizeof(elf_section_header_t))
                 return EIO;
 …
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
+{
+        int rc;
+        rc = lseek(fd, start, SEEK_SET);
+        if (rc == (off64_t) -1) {
+        ssize_t rc;
+        off64_t offs;
+        offs = lseek(fd, start, SEEK_SET);
+        if (offs == (off64_t) -1) {
                 printf("failed seeking chunk\n");
                 *ptr = NULL;
 …
         rc = read_all(fd, *ptr, size);
         if (rc != EOK) {
+        if (rc != (ssize_t) size) {
                 printf("failed reading chunk\n");
                 free(*ptr);
 …
+}
-/** Read until the buffer is read in its entirety.
+ *
- * This function fails if it cannot read exactly @a len bytes from the file.
+ *
- * @param fd            The file to read from.
- * @param buf           Buffer for storing data, @a len bytes long.
- * @param len           Number of bytes to read.
+ *
- * @return              EOK on error, EIO if file is short or return value
- *                      from read() if reading failed.
- */
-static int read_all(int fd, void *buf, size_t len)
+{
-        int cnt = 0;
-        do {
-                buf += cnt;
-                len -= cnt;
-                cnt = read(fd, buf, len);
-        } while (cnt > 0 && (len - cnt) > 0);
-        if (cnt < 0)
-                return cnt;
-        if (len - cnt > 0)
-                return EIO;
-        return EOK;
+}
 /** @}
  */

uspace/app/taskdump/taskdump.c

-              rd2c67e7
+              r8ff0bd2
 #include <async.h>
+#include <elf/elf_linux.h>
 #include <stdio.h>
 #include <stdlib.h>
 …
 static char *get_app_task_name(void);
 static char *fmt_sym_address(uintptr_t addr);
+static istate_t reg_state;
 int main(int argc, char *argv[])
 …
         if (write_core_file) {
                 printf("Writing core file '%s'\n", core_file_name);
+                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, sess);
+                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, sess,
+                    &reg_state);
                 if (rc != EOK) {
                         printf("Failed writing core file.\n");
 …
         pc = istate_get_pc(&istate);
         fp = istate_get_fp(&istate);
+        /* Save register state for dumping to core file later. */
+        reg_state = istate;
         sym_pc = fmt_sym_address(pc);

uspace/app/tester/Makefile

-              rd2c67e7
+              r8ff0bd2
 USPACE_PREFIX = ../..
 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a
+LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
 BINARY = tester
 …
         mm/malloc3.c \
         mm/mapping1.c \
-        devs/devman1.c \
-        devs/devman2.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c \

uspace/app/tester/hw/misc/virtchar1.c

-              rd2c67e7
+              r8ff0bd2
 #include "../../tester.h"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
+#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
+#define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a"
 #define BUFFER_SIZE 64
 …
+        }
-        res = test_virtchar1_internal(DEVICE_PATH_CLASSES);
-        if (res != NULL) {
-                return res;
+        }
         return NULL;
+}

uspace/app/tester/hw/serial/serial1.c

rd2c67e7	r8ff0bd2
72	72
73	73	devman_handle_t handle;
74		int res = devman_~~device~~_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
	74	int res = devman_fun_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
75	75	IPC_FLAG_BLOCKING);
76	76	if (res != EOK)

uspace/app/tester/mm/common.c

-              rd2c67e7
+              r8ff0bd2
         link_t *link;
         while ((link = list_head(&mem_blocks)) != NULL) {
+        while ((link = list_first(&mem_blocks)) != NULL) {
                 mem_block_t *block = list_get_instance(link, mem_block_t, link);
                 free_block(block);
+        }
         while ((link = list_head(&mem_areas)) != NULL) {
+        while ((link = list_first(&mem_areas)) != NULL) {
                 mem_area_t *area = list_get_instance(link, mem_area_t, link);
                 unmap_area(area);

uspace/app/tester/print/print2.c

-              rd2c67e7
+              r8ff0bd2
         TPRINTF("Real output:     [%d] [%3.2d] [%-3.2d] [%2.3d] [%-2.3d]\n\n", -1, -2, -3, -4, -5);
+        TPRINTF("Testing printf(\"%%lld %%3.2lld %%-3.2lld %%2.3lld %%-2.3lld\", (long long) -1, (long long) -2, (long long) -3, (long long) -4, (long long) -5):\n");
+        TPRINTF("Expected output: [-1] [-02] [-03] [-004] [-005]\n");
+        TPRINTF("Real output:     [%lld] [%3.2lld] [%-3.2lld] [%2.3lld] [%-2.3lld]\n\n", (long long) -1, (long long) -2, (long long) -3, (long long) -4, (long long) -5);
         TPRINTF("Testing printf(\"%%#x %%5.3#x %%-5.3#x %%3.5#x %%-3.5#x\", 17, 18, 19, 20, 21):\n");
         TPRINTF("Expected output: [0x11] [0x012] [0x013] [0x00014] [0x00015]\n");

uspace/app/tester/stdio/stdio1.c

rd2c67e7	r8ff0bd2
39	39	{
40	40	FILE *file;
41		const char *file_name = "/~~readme~~";
	41	const char *file_name = "/textdemo";
42	42
43	43	TPRINTF("Open file \"%s\"...", file_name);

uspace/app/tester/tester.c

rd2c67e7	r8ff0bd2
68	68	#include "hw/misc/virtchar1.def"
69	69	#include "libext2/libext2_1.def"
70		~~#include "devs/devman1.def"~~
71		~~#include "devs/devman2.def"~~
72	70	{NULL, NULL, NULL, false}
73	71	};

uspace/app/tester/vfs/vfs1.c

rd2c67e7	r8ff0bd2
35	35	#include <fcntl.h>
36	36	#include <dirent.h>
37		#include <~~devmap~~.h>
	37	#include <loc.h>
38	38	#include <sys/types.h>
39	39	#include <sys/stat.h>

uspace/app/testread/testread.c

rd2c67e7	r8ff0bd2
50	50	#include <stdlib.h>
51	51	#include <mem.h>
52		#include <~~devmap~~.h>
	52	#include <loc.h>
53	53	#include <byteorder.h>
54	54	#include <sys/types.h>

uspace/app/top/top.c

rd2c67e7	r8ff0bd2
42	42	#include <thread.h>
43	43	#include <sys/time.h>
44		~~#include <arch/barrier.h>~~
45	44	#include <errno.h>
46	45	#include <sort.h>

uspace/app/trace/ipc_desc.c

-              rd2c67e7
+              r8ff0bd2
  */
+#include <kernel/ipc/ipc.h>
+#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 #include <stdlib.h>
 #include "ipc_desc.h"

uspace/app/trace/ipcp.c

rd2c67e7	r8ff0bd2
37	37	#include <adt/hash_table.h>
38	38	#include <sys/typefmt.h>
39		#include <~~kernel/ipc/ipc_~~methods.h>
	39	#include <abi/ipc/methods.h>
40	40	#include "ipc_desc.h"
41	41	#include "proto.h"

uspace/app/trace/syscalls.c

-              rd2c67e7
+              r8ff0bd2
  */
 #include <kernel/syscall/syscall.h>
+#include <abi/syscall.h>
 #include "syscalls.h"
 #include "trace.h"
 …
     [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
     [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },
+    [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",              2,      V_INTEGER },
     [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value",            3,      V_ERRNO },
     [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size",    3,      V_ERRNO },
     [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              5,      V_ERRNO },
     [SYS_DEBUG_ENABLE_CONSOLE] = { "debug_enable_console", 0,   V_ERRNO },
+    [SYS_DEBUG_ACTIVATE_CONSOLE] = { "debug_activate_console", 0,       V_ERRNO },
     [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox",      1,      V_ERRNO }
 };

uspace/app/trace/trace.c

-              rd2c67e7
+              r8ff0bd2
 #include <sys/types.h>
 #include <sys/typefmt.h>
+#include <vfs/vfs.h>
 #include <libc.h>
 …
         /* Send default files */
         fdi_node_t *files[4];
         fdi_node_t stdin_node;
         fdi_node_t stdout_node;
         fdi_node_t stderr_node;
         if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
                 files[0] = &stdin_node;
+        int *files[4];
+        int fd_stdin;
+        int fd_stdout;
+        int fd_stderr;
+        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
+                files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
                 files[1] = &stdout_node;
+        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
+                files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
                 files[2] = &stderr_node;
+        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
+                files[2] = &fd_stderr;
         else
                 files[2] = NULL;
 …
         o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_OPEN, o);
-        o = oper_new("open_node", 4, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN_NODE, o);
         o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);
 …
         proto_register(SERVICE_VFS, p);
+#if 0
         p = proto_new("console");
 …
         proto_console = p;
         proto_register(SERVICE_CONSOLE, p);
+#endif
+}

uspace/app/usbinfo/Makefile

-              rd2c67e7
+              r8ff0bd2
 LIBS = \
+        $(LIBUSBHID_PREFIX)/libusbhid.a \
         $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSB_PREFIX)/libusb.a \
 …
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBUSBHID_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include
 …
         dev.c \
         dump.c \
+        hid.c \
         info.c \
         main.c

uspace/app/usbinfo/dump.c

-              rd2c67e7
+              r8ff0bd2
 void dump_match_ids(match_id_list_t *matches, const char *line_prefix)
+{
+        link_t *link;
+        for (link = matches->ids.next;
+            link != &matches->ids;
+            link = link->next) {
+        list_foreach(matches->ids, link) {
                 match_id_t *match = list_get_instance(link, match_id_t, link);

uspace/app/usbinfo/main.c

-              rd2c67e7
+              r8ff0bd2
 #include <getopt.h>
 #include <devman.h>
 #include <devmap.h>
+#include <loc.h>
 #include <usb/hc.h>
 #include <usb/dev/pipes.h>
 …
         printf("Usage: %s [options] device [device [device [ ... ]]]\n",
             app_name);
+        printf(_INDENT "The device is a devman path to the device.\n");
+        printf(_INDENT "The device can be specified in two ways.\n");
+        printf(_INDENT "  o Using its devman path, e.g. /hw/pci0/.../usb00_a1.\n");
+        printf(_INDENT "  o Or using BUS.ADDR numbers as printed by lsusb.\n");
         _OPTION("-h --help", "Print this help and exit.");
 …
         _OPTION("-s --strings", "Try to print all string descriptors.");
         _OPTION("-S --status", "Get status of the device.");
+        _OPTION("-r --hid-report", "Dump HID report descriptor.");
+        _OPTION("-r --hid-report-usages", "Dump usages of HID report.");
         printf("\n");
 …
         {"strings", no_argument, NULL, 's'},
         {"status", no_argument, NULL, 'S'},
+        {"hid-report", no_argument, NULL, 'r'},
+        {"hid-report-usages", no_argument, NULL, 'R'},
         {0, 0, NULL, 0}
 };
 static const char *short_options = "himtTsS";
+static const char *short_options = "himtTsSrR";
 static usbinfo_action_t actions[] = {
 …
                 .opt = 'S',
                 .action = dump_status,
+                .active = false
+        },
+        {
+                .opt = 'r',
+                .action = dump_hidreport_raw,
+                .active = false
+        },
+        {
+                .opt = 'R',
+                .action = dump_hidreport_usages,
                 .active = false
         },

uspace/app/usbinfo/usbinfo.h

rd2c67e7	r8ff0bd2
85	85	void dump_strings(usbinfo_device_t *);
86	86	void dump_status(usbinfo_device_t *);
	87	void dump_hidreport_raw(usbinfo_device_t *);
	88	void dump_hidreport_usages(usbinfo_device_t *);
87	89
88	90

uspace/app/vuhid/Makefile

-              rd2c67e7
+              r8ff0bd2
         $(LIBUSBHID_PREFIX)/libusbhid.a \
         $(LIBUSBDEV_PREFIX)/libusbdev.a \
+        $(LIBUSB_PREFIX)/libusb.a
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a
 EXTRA_CFLAGS = \
         -I$(LIBUSB_PREFIX)/include \

Context Navigation

Changeset 8ff0bd2 in mainline for uspace/app

Legend:

Download in other formats: