Changeset 4cc0c9ee in mainline for uspace/app/bdsh/cmds

Timestamp:

2009-01-22T14:22:12Z (17 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

bf226890

Parents:

fc11b8a

Message:

Get rid of cli_strdup(), cli_strtok(), cli_strtok_r(), just use facilities in libc

Location:

uspace/app/bdsh/cmds/modules

Files:

• mkdir/mkdir.c (modified) (2 diffs)
• touch/touch.c (modified) (2 diffs)

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

@@ -94 +94 @@
         /* 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;
@@ -129 +129 @@
 
         /* 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])

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

@@ -38 +38 @@
 #include <dirent.h>
 #include <sys/types.h>
+#include <string.h>
 
 #include "config.h"
@@ -80 +81 @@
 
         for (i = 1; i < argc; i ++) {
-                buff = cli_strdup(argv[i]);
+                buff = strdup(argv[i]);
                 dirp = opendir(buff);
                 if (dirp) {