Changeset db71e2a in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (2 diffs)

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

@@ -99 +99 @@
         if (NULL == (rm->nwd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->nwd, 0, sizeof(rm->nwd));
+        memset(rm->nwd, 0, PATH_MAX);
 
         if (NULL == (rm->owd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->owd, 0, sizeof(rm->owd));
+        memset(rm->owd, 0, PATH_MAX);
 
         if (NULL == (rm->cwd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->cwd, 0, sizeof(rm->cwd));
+        memset(rm->cwd, 0, PATH_MAX);
 
         chdir(".");
@@ -298 +298 @@
                         break;
                 }
-                memset(buff, 0, sizeof(buff));
+                memset(buff, 0, len);
                 snprintf(buff, len, "%s", argv[i]);