Changeset 92fd52d7 in mainline for uspace/app/bdsh

Timestamp:

2009-04-09T21:16:50Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7afb4a5

Parents:

a2c58f6

Message:

Nuke strcpy() and strcmp().

Location:

uspace/app/bdsh

Files:

• cmds/builtin_cmds.c (modified) (3 diffs)
• cmds/mod_cmds.c (modified) (3 diffs)
• cmds/modules/help/help.c (modified) (1 diff)
• cmds/modules/mkdir/mkdir.c (modified) (1 diff)
• cmds/modules/rm/rm.c (modified) (1 diff)
• exec.c (modified) (2 diffs)
• input.c (modified) (2 diffs)

uspace/app/bdsh/cmds/builtin_cmds.c

@@ -50 +50 @@
 
         for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
-                if (!strcmp(cmd->name, command))
+                if (!str_cmp(cmd->name, command))
                         return i;
         }
@@ -65 +65 @@
 
         for(i=0; builtin_aliases[i] != NULL; i+=2) {
-                if (!strcmp(builtin_aliases[i], command))
+                if (!str_cmp(builtin_aliases[i], command))
                         return 1;
         }
@@ -80 +80 @@
 
         for(i=0; builtin_aliases[i] != NULL; i++) {
-                if (!strcmp(builtin_aliases[i], command))
+                if (!str_cmp(builtin_aliases[i], command))
                         return (char *)builtin_aliases[++i];
                 i++;

uspace/app/bdsh/cmds/mod_cmds.c

@@ -65 +65 @@
 
         for (mod = modules; mod->name != NULL; mod++, i++) {
-                if (!strcmp(mod->name, command))
+                if (!str_cmp(mod->name, command))
                         return i;
         }
@@ -82 +82 @@
 
         for(i=0; mod_aliases[i] != NULL; i+=2) {
-                if (!strcmp(mod_aliases[i], command))
+                if (!str_cmp(mod_aliases[i], command))
                         return 1;
         }
@@ -98 +98 @@
 
         for(i=0; mod_aliases[i] != NULL; i++) {
-                if (!strcmp(mod_aliases[i], command))
+                if (!str_cmp(mod_aliases[i], command))
                         return (char *)mod_aliases[++i];
                 i++;

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

@@ -108 +108 @@
 
         if (argc == 3) {
-                if (!strcmp("extended", argv[2]))
+                if (!str_cmp("extended", argv[2]))
                         level = HELP_LONG;
                 else

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

@@ -150 +150 @@
                 /* Sometimes make or scripts conjoin odd paths. Account for something
                  * like this: ../../foo/bar/../foo/foofoo/./bar */
-                if (!strcmp(dirs[i], "..") || !strcmp(dirs[i], ".")) {
+                if (!str_cmp(dirs[i], "..") || !str_cmp(dirs[i], ".")) {
                         if (0 != (chdir(dirs[i]))) {
                                 cli_error(CL_EFAIL, "%s: impossible path: %s",

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

@@ -217 +217 @@
         i = optind;
         while (NULL != argv[i]) {
-                len = strlen(argv[i]) + 2;
+                len = str_size(argv[i]) + 2;
                 buff = (char *) realloc(buff, len);
                 if (buff == NULL) {

uspace/app/bdsh/exec.c

@@ -72 +72 @@
         char *path[PATH_MAX];
         int n = 0, i = 0;
-        size_t x = strlen(cmd) + 2;
+        size_t x = str_size(cmd) + 2;
 
         found = (char *)malloc(PATH_MAX);
@@ -86 +86 @@
         path[n] = strtok(path_tok, PATH_DELIM);
         while (NULL != path[n]) {
-                if ((strlen(path[n]) + x ) > PATH_MAX) {
+                if ((str_size(path[n]) + x ) > PATH_MAX) {
                         cli_error(CL_ENOTSUP,
                                 "Segment %d of path is too large, search ends at segment %d",

uspace/app/bdsh/input.c

@@ -147 +147 @@
 {
         char line[INPUT_MAX];
-        size_t len = 0;
 
         console_set_style(STYLE_EMPHASIS);
@@ -154 +153 @@
 
         read_line(line, INPUT_MAX);
-        len = strlen(line);
         /* Make sure we don't have rubbish or a C/R happy user */
-        if (len == 0 || line[0] == '\n')
+        if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0)
                 return;
         usr->line = strdup(line);