Changeset 2b3dd78 in mainline for uspace/app/bdsh/cmds

Timestamp:

2018-01-31T12:02:00Z (8 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

Location:

uspace/app/bdsh/cmds

Files:

• builtins/batch/batch.c (modified) (1 diff)
• modules/cat/cat.c (modified) (1 diff)
• modules/cp/cp.c (modified) (3 diffs)
• modules/ls/ls.h (modified) (1 diff)
• modules/mount/mount.c (modified) (1 diff)
• modules/sleep/sleep.c (modified) (1 diff)
• modules/touch/touch.c (modified) (1 diff)

uspace/app/bdsh/cmds/builtins/batch/batch.c

@@ -32 +32 @@
 #include <stddef.h>
 #include <errno.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"

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

@@ -215 +215 @@
 
         if (tail != CAT_FULL_FILE) {
-                struct stat st;
+                vfs_stat_t st;
 
                 if (vfs_stat(fd, &st) != EOK) {

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)

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

@@ -23 +23 @@
 struct dir_elem_t {
         char *name;
-        struct stat s;
+        vfs_stat_t s;
 };
 

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

@@ -37 +37 @@
 #include <getopt.h>
 #include <inttypes.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"

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

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"

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

@@ -82 +82 @@
         int longind;
         bool no_create = false;
-        struct stat file_stat;
+        vfs_stat_t file_stat;
         int fd = -1;
         char *buff = NULL;