Changeset 6eb2e96 in mainline for uspace/app

Timestamp:

2009-04-10T07:53:54Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

3cc6a52

Parents:

f4b1535

Message:

str_cpy() and str_ncpy() in userspace. Nuke strcpy() and strncpy().

Location:

uspace/app

Files:

• bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• tetris/scores.c (modified) (3 diffs)
• tetris/tetris.c (modified) (1 diff)

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

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

uspace/app/tetris/scores.c

@@ -118 +118 @@
 static void copyhiscore(int dest, int src)
 {
-        strcpy(scores[dest].hs_name, scores[src].hs_name);
+        str_cpy(scores[dest].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
+            scores[src].hs_name);
         scores[dest].hs_score = scores[src].hs_score;   
         scores[dest].hs_level = scores[src].hs_level; 
@@ -132 +133 @@
         moveto(10 , 10);
         puts("Insert your name: ");
-        str_ncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
+        str_cpy(scores[NUMSPOTS - 1].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
+            "Player");
         i = 6; off = 6;
 
@@ -196 +198 @@
         int i;
         for(i = 0; i < NUMSPOTS; i++) {
-                str_ncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
+                str_cpy(scores[i].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "HelenOS Team");
                 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] == ' ')
-                        str_ncpy(key_write[i], "<space>", sizeof key_write[i]);
+                        str_cpy(key_write[i], sizeof key_write[i], "<space>");
                 else {
                         key_write[i][0] = keys[i];