Changeset d752cf4 in mainline for uspace/app/bdsh/input.c

Timestamp:

2009-01-22T07:13:13Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

491af07

Parents:

48c3d50

Message:

Eliminate 'restrict' from command structure, get rid of needless aliases.
Order of search is builtin → module → external, there is no need to
restrict commands to (non)interative shells only any longer.

File:

• uspace/app/bdsh/input.c (modified) (2 diffs)

uspace/app/bdsh/input.c

@@ -73 +73 @@
         tmp = cli_strdup(usr->line);
 
-        /* Break up what the user typed, space delimited */
-
-        /* TODO: Protect things in quotes / ticks, expand wildcards */
         cmd[n] = cli_strtok(tmp, " ");
         while (cmd[n] && n < WORD_MAX) {
@@ -87 +84 @@
         }
 
-        /* Its a builtin command */
+        /* Its a builtin command ? */
         if ((i = (is_builtin(cmd[0]))) > -1) {
-                /* Its not available in this mode, see what try_exec() thinks */
-                if (builtin_is_restricted(i)) {
-                                rc = try_exec(cmd[0], cmd);
-                                if (rc)
-                                        /* No external matching it could be found, tell the
-                                         * user that the command does exist, but is not
-                                         * available in this mode. */
-                                        cli_restricted(cmd[0]);
-                                goto finit;
-                }
-                /* Its a builtin, its available, run it */
                 rc = run_builtin(i, cmd, usr);
                 goto finit;
-        /* We repeat the same dance for modules */
+        /* Its a module ? */
         } else if ((i = (is_module(cmd[0]))) > -1) {
-                if (module_is_restricted(i)) {
-                        rc = try_exec(cmd[0], cmd);
-                        if (rc)
-                                cli_restricted(cmd[0]);
-                        goto finit;
-                }
                 rc = run_module(i, cmd);
                 goto finit;
-        } else {
-                /* Its not a module or builtin, restricted or otherwise.
-                 * See what try_exec() thinks of it and just pass its return
-                 * value back to the caller */
-                rc = try_exec(cmd[0], cmd);
-                goto finit;
         }
+
+        /* See what try_exec thinks of it */
+        rc = try_exec(cmd[0], cmd);
 
 finit: