Changeset ce04ea44 in mainline for uspace/app/bdsh/cmds

Timestamp:

2017-04-02T12:27:14Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d4067a7

Parents:

163fc09

Message:

Rename read() to vfs_read() and write() to vfs_write()

Location:

uspace/app/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (1 diff)
• cmp/cmp.c (modified) (1 diff)
• cp/cp.c (modified) (2 diffs)
• mkfile/mkfile.c (modified) (2 diffs)

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

@@ -251 +251 @@
                 }
                 
-                bytes = read(fd, &pos, buff + copied_bytes, bytes_to_read);
+                bytes = vfs_read(fd, &pos, buff + copied_bytes, bytes_to_read);
                 copied_bytes = 0;
 

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

@@ -94 +94 @@
                         ssize_t size;
                         do {
-                                size = read(fd[i], &pos[i],
+                                size = vfs_read(fd[i], &pos[i],
                                     buffer[i] + offset[i],
                                     CMP_BUFLEN - offset[i]);
                                 if (size < 0) {
-                                        rc = errno;
+                                        rc = size;
                                         printf("Error reading from %s\n",
                                             fn[i]);

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

@@ -413 +413 @@
         }
 
-        while ((bytes = read(fd1, &posr, buff, blen)) > 0) {
-                if ((bytes = write(fd2, &posw, buff, bytes)) < 0)
+        while ((bytes = vfs_read(fd1, &posr, buff, blen)) > 0) {
+                if ((bytes = vfs_write(fd2, &posw, buff, bytes)) < 0)
                         break;
                 copied += bytes;
@@ -420 +420 @@
 
         if (bytes < 0) {
-                printf("\nError copying %s, (%d)\n", src, errno);
+                printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;
         }

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

@@ -166 +166 @@
                 
                 pos = file_size - 1;
-                rc2 = write(fd, &pos, &byte, sizeof(char));
+                rc2 = vfs_write(fd, &pos, &byte, sizeof(char));
                 if (rc2 < 0) {
                         vfs_put(fd);
@@ -183 +183 @@
         while (total_written < file_size) {
                 to_write = min(file_size - total_written, BUFFER_SIZE);
-                rc = write(fd, &pos, buffer, to_write);
+                rc = vfs_write(fd, &pos, buffer, to_write);
                 if (rc <= 0) {
                         printf("%s: Error writing file (%d).\n", cmdname, errno);