Changeset 925a21e in mainline for uspace/app/bdsh/cmds

Timestamp:

2011-09-24T14:20:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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

Files:

• builtins/batch/batch.c (added)
• builtins/batch/batch.h (added)
• builtins/batch/batch_def.h (added)
• builtins/batch/entry.h (added)
• builtins/builtins.h (modified) (1 diff)
• modules/bdd/bdd.c (modified) (8 diffs)
• modules/cat/cat.c (modified) (1 diff)
• modules/help/help.c (modified) (3 diffs)
• modules/mount/mount.c (modified) (3 diffs)
• modules/rm/rm.c (modified) (2 diffs)

uspace/app/bdsh/cmds/builtins/builtins.h

@@ -4 +4 @@
 #include "config.h"
 
+#include "batch/entry.h"
 #include "cd/entry.h"
 #include "exit/entry.h"
 
 builtin_t builtins[] = {
+#include "batch/batch_def.h"
 #include "cd/cd_def.h"
 #include "exit/exit_def.h"

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/cat/cat.c

@@ -103 +103 @@
 {
         console_set_pos(console, 0, console_rows-1);
-        console_set_color(console, COLOR_BLUE, COLOR_WHITE, 0);
+        console_set_color(console, COLOR_WHITE, COLOR_BLUE, 0);
         
         printf("ENTER/SPACE/PAGE DOWN - next page, "

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/wiki/UsersGuide\n\n",
+            ALIGN_LEFT);
 }
 

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

@@ -43 +43 @@
 static struct option const long_options[] = {
         { "help", no_argument, 0, 'h' },
+        { "instance", required_argument, 0, 'i' },
         { 0, 0, 0, 0 }
 };
@@ -68 +69 @@
         const char *dev = "";
         int rc, c, opt_ind;
+        unsigned int instance = 0;
+        bool instance_set = false;
+        char **t_argv;
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "h", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
                         help_cmd_mount(HELP_LONG);
                         return CMD_SUCCESS;
+                case 'i':
+                        instance = (unsigned int) strtol(optarg, NULL, 10);
+                        instance_set = true;
+                        break;
                 }
         }
+
+        if (instance_set) {
+                argc -= 2;
+                t_argv = &argv[2];
+        } else
+                t_argv = &argv[0];
 
         if ((argc < 3) || (argc > 5)) {
@@ -86 +100 @@
         }
         if (argc > 3)
-                dev = argv[3];
+                dev = t_argv[3];
         if (argc == 5)
-                mopts = argv[4];
+                mopts = t_argv[4];
 
-        rc = mount(argv[1], argv[2], dev, mopts, 0);
+        rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
-                    argv[1], argv[2], argv[3], rc);
+                    t_argv[1], t_argv[2], t_argv[3], rc);
                 return CMD_FAILURE;
         }

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

@@ -95 +95 @@
         if (NULL != rm->cwd)
                 free(rm->cwd);
-
-        return;
 }
 
@@ -129 +127 @@
                 }
         }
+
+        closedir(dirp);
         
         return ret;