WebSVN – HelenOS – Path Comparison – / – /branches/dynload/uspace/app/bdsh/cmds Rev 3674 and /branches/dynload/uspace/app/bdsh/cmds Rev 4341

Ignore whitespace Rev 3674 → Rev 4341

 /branches/dynload/uspace/app/bdsh/cmds/mknewcmd
 ,8 → 46,6
   -e, --entry        Entry function of the command (def: cmd_${def})
   -h, --help-entry   Entry function for command help (def: help_cmd_${def})
   -a, --alias        Alias (nickname) for this command (def: none)
-  -r, --restrict     Restriction level (interactive, non-interactive, both)
-                     (def: module is both, builtin is interactive only)
   -t, --type         Type of command (module or builtin) (def: module)
   -H, --help         This help summary
   -V, --version      Print $PROGNAME version and exit normally
 ,8 → 65,7
     $PROGNAME -n foo -d "Foo power" -a bar -r both -t module modules/foo
   The example would generate a modular command named 'foo', which is also
-  reached by typing 'bar' and available in either interactive or noninteractive
-  mode.
+  reached by typing 'bar'.
   Skeletal files do *not* depend on the autoconf generated "config.h" unless you
   include it. This may or may not be desirable depending on your use.
 ,7 → 94,6
     "${CMDDESC}",
     &${CMDENTRY},
     &${HELPENTRY},
-    ${CMDRESTRICT}
 },
 EOF
 ,7 → 103,6
     NULL,
     &${CMDENTRY},
     &${HELPENTRY},
-    ${CMDRESTRICT}
 },
 EOF
 ,7 → 162,7
 #include "${CMDNAME}.h"
 #include "cmds.h"
-static char *cmdname = "${CMDNAME}";
+static const char *cmdname = "${CMDNAME}";
 /* Dispays help for ${CMDNAME} in various levels */
 void ${HELPENTRY}(unsigned int level)
 ,8 → 229,8
 # We need at least one
 [ $# = 0 ] && usage && exit 1;
-TEMP=$(getopt -o n:d:e:h:a:r:t:HV \
---long name:,desc:,entry:,help-entry:,alias:,restrict:,type:,help,version \
+TEMP=$(getopt -o n:d:e:h:a:t:HV \
+--long name:,desc:,entry:,help-entry:,alias:,type:,help,version \
 -- "$@") || {
     echo "Try $PROGNAME --help for help"
 }
 ,11 → 264,6
         shift 2
         continue
     ;;
-    -r | --restrict)
-        CMDRESTRICT="$2"
-        shift 2
-        continue
-    ;;
     -t | --type)
         CMDTYPE="$2"
         shift 2
 ,30 → 295,7
 [ -n "$CMDTYPE" ] || CMDTYPE="module"
 [ -n "$OUTDIR" ] || OUTDIR="${CMDTYPE}s/${CMDNAME}"
-# Builtins typically only need to be available in interactive mode,
-# set the default accordingly.
-[ -n "$CMDRESTRICT" ] || {
-    [ "$CMDTYPE" = "module" ] && CMDRESTRICT="both"
-    [ "$CMDTYPE" = "builtin" ] && CMDRESTRICT="interactive"
-}
-# Set the restriction level as the structure expects to see it
-case "$CMDRESTRICT" in
-| both)
-        CMDRESTRICT="0"
-    ;;
-| non-interactive)
-        CMDRESTRICT="1"
-    ;;
-    -1 | interactive)
-        CMDRESTRICT="-1"
-    ;;
-    *)
-        usage
-        exit 1
-    ;;
-esac
 # Do a little sanity
 [ -d $OUTDIR ] && {
     echo "$OUTDIR already exists, remove it to proceed."

 /branches/dynload/uspace/app/bdsh/cmds/mod_cmds.c
 ,26 → 53,6
 extern volatile unsigned int cli_interactive;
-int module_is_restricted(int pos)
-{
-    /* Restriction Levels:
-     * -1 -> Available only in interactive mode
-     *  0 -> Available in any mode
-     *  1 -> Available only in non-interactive mode */
-    module_t *mod = modules;
-    mod += pos;
-    /* We're interactive, and the module is OK to run */
-    if (cli_interactive && mod->restricted <= 0)
-        return 0;
-    /* We're not interactive, and the module is OK to run */
-    if (!cli_interactive && mod->restricted >= 0)
-        return 0;
-    /* Anything else is just a big fat no :) */
-    return 1;
-}
 /* Checks if an entry function matching command exists in modules[], if so
  * its position in the array is returned */
 int is_module(const char *command)

/branches/dynload/uspace/app/bdsh/cmds/modules/quit/quit.c
File deleted

/branches/dynload/uspace/app/bdsh/cmds/modules/quit/quit_def.h
File deleted

/branches/dynload/uspace/app/bdsh/cmds/modules/quit/entry.h
File deleted

/branches/dynload/uspace/app/bdsh/cmds/modules/quit/quit.h
File deleted

 /branches/dynload/uspace/app/bdsh/cmds/modules/cp/cp.c
 ,7 → 34,6
 #include <getopt.h>
 #include <string.h>
 #include <fcntl.h>
-#include <assert.h>
 #include "config.h"
 #include "util.h"
 #include "errors.h"
 ,7 → 69,8
     return (int) t1;
 }
-static int64_t copy_file(const char *src, const char *dest, size_t blen, int vb)
+static int64_t copy_file(const char *src, const char *dest,
+    size_t blen, int vb)
 {
     int fd1, fd2, bytes = 0;
     off_t total = 0;
 ,12 → 124,19
                 goto err;
             res -= bytes;
         } while (res > 0);
-        assert(res == 0);
+        /* TODO: re-insert assert() once this is stand alone,
+         * removed as abort() exits the entire shell
+         */
+        if (res != 0) {
+            printf("\n%d more bytes than actually exist were copied\n", res);
+            goto err;
+        }
     }
     if (bytes < 0) {
 err:
-        printf("Error copying %s, (%d)\n", src, bytes);
+        printf("\nError copying %s, (%d)\n", src, bytes);
         copied = bytes;
     }

/branches/dynload/uspace/app/bdsh/cmds/modules/cp/cp_def.h
3,6 → 3,5
"Copy files and directories",
&cmd_cp,
&help_cmd_cp,
0
},

 /branches/dynload/uspace/app/bdsh/cmds/modules/touch/touch.c
 ,6 → 37,7
 #include <fcntl.h>
 #include <dirent.h>
 #include <sys/types.h>
+#include <string.h>
 #include "config.h"
 #include "errors.h"
 ,7 → 80,7
     }
     for (i = 1; i < argc; i ++) {
-        buff = cli_strdup(argv[i]);
+        buff = strdup(argv[i]);
         dirp = opendir(buff);
         if (dirp) {
             cli_error(CL_ENOTSUP, "%s is a directory", buff);

/branches/dynload/uspace/app/bdsh/cmds/modules/touch/touch_def.h
3,6 → 3,5
"Create files or update access times",
&cmd_touch,
&help_cmd_touch,
0
},

 /branches/dynload/uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
 ,7 → 93,7
     /* Its a good idea to allocate path, plus we (may) need a copy of
      * path to tokenize if parents are specified */
-    if (NULL == (tmp = cli_strdup(path))) {
+    if (NULL == (tmp = strdup(path))) {
         cli_error(CL_ENOMEM, "%s: path too big?", cmdname);
         return 1;
     }
 ,9 → 128,9
         absolute = 1;
     /* TODO: Canonify the path prior to tokenizing it, see below */
-    dirs[i] = cli_strtok(tmp, "/");
+    dirs[i] = strtok(tmp, "/");
     while (dirs[i] && i < 255)
-        dirs[++i] = cli_strtok(NULL, "/");
+        dirs[++i] = strtok(NULL, "/");
     if (NULL == dirs[0])
         return 1;

 /branches/dynload/uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h
 ,14 → 3,6
     "Create new directories",
     &cmd_mkdir,
     &help_cmd_mkdir,
 },
-{
-    "md",
-    NULL,
-    &cmd_mkdir,
-    &help_cmd_mkdir,
-},

/branches/dynload/uspace/app/bdsh/cmds/modules/cat/cat_def.h
3,6 → 3,5
"Show the contents of a file",
&cmd_cat,
&help_cmd_cat,
0
},

/branches/dynload/uspace/app/bdsh/cmds/modules/help/help.c
133,13 → 133,11

/* First, show a list of built in commands that are available in this mode */
for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
if (!builtin_is_restricted(i)) {
if (is_builtin_alias(cmd->name))
printf(" %-16s\tAlias for `%s'\n", cmd->name,
alias_for_builtin(cmd->name));
else
printf(" %-16s\t%s\n", cmd->name, cmd->desc);
}
}

i = 0;
146,13 → 144,11

/* Now, show a list of module commands that are available in this mode */
for (mod = modules; mod->name != NULL; mod++, i++) {
if (!module_is_restricted(i)) {
if (is_module_alias(mod->name))
printf(" %-16s\tAlias for `%s'\n", mod->name,
alias_for_module(mod->name));
else
printf(" %-16s\t%s\n", mod->name, mod->desc);
}
}

printf("\n Try %s %s for more information on how `%s' works.\n\n",

/branches/dynload/uspace/app/bdsh/cmds/modules/help/help_def.h
3,5 → 3,4
"Show help for commands",
&cmd_help,
&help_cmd_help,
0
},

/branches/dynload/uspace/app/bdsh/cmds/modules/sleep/sleep_def.h
3,6 → 3,5
"Pause for given time interval (in seconds)",
&cmd_sleep,
&help_cmd_sleep,
0
},

/branches/dynload/uspace/app/bdsh/cmds/modules/pwd/pwd_def.h
3,5 → 3,4
"Prints the current working directory",
&cmd_pwd,
&help_cmd_pwd,
-1
},

 /branches/dynload/uspace/app/bdsh/cmds/modules/module_aliases.h
 ,10 → 12,6
  * the entry point being reached. */
 char *mod_aliases[] = {
-    "exit", "quit",
-    "md", "mkdir",
-    "del", "rm",
-    "dir", "ls",
     NULL, NULL
 };

 /branches/dynload/uspace/app/bdsh/cmds/modules/ls/ls.c
 ,6 → 50,24
 static char *cmdname = "ls";
+static inline off_t flen(const char *f)
+{
+    int fd;
+    off_t size;
+    fd = open(f, O_RDONLY);
+    if (fd == -1)
+        return 0;
+    size = lseek(fd, 0, SEEK_END);
+    close(fd);
+    if (size < 0)
+        size = 0;
+    return size;
+}
 static unsigned int ls_scope(const char *path)
 {
     int fd;
 ,7 → 138,7
 static void ls_print_dir(const char *d)
 {
-    printf("%-40s\t<DIR>\n", d);
+    printf("%-40s\t<dir>\n", d);
     return;
 }
 ,7 → 145,7
 static void ls_print_file(const char *f)
 {
-    printf("%-40s\n", f);
+    printf("%-40s\t%llu\n", f, (long long) flen(f));
     return;
 }

 /branches/dynload/uspace/app/bdsh/cmds/modules/ls/ls_def.h
 ,14 → 3,4
     "List files and directories",
     &cmd_ls,
     &help_cmd_ls,
 },
-{
-    "dir",
-    NULL,
-    &cmd_ls,
-    &help_cmd_ls,
-},

/branches/dynload/uspace/app/bdsh/cmds/modules/modules.h
18,7 → 18,6
/* Prototypes for each module's entry (help/exec) points */

#include "help/entry.h"
#include "quit/entry.h"
#include "mkdir/entry.h"
#include "rm/entry.h"
#include "cat/entry.h"
34,7 → 33,6

module_t modules[] = {
#include "help/help_def.h"
#include "quit/quit_def.h"
#include "mkdir/mkdir_def.h"
#include "rm/rm_def.h"
#include "cat/cat_def.h"

 /branches/dynload/uspace/app/bdsh/cmds/modules/rm/rm.c
 ,7 → 33,6
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <assert.h>
 #include <getopt.h>
 #include "config.h"
 ,7 → 218,11
     while (NULL != argv[i]) {
         len = strlen(argv[i]) + 2;
         buff = (char *) realloc(buff, len);
-        assert(buff != NULL);
+        if (buff == NULL) {
+            printf("rm: out of memory\n");
+            ret = 1;
+            break;
+        }
         memset(buff, 0, sizeof(buff));
         snprintf(buff, len, argv[i]);

 /branches/dynload/uspace/app/bdsh/cmds/modules/rm/rm_def.h
 ,14 → 3,5
     "Remove files and directories",
     &cmd_rm,
     &help_cmd_rm,
 },
-{
-    "del",
-    NULL,
-    &cmd_rm,
-    &help_cmd_rm,
-},

/branches/dynload/uspace/app/bdsh/cmds/builtins/builtins.h
4,9 → 4,11
#include "config.h"

#include "cd/entry.h"
#include "exit/entry.h"

builtin_t builtins[] = {
#include "cd/cd_def.h"
#include "exit/exit_def.h"
{NULL, NULL, NULL, NULL}
};

 /branches/dynload/uspace/app/bdsh/cmds/builtins/cd/cd_def.h
 ,12 → 3,4
     "Change the current working directory",
     &cmd_cd,
     &help_cmd_cd,
-    -1
 },
-{
-    "chdir",
-    NULL,
-    &cmd_cd,
-    &help_cmd_cd,
-    -1
-},

/branches/dynload/uspace/app/bdsh/cmds/builtins/exit/exit.h
0,0 → 1,6
#ifndef EXIT_H
#define EXIT_H

/* Prototypes for the quit command (excluding entry points) */

#endif

 /branches/dynload/uspace/app/bdsh/cmds/builtins/exit/entry.h
 ,0 → 1,12
+#ifndef EXIT_ENTRY_H_
+#define EXIT_ENTRY_H_
+#include "scli.h"
+/* Entry points for the quit command */
+extern void help_cmd_exit(unsigned int);
+extern int cmd_exit(char *[], cliuser_t *);
+#endif

 /branches/dynload/uspace/app/bdsh/cmds/builtins/exit/exit.c
 ,0 → 1,55
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+ * 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.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include "entry.h"
+#include "exit.h"
+#include "cmds.h"
+static const char *cmdname = "exit";
+extern volatile unsigned int cli_quit;
+extern const char *progname;
+void help_cmd_exit(unsigned int level)
+{
+    printf("Type `%s' to exit %s\n", cmdname, progname);
+    return;
+}
+/* Quits the program and returns the status of whatever command
+ * came before invoking 'quit' */
+int cmd_exit(char *argv[], cliuser_t *usr)
+{
+    /* Inform that we're outta here */
+    cli_quit = 1;
+    return CMD_SUCCESS;
+}

/branches/dynload/uspace/app/bdsh/cmds/builtins/exit/exit_def.h
0,0 → 1,6
{
"exit",
"Exit the shell",
&cmd_exit,
&help_cmd_exit,
},

/branches/dynload/uspace/app/bdsh/cmds/builtins/builtin_aliases.h
4,7 → 4,6
/* See modules/module_aliases.h for an explanation of this file */

char *builtin_aliases[] = {
"chdir", "cd",
NULL, NULL
};

/branches/dynload/uspace/app/bdsh/cmds/cmds.h
36,7 → 36,6
char desc; / Description of the command */
mod_entry_t entry; /* Command (exec) entry function */
mod_help_t help; /* Command (help) entry function */
int restricted; /* Restricts to interactive/non-interactive only */
} module_t;

/* Builtin structure, same as modules except different types of entry points */

 /branches/dynload/uspace/app/bdsh/cmds/builtin_cmds.c
 ,19 → 40,6
 extern volatile unsigned int cli_interactive;
-int builtin_is_restricted(int pos)
-{
-    builtin_t *cmd = builtins;
-    cmd += pos;
-    if (cli_interactive && cmd->restricted <= 0)
-        return 0;
-    if (!cli_interactive && cmd->restricted >= 0)
-        return 0;
-    return 1;
-}
 int is_builtin(const char *command)
 {
     builtin_t *cmd;

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3674 → Rev 4341