Changeset 43e02a6 in mainline

Timestamp:

2008-08-29T11:07:22Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

0c4f46a

Parents:

3771a6e

Message:

Just make cli_count_args() a function

Location:

uspace/app/bdsh

Files:

• cmds/builtins/cd/cd.c (modified) (1 diff)
• cmds/modules/cat/cat.c (modified) (1 diff)
• cmds/modules/help/help.c (modified) (3 diffs)
• cmds/modules/ls/ls.c (modified) (1 diff)
• cmds/modules/mkdir/mkdir.c (modified) (1 diff)
• cmds/modules/rm/rm.c (modified) (1 diff)
• cmds/modules/touch/touch.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

uspace/app/bdsh/cmds/builtins/cd/cd.c

@@ -63 +63 @@
         int argc, rc = 0;
 
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
         /* We don't yet play nice with whitespace, a getopt implementation should

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

@@ -139 +139 @@
         int c, opt_ind;
 
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {

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

@@ -32 +32 @@
 #include <stdlib.h>
 #include <string.h>
+
+#include "config.h"
 #include "entry.h"
 #include "help.h"
@@ -38 +40 @@
 #include "builtins.h"
 #include "errors.h"
+#include "util.h"
 
 static char *cmdname = "help";
@@ -96 +99 @@
         int level = HELP_SHORT;
 
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
         if (argc > 3) {

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

@@ -153 +153 @@
         DIR *dirp;
 
-        /* Count the arguments */
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
         buff = (char *) malloc(PATH_MAX);

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

@@ -189 +189 @@
         char *cwd;
 
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {

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

@@ -174 +174 @@
         char *buff = NULL;
 
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
+
         if (argc < 2) {
                 cli_error(CL_EFAIL,

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

@@ -71 +71 @@
         DIR *dirp;
 
-        /* Count the arguments */
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
         if (argc == 1) {

uspace/app/bdsh/util.c

@@ -238 +238 @@
         return (cli_strtok_r(s, delim, &last));
 }
+
+/* Count and return the # of elements in an array */
+unsigned int cli_count_args(char **args)
+{
+        unsigned int i;
+
+        for (i=0; args[i] != NULL; i++);
+        return i;
+}
+

uspace/app/bdsh/util.h

@@ -8 +8 @@
 extern char * cli_strtok_r(char *, const char *, char **);
 extern char * cli_strtok(char *, const char *);
+extern unsigned int cli_count_args(char **);
 
 #endif