Changeset 095003a8 in mainline for uspace/app

Timestamp:

2009-04-09T22:32:23Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

f4b1535

Parents:

7afb4a5

Message:

strdup() → str_dup()

Location:

uspace/app

Files:

• bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• bdsh/cmds/modules/mkdir/mkdir.c (modified) (1 diff)
• bdsh/cmds/modules/touch/touch.c (modified) (1 diff)
• bdsh/exec.c (modified) (2 diffs)
• bdsh/input.c (modified) (2 diffs)
• tetris/scores.c (modified) (2 diffs)
• tetris/tetris.c (modified) (1 diff)

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

@@ -183 +183 @@
                 getcwd(buff, PATH_MAX);
         else
-                strncpy(buff, argv[1], PATH_MAX);
+                str_ncpy(buff, argv[1], PATH_MAX);
 
         scope = ls_scope(buff);

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 = strdup(path))) {
+        if (NULL == (tmp = str_dup(path))) {
                 cli_error(CL_ENOMEM, "%s: path too big?", cmdname);
                 return 1;

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

@@ -81 +81 @@
 
         for (i = 1; i < argc; i ++) {
-                buff = strdup(argv[i]);
+                buff = str_dup(argv[i]);
                 dirp = opendir(buff);
                 if (dirp) {

uspace/app/bdsh/exec.c

@@ -81 +81 @@
         }
 
-        path_tok = strdup(PATH);
+        path_tok = str_dup(PATH);
 
         /* Extract the PATH env to a path[] array */
@@ -115 +115 @@
         char *tmp;
 
-        tmp = strdup(find_command(cmd));
+        tmp = str_dup(find_command(cmd));
         free(found);
 

uspace/app/bdsh/input.c

@@ -62 +62 @@
                 return CL_EFAIL;
 
-        tmp = strdup(usr->line);
+        tmp = str_dup(usr->line);
 
         cmd[n] = strtok(tmp, " ");
@@ -156 +156 @@
         if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0)
                 return;
-        usr->line = strdup(line);
+        usr->line = str_dup(line);
 
         return;

uspace/app/tetris/scores.c

@@ -132 +132 @@
         moveto(10 , 10);
         puts("Insert your name: ");
-        strncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
+        str_ncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
         i = 6; off = 6;
 
@@ -196 +196 @@
         int i;
         for(i = 0; i < NUMSPOTS; i++) {
-                strncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
+                str_ncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
                 scores[i].hs_score = (NUMSPOTS - i) * 200;      
                 scores[i].hs_level = (i + 1 > MAXLEVEL?MAXLEVEL:i + 1);

uspace/app/tetris/tetris.c

@@ -312 +312 @@
                 }
                 if (keys[i] == ' ')
-                        strncpy(key_write[i], "<space>", sizeof key_write[i]);
+                        str_ncpy(key_write[i], "<space>", sizeof key_write[i]);
                 else {
                         key_write[i][0] = keys[i];