Changeset 98abd40 in mainline for uspace/app/bdsh

Timestamp:

2013-07-06T21:57:22Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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

Files:

• Makefile (modified) (2 diffs)
• cmds/modules/bdd/bdd.c (deleted)
• cmds/modules/bdd/bdd.h (deleted)
• cmds/modules/bdd/bdd_def.h (deleted)
• cmds/modules/bdd/entry.h (deleted)
• cmds/modules/help/help.c (modified) (3 diffs)
• cmds/modules/modules.h (modified) (2 diffs)
• cmds/modules/pwd/pwd.c (modified) (1 diff)
• cmds/modules/rm/rm.c (modified) (2 diffs)
• cmds/modules/sleep/sleep.c (modified) (1 diff)
• exec.c (modified) (1 diff)

uspace/app/bdsh/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a \
-        $(LIBFMTUTIL_PREFIX)/libfmtutil.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) \
-        -I$(LIBFMTUTIL_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
+LIBS = $(LIBCLUI_PREFIX)/libclui.a $(LIBFMTUTIL_PREFIX)/libfmtutil.a
+EXTRA_CFLAGS = -I$(LIBCLUI_PREFIX) -I$(LIBFMTUTIL_PREFIX) \
+        -I. -Icmds/ -Icmds/builtins -Icmds/modules
 BINARY = bdsh
 
@@ -40 +39 @@
         cmds/modules/mkfile/mkfile.c \
         cmds/modules/rm/rm.c \
-        cmds/modules/bdd/bdd.c \
         cmds/modules/cat/cat.c \
         cmds/modules/touch/touch.c \

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

@@ -98 +98 @@
         builtin_t *cmd;
         module_t *mod;
-        unsigned int i;
 
         printf("\n  Bdsh built-in commands:\n");
@@ -104 +103 @@
 
         /* First, show a list of built in commands that are available in this mode */
-        for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
+        for (cmd = builtins; cmd->name != NULL; cmd++) {
                         if (is_builtin_alias(cmd->name))
                                 printf("   %-16s\tAlias for `%s'\n", cmd->name,
@@ -112 +111 @@
         }
 
-        i = 0;
-
         /* Now, show a list of module commands that are available in this mode */
-        for (mod = modules; mod->name != NULL; mod++, i++) {
+        for (mod = modules; mod->name != NULL; mod++) {
                         if (is_module_alias(mod->name))
                                 printf("   %-16s\tAlias for `%s'\n", mod->name,

uspace/app/bdsh/cmds/modules/modules.h

@@ -50 +50 @@
 #include "mkfile/entry.h"
 #include "rm/entry.h"
-#include "bdd/entry.h"
 #include "cat/entry.h"
 #include "touch/entry.h"
@@ -74 +73 @@
 #include "mkfile/mkfile_def.h"
 #include "rm/rm_def.h"
-#include "bdd/bdd_def.h"
 #include "cat/cat_def.h"
 #include "touch/touch_def.h"

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

@@ -55 +55 @@
         }
 
-        memset(buff, 0, sizeof(buff));
+        memset(buff, 0, PATH_MAX);
         getcwd(buff, PATH_MAX);
 

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

@@ -99 +99 @@
         if (NULL == (rm->nwd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->nwd, 0, sizeof(rm->nwd));
+        memset(rm->nwd, 0, PATH_MAX);
 
         if (NULL == (rm->owd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->owd, 0, sizeof(rm->owd));
+        memset(rm->owd, 0, PATH_MAX);
 
         if (NULL == (rm->cwd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->cwd, 0, sizeof(rm->cwd));
+        memset(rm->cwd, 0, PATH_MAX);
 
         chdir(".");
@@ -298 +298 @@
                         break;
                 }
-                memset(buff, 0, sizeof(buff));
+                memset(buff, 0, len);
                 snprintf(buff, len, "%s", argv[i]);
 

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

@@ -67 +67 @@
         uint64_t whole_seconds;
         uint64_t frac_seconds;
-        char *endptr;
+        const char *endptr;
 
         /* Check for whole seconds */

uspace/app/bdsh/exec.c

@@ -83 +83 @@
         /* We now have n places to look for the command */
         for (i = 0; search_dir[i] != NULL; i++) {
-                memset(found, 0, sizeof(found));
+                memset(found, 0, PATH_MAX);
                 snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
                 if (-1 != try_access(found)) {