Changeset 23a0368 in mainline for uspace/app

Timestamp:

2017-03-30T19:52:23Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ae7bfbbd

Parents:

b5b5d84

Message:

Rename stat() to vfs_stat_path() and fstat() to vfs_stat()

Location:

uspace/app

Files:

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

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

@@ -31 +31 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <getopt.h>
 #include <str.h>
@@ -214 +213 @@
                 struct stat st;
 
-                if (fstat(fd, &st) != EOK) {
+                if (vfs_stat(fd, &st) != EOK) {
                         close(fd);
                         free(buff);
-                        printf("Unable to fstat %d\n", fd);
+                        printf("Unable to vfs_stat %d\n", fd);
                         return 1;
                 }

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

@@ -37 +37 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <dirent.h>
 #include "config.h"
@@ -83 +84 @@
         struct stat s;
 
-        int r = stat(path, &s);
-
-        if (r != 0)
+        int r = vfs_stat_path(path, &s);
+
+        if (r != EOK)
                 return TYPE_NONE;
         else if (s.is_directory)
@@ -341 +342 @@
 
                         /* Check if we are copying a directory into itself */
-                        stat(src_dent, &src_s);
-                        stat(dest_path, &dest_s);
+                        vfs_stat_path(src_dent, &src_s);
+                        vfs_stat_path(dest_path, &dest_s);
 
                         if (dest_s.index == src_s.index &&
@@ -394 +395 @@
         }
 
-        if (fstat(fd1, &st) != EOK) {
+        if (vfs_stat(fd1, &st) != EOK) {
                 printf("Unable to fstat %d\n", fd1);
                 close(fd1);

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

@@ -39 +39 @@
 #include <getopt.h>
 #include <sys/types.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <str.h>
 #include <sort.h>
@@ -185 +185 @@
                 buff[len] = '\0';
 
-                rc = stat(buff, &tosort[nbdirs++].s);
-                if (rc != 0) {
+                rc = vfs_stat_path(buff, &tosort[nbdirs++].s);
+                if (rc != EOK) {
                         printf("ls: skipping bogus node %s\n", buff);
-                        printf("error=%d\n", errno);
+                        printf("error=%d\n", rc);
                         goto out;
                 }
@@ -315 +315 @@
 static unsigned int ls_scope(const char *path, struct dir_elem_t *de)
 {
-        if (stat(path, &de->s) != 0) {
+        if (vfs_stat_path(path, &de->s) != EOK) {
                 cli_error(CL_ENOENT, "%s", path);
                 return LS_BOGUS;

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

@@ -1 +1 @@
 #ifndef LS_H
 #define LS_H
+
+#include <vfs/vfs.h>
 
 /* Various values that can be returned by ls_scope() */

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

@@ -40 +40 @@
 #include <str.h>
 #include <getopt.h>
-#include <sys/stat.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -123 +123 @@
                 
                 /* Check whether file exists if -c (--no-create) option is given */
-                if ((!no_create) || ((no_create) && (stat(buff, &file_stat) == 0)))
+                if ((!no_create) ||
+                    ((no_create) && (vfs_stat_path(buff, &file_stat) == EOK))) {
                         fd = open(buff, O_RDWR | O_CREAT);
+                }
                 
                 if (fd < 0) {

uspace/app/bdsh/compl.c

@@ -33 +33 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 
 #include "cmds/cmds.h"
@@ -360 +360 @@
                                 asprintf(&ent_path, "%s/%s", *cs->path, dent->d_name);
                                 struct stat ent_stat;
-                                if (stat(ent_path, &ent_stat) != 0) {
+                                if (vfs_stat_path(ent_path, &ent_stat) != EOK) {
                                         /* Error */
                                         free(ent_path);

uspace/app/init/init.c

@@ -42 +42 @@
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <task.h>
 #include <malloc.h>
@@ -156 +155 @@
 {
         struct stat s;
-        if (stat(path, &s) != 0) {
+        if (vfs_stat_path(path, &s) != EOK) {
                 printf("%s: Unable to stat %s\n", NAME, path);
                 return ENOENT;

uspace/app/sysinst/futil.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -119 +120 @@
                         return ENOMEM;
 
-                rc = stat(srcp, &s);
+                rc = vfs_stat_path(srcp, &s);
                 if (rc != EOK)
                         return EIO;
@@ -166 +167 @@
                 return ENOENT;
 
-        if (fstat(sf, &st) != EOK) {
+        if (vfs_stat(sf, &st) != EOK) {
                 close(sf);
                 return EIO;

uspace/app/viewer/viewer.c

@@ -36 +36 @@
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <errno.h>
 #include <malloc.h>
@@ -115 +115 @@
         
         struct stat stat;
-        int rc = fstat(fd, &stat);
-        if (rc != 0) {
+        int rc = vfs_stat(fd, &stat);
+        if (rc != EOK) {
                 close(fd);
                 return false;