Changeset 2b3dd78 in mainline for uspace/app/bdsh/cmds/modules/cp/cp.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (3 diffs)

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

@@ -80 +80 @@
 static dentry_type_t get_type(const char *path)
 {
-        struct stat s;
+        vfs_stat_t s;
 
         errno_t r = vfs_stat_path(path, &s);
@@ -340 +340 @@
                  */
                 while ((dp = readdir(dir))) {
-                        struct stat src_s;
-                        struct stat dest_s;
+                        vfs_stat_t src_s;
+                        vfs_stat_t dest_s;
 
                         char src_dent[PATH_MAX];
@@ -392 +392 @@
         char *buff = NULL;
         aoff64_t posr = 0, posw = 0;
-        struct stat st;
+        vfs_stat_t st;
 
         if (vb)