Changeset 39330200 in mainline for uspace/app

Timestamp:

2018-01-15T21:40:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ba29018

Parents:

d8023313

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-15 21:20:07)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-15 21:40:49)

Message:

Rename struct stat and struct statfs to vfs_stat_t and vfs_statfs_t,
respectively. They are nonstandard vestiges of times when native file API
was modeled after POSIX API.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (3 diffs)
• bdsh/cmds/modules/ls/ls.h (modified) (1 diff)
• bdsh/cmds/modules/touch/touch.c (modified) (1 diff)
• bdsh/compl.c (modified) (1 diff)
• df/df.c (modified) (3 diffs)
• init/init.c (modified) (1 diff)
• sysinst/futil.c (modified) (2 diffs)
• viewer/viewer.c (modified) (1 diff)

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/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;

uspace/app/bdsh/compl.c

@@ -360 +360 @@
                                 char *ent_path;
                                 asprintf(&ent_path, "%s/%s", *cs->path, dent->d_name);
-                                struct stat ent_stat;
+                                vfs_stat_t ent_stat;
                                 if (vfs_stat_path(ent_path, &ent_stat) != EOK) {
                                         /* Error */

uspace/app/df/df.c

@@ -58 +58 @@
 static errno_t size_to_human_readable(uint64_t, size_t, char **);
 static void print_header(void);
-static errno_t print_statfs(struct statfs *, char *, char *);
+static errno_t print_statfs(vfs_statfs_t *, char *, char *);
 static void print_usage(void);
 
@@ -64 +64 @@
 {
         int optres, errflg = 0;
-        struct statfs st;
+        vfs_statfs_t st;
         errno_t rc;
 
@@ -147 +147 @@
 }
 
-static errno_t print_statfs(struct statfs *st, char *name, char *mountpoint)
+static errno_t print_statfs(vfs_statfs_t *st, char *name, char *mountpoint)
 {
         uint64_t const used_blocks = st->f_blocks - st->f_bfree;

uspace/app/init/init.c

@@ -152 +152 @@
 static errno_t srv_startl(const char *path, ...)
 {
-        struct stat s;
+        vfs_stat_t s;
         if (vfs_stat_path(path, &s) != EOK) {
                 printf("%s: Unable to stat %s\n", NAME, path);

uspace/app/sysinst/futil.c

@@ -108 +108 @@
         DIR *dir;
         struct dirent *de;
-        struct stat s;
+        vfs_stat_t s;
         char *srcp, *destp;
         errno_t rc;
@@ -165 +165 @@
         size_t fsize;
         char *data;
-        struct stat st;
+        vfs_stat_t st;
 
         rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);

uspace/app/viewer/viewer.c

@@ -115 +115 @@
                 return false;
         
-        struct stat stat;
+        vfs_stat_t stat;
         rc = vfs_stat(fd, &stat);
         if (rc != EOK) {