RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

cat: Updated to handle multiple input files (#694)

Browse source 
Now concatenates multiple files at once with a for loop iterating
through a vector of file arguments.
This commit is contained in:
balatt 2019-10-29 11:08:09 -04:00 • committed by Andreas Kling
parent fa69b9fbb7
commit 5442e365c9
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Userland/cat.cpp
View file

@ -1,3 +1,4 @@
#include <AK/Vector.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@ -8,26 +9,37 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int fd = argc > 1 ? open(argv[1], O_RDONLY) : 0; Vector<int> fds;
if (fd == -1) { if (argc > 1) {
fprintf(stderr, "Failed to open %s: %s\n", argv[1], strerror(errno)); for (int i = 0; i < argc; i++) {
return 1; int fd;
if ((fd = open(argv[i], O_RDONLY)) == -1) {
fprintf(stderr, "Failed to open %s: %s\n", argv[i], strerror(errno));
continue;
}
fds.append(fd);
}
} else {
fds.append(0);
} }
for (;;) { for (auto& fd : fds) {
char buf[4096]; for (;;) {
ssize_t nread = read(fd, buf, sizeof(buf)); char buf[4096];
if (nread == 0) ssize_t nread = read(fd, buf, sizeof(buf));
break; if (nread == 0)
if (nread < 0) { break;
perror("read"); if (nread < 0) {
return 2; perror("read");
return 2;
}
ssize_t nwritten = write(1, buf, nread);
if (nwritten < 0) {
perror("write");
return 3;
}
ASSERT(nwritten == nread);
} }
ssize_t nwritten = write(1, buf, nread); close(fd);
if (nwritten < 0) {
perror("write");
return 3;
}
ASSERT(nwritten == nread);
} }
return 0; return 0;
} }