Changeset bd5f3b7 in mainline for uspace/app/bdsh/cmds

Timestamp:

2011-08-21T13:07:35Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

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

Message:

Merge mainline changes.

Location:

uspace/app/bdsh/cmds/modules

Files:

• bdd/bdd.c (modified) (8 diffs)
• cp/cp.c (modified) (2 diffs)
• help/help.c (modified) (3 diffs)
• ls/ls.c (modified) (1 diff)

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

@@ -39 +39 @@
 
 #include <libblock.h>
-#include <devmap.h>
+#include <loc.h>
 #include <errno.h>
 #include <assert.h>
@@ -69 +69 @@
         unsigned int argc;
         unsigned int i, j;
-        devmap_handle_t handle;
+        service_id_t service_id;
         aoff64_t offset;
         uint8_t *blk;
@@ -96 +96 @@
                 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]);
@@ -102 +102 @@
         }
 
-        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);
@@ -108 +108 @@
         }
 
-        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);
@@ -117 +117 @@
         if (blk == NULL) {
                 printf("%s: Error allocating memory.\n", cmdname);
-                block_fini(handle);
+                block_fini(service_id);
                 return CMD_FAILURE;
         }
@@ -124 +124 @@
 
         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;
                 }
@@ -170 +170 @@
 
         free(blk);
-        block_fini(handle);
+        block_fini(service_id);
 
         return CMD_SUCCESS;

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

@@ -71 +71 @@
         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;
@@ -104 +104 @@
         }
 
-        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

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -30 +31 @@
 #include <stdlib.h>
 #include <str.h>
+#include <fmtutil.h>
 
 #include "config.h"
@@ -128 +130 @@
 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/trac.fcgi/wiki/UsersGuide\n\n",
+            ALIGN_LEFT);
 }
 

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

@@ -169 +169 @@
                 
                 /* 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';