WebSVN – HelenOS – Path Comparison – / – /branches/sparc/uspace/app/bdsh/cmds/modules/ Rev 3491 and /branches/sparc/uspace/app/bdsh/cmds/modules/ Rev 3492

Ignore whitespace Rev 3491 → Rev 3492

 /branches/sparc/uspace/app/bdsh/cmds/modules/quit/quit.c
 ,15 → 39,15
 extern volatile unsigned int cli_quit;
 extern const char *progname;
-void * help_cmd_quit(unsigned int level)
+void help_cmd_quit(unsigned int level)
 {
     printf("Type `%s' to exit %s\n", cmdname, progname);
-    return CMD_VOID;
+    return;
 }
 /* Quits the program and returns the status of whatever command
  * came before invoking 'quit' */
-int * cmd_quit(char *argv[])
+int cmd_quit(char *argv[])
 {
     /* Inform that we're outta here */
     cli_quit = 1;

 /branches/sparc/uspace/app/bdsh/cmds/modules/quit/entry.h
 ,8 → 2,8
 #define QUIT_ENTRY_H_
 /* Entry points for the quit command */
-extern void * help_cmd_quit(unsigned int);
-extern int * cmd_quit(char *[]);
+extern void help_cmd_quit(unsigned int);
+extern int cmd_quit(char *[]);
 #endif

 /branches/sparc/uspace/app/bdsh/cmds/modules/touch/touch.c
 ,7 → 48,7
 static char *cmdname = "touch";
 /* Dispays help for touch in various levels */
-void * help_cmd_touch(unsigned int level)
+void help_cmd_touch(unsigned int level)
 {
     if (level == HELP_SHORT) {
         printf("`%s' updates access times for files\n", cmdname);
 ,11 → 58,11
                 "created\n", cmdname);
     }
-    return CMD_VOID;
+    return;
 }
 /* Main entry point for touch, accepts an array of arguments */
-int * cmd_touch(char **argv)
+int cmd_touch(char **argv)
 {
     unsigned int argc, i = 0, ret = 0;
     int fd;

 /branches/sparc/uspace/app/bdsh/cmds/modules/touch/entry.h
 ,8 → 2,8
 #define TOUCH_ENTRY_H
 /* Entry points for the touch command */
-extern int * cmd_touch(char **);
-extern void * help_cmd_touch(unsigned int);
+extern int cmd_touch(char **);
+extern void help_cmd_touch(unsigned int);
 #endif /* TOUCH_ENTRY_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/cp/cp.c
 ,0 → 1,73
+/* 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 "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "cp.h"
+#include "cmds.h"
+static char *cmdname = "cp";
+/* Dispays help for cp in various levels */
+void help_cmd_cp(unsigned int level)
+{
+    printf("This is the %s help for '%s'.\n",
+        level ? EXT_HELP : SHORT_HELP, cmdname);
+    return;
+}
+/* Main entry point for cp, accepts an array of arguments */
+int cmd_cp(char **argv)
+{
+    unsigned int argc;
+    unsigned int i;
+    /* Count the arguments */
+    for (argc = 0; argv[argc] != NULL; argc ++);
+    printf("%s %s\n", TEST_ANNOUNCE, cmdname);
+    printf("%d arguments passed to %s", argc - 1, cmdname);
+    if (argc < 2) {
+        printf("\n");
+        return CMD_SUCCESS;
+    }
+    printf(":\n");
+    for (i = 1; i < argc; i++)
+        printf("[%d] -> %s\n", i, argv[i]);
+    return CMD_SUCCESS;
+}

 /branches/sparc/uspace/app/bdsh/cmds/modules/cp/cp_def.h
 ,0 → 1,8
+{
+    "cp",
+    "Copy files and directories",
+    &cmd_cp,
+    &help_cmd_cp,
+},

 /branches/sparc/uspace/app/bdsh/cmds/modules/cp/entry.h
 ,0 → 1,9
+#ifndef CP_ENTRY_H
+#define CP_ENTRY_H
+/* Entry points for the cp command */
+extern int cmd_cp(char **);
+extern void help_cmd_cp(unsigned int);
+#endif /* CP_ENTRY_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/cp/cp.h
 ,0 → 1,8
+#ifndef CP_H
+#define CP_H
+/* Prototypes for the cp command, excluding entry points */
+#endif /* CP_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/mkdir/entry.h
 ,8 → 2,8
 #define MKDIR_ENTRY_H
 /* Entry points for the mkdir command */
-extern int * cmd_mkdir(char **);
-extern void * help_cmd_mkdir(unsigned int);
+extern int cmd_mkdir(char **);
+extern void help_cmd_mkdir(unsigned int);
 #endif /* MKDIR_ENTRY_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
 ,7 → 60,7
 };
-void * help_cmd_mkdir(unsigned int level)
+void help_cmd_mkdir(unsigned int level)
 {
     if (level == HELP_SHORT) {
         printf("`%s' creates a new directory\n", cmdname);
 ,7 → 79,7
         cmdname, cmdname);
     }
-    return CMD_VOID;
+    return;
 }
 /* This is kind of clunky, but effective for now */
 ,7 → 181,7
     return ret;
 }
-int * cmd_mkdir(char **argv)
+int cmd_mkdir(char **argv)
 {
     unsigned int argc, create_parents = 0, i, ret = 0, follow = 0;
     unsigned int verbose = 0;

 /branches/sparc/uspace/app/bdsh/cmds/modules/cat/entry.h
 ,8 → 2,8
 #define CAT_ENTRY_H
 /* Entry points for the cat command */
-extern int * cmd_cat(char **);
-extern void * help_cmd_cat(unsigned int);
+extern int cmd_cat(char **);
+extern void help_cmd_cat(unsigned int);
 #endif /* CAT_ENTRY_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/cat/cat.c
 ,7 → 59,7
 };
 /* Dispays help for cat in various levels */
-void * help_cmd_cat(unsigned int level)
+void help_cmd_cat(unsigned int level)
 {
     if (level == HELP_SHORT) {
         printf("`%s' shows the contents of files\n", cmdname);
 ,7 → 78,7
         cmdname, cmdname);
     }
-    return CMD_VOID;
+    return;
 }
 static unsigned int cat_file(const char *fname, size_t blen)
 ,12 → 121,6
         return 1;
     }
-    /* Debug stuff, newline not added purposefully */
-    printf("** %s is a file with the size of %ld bytes\n",
-        fname, total);
-    printf( "** %d bytes were read in a buffer of %d bytes in %d reads\n",
-        count, blen, reads);
-    printf("** Read %s\n", count == total ? "Succeeded" : "Failed");
     free(buff);
     return 0;
 ,7 → 127,7
 }
 /* Main entry point for cat, accepts an array of arguments */
-int * cmd_cat(char **argv)
+int cmd_cat(char **argv)
 {
     unsigned int argc, i, ret = 0, buffer = 0;
     int c, opt_ind;

 /branches/sparc/uspace/app/bdsh/cmds/modules/help/entry.h
 ,7 → 2,7
 #define HELP_ENTRY_H_
 /* Entry points for the help command */
-extern void * help_cmd_help(unsigned int);
-extern int * cmd_help(char *[]);
+extern void help_cmd_help(unsigned int);
+extern int cmd_help(char *[]);
 #endif

 /branches/sparc/uspace/app/bdsh/cmds/modules/help/help.c
 ,7 → 69,7
     return HELP_IS_RUBBISH;
 }
-void *help_cmd_help(unsigned int level)
+void help_cmd_help(unsigned int level)
 {
     if (level == HELP_SHORT) {
         printf(
 ,10 → 86,10
         cmdname, cmdname, cmdname, cmdname);
     }
-    return CMD_VOID;
+    return;
 }
-int *cmd_help(char *argv[])
+int cmd_help(char *argv[])
 {
     module_t *mod;
     builtin_t *cmd;

 /branches/sparc/uspace/app/bdsh/cmds/modules/sleep/entry.h
 ,0 → 1,9
+#ifndef SLEEP_ENTRY_H
+#define SLEEP_ENTRY_H
+/* Entry points for the sleep command */
+extern int cmd_sleep(char **);
+extern void help_cmd_sleep(unsigned int);
+#endif /* SLEEP_ENTRY_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/sleep/sleep.c
 ,0 → 1,73
+/* 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 "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "sleep.h"
+#include "cmds.h"
+static char *cmdname = "sleep";
+/* Dispays help for sleep in various levels */
+void help_cmd_sleep(unsigned int level)
+{
+    printf("This is the %s help for '%s'.\n",
+        level ? EXT_HELP : SHORT_HELP, cmdname);
+    return;
+}
+/* Main entry point for sleep, accepts an array of arguments */
+int cmd_sleep(char **argv)
+{
+    unsigned int argc;
+    unsigned int i;
+    /* Count the arguments */
+    for (argc = 0; argv[argc] != NULL; argc ++);
+    printf("%s %s\n", TEST_ANNOUNCE, cmdname);
+    printf("%d arguments passed to %s", argc - 1, cmdname);
+    if (argc < 2) {
+        printf("\n");
+        return CMD_SUCCESS;
+    }
+    printf(":\n");
+    for (i = 1; i < argc; i++)
+        printf("[%d] -> %s\n", i, argv[i]);
+    return CMD_SUCCESS;
+}

 /branches/sparc/uspace/app/bdsh/cmds/modules/sleep/sleep_def.h
 ,0 → 1,8
+{
+    "sleep",
+    "Pause for given time interval (in seconds)",
+    &cmd_sleep,
+    &help_cmd_sleep,
+},

 /branches/sparc/uspace/app/bdsh/cmds/modules/sleep/sleep.h
 ,0 → 1,8
+#ifndef SLEEP_H
+#define SLEEP_H
+/* Prototypes for the sleep command, excluding entry points */
+#endif /* SLEEP_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/pwd/entry.h
 ,8 → 4,8
 #include "scli.h"
 /* Entry points for the pwd command */
-extern void * help_cmd_pwd(unsigned int);
-extern int * cmd_pwd(char **);
+extern void help_cmd_pwd(unsigned int);
+extern int cmd_pwd(char **);
 #endif

 /branches/sparc/uspace/app/bdsh/cmds/modules/pwd/pwd.c
 ,13 → 39,13
 static char * cmdname = "pwd";
-void * help_cmd_pwd(unsigned int level)
+void help_cmd_pwd(unsigned int level)
 {
     printf("`%s' prints your current working directory.\n", cmdname);
-    return CMD_VOID;
+    return;
 }
-int * cmd_pwd(char *argv[])
+int cmd_pwd(char *argv[])
 {
     char *buff;

 /branches/sparc/uspace/app/bdsh/cmds/modules/ls/ls.c
 ,7 → 132,7
     return;
 }
-void * help_cmd_ls(unsigned int level)
+void help_cmd_ls(unsigned int level)
 {
     if (level == HELP_SHORT) {
         printf("`%s' lists files and directories.\n", cmdname);
 ,10 → 142,10
                 "working directory is used.\n", cmdname);
     }
-    return CMD_VOID;
+    return;
 }
-int * cmd_ls(char **argv)
+int cmd_ls(char **argv)
 {
     unsigned int argc;
     unsigned int scope;

 /branches/sparc/uspace/app/bdsh/cmds/modules/ls/entry.h
 ,8 → 2,8
 #define LS_ENTRY_H
 /* Entry points for the ls command */
-extern int * cmd_ls(char **);
-extern void * help_cmd_ls(unsigned int);
+extern int cmd_ls(char **);
+extern void help_cmd_ls(unsigned int);
 #endif /* LS_ENTRY_H */

 /branches/sparc/uspace/app/bdsh/cmds/modules/modules.h
 ,6 → 25,8
 #include "touch/entry.h"
 #include "ls/entry.h"
 #include "pwd/entry.h"
+#include "sleep/entry.h"
+#include "cp/entry.h"
 /* Each .def function fills the module_t struct with the individual name, entry
  * point, help entry point, etc. You can use config.h to control what modules
 ,6 → 41,8
 #include "touch/touch_def.h"
 #include "ls/ls_def.h"
 #include "pwd/pwd_def.h"
+#include "sleep/sleep_def.h"
+#include "cp/cp_def.h"
     {NULL, NULL, NULL, NULL}
 };

 /branches/sparc/uspace/app/bdsh/cmds/modules/rm/rm.c
 ,7 → 144,7
 }
 /* Dispays help for rm in various levels */
-void * help_cmd_rm(unsigned int level)
+void help_cmd_rm(unsigned int level)
 {
     if (level == HELP_SHORT) {
         printf("`%s' removes files and directories.\n", cmdname);
 ,11 → 161,11
         "Currently, %s is under development, some options don't work.\n",
         cmdname, cmdname);
     }
-    return CMD_VOID;
+    return;
 }
 /* Main entry point for rm, accepts an array of arguments */
-int * cmd_rm(char **argv)
+int cmd_rm(char **argv)
 {
     unsigned int argc;
     unsigned int i, scope, ret = 0;

 /branches/sparc/uspace/app/bdsh/cmds/modules/rm/entry.h
 ,8 → 2,8
 #define RM_ENTRY_H
 /* Entry points for the rm command */
-extern int * cmd_rm(char **);
-extern void * help_cmd_rm(unsigned int);
+extern int cmd_rm(char **);
+extern void help_cmd_rm(unsigned int);
 #endif /* RM_ENTRY_H */

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3491 → Rev 3492