Convert file descriptors to generic streams
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
#include "src/lib/util.h"
|
||||
#include "src/user/syscall.h"
|
||||
|
||||
#define BLOCK_SIZE 65536
|
||||
@@ -5,12 +6,12 @@
|
||||
#define PRINT_S(s) write(1, s, sizeof(s) - 1);
|
||||
#define PRINT_D(s) write(1, s, string_length(s));
|
||||
|
||||
uint64_t cat(const char *path) {
|
||||
exit_code_t cat(const char *path) {
|
||||
uint64_t fd = open(path);
|
||||
|
||||
if (fd == (uint64_t)-1) {
|
||||
PRINT_S("cat: path does not exist\n");
|
||||
return (uint64_t)-1;
|
||||
return EXIT_CODE_GENERAL_FAILURE;
|
||||
}
|
||||
|
||||
static char buffer[BLOCK_SIZE];
|
||||
@@ -19,7 +20,7 @@ uint64_t cat(const char *path) {
|
||||
if (bytes == (uint64_t)-1) {
|
||||
PRINT_S("cat: could not read file\n");
|
||||
close(fd);
|
||||
return (uint64_t)-1;
|
||||
return EXIT_CODE_GENERAL_FAILURE;
|
||||
}
|
||||
write(1, buffer, bytes);
|
||||
}
|
||||
@@ -29,15 +30,16 @@ uint64_t cat(const char *path) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64_t main(uint64_t argc, const char **argv) {
|
||||
exit_code_t main(uint64_t argc, const char **argv) {
|
||||
if (argc == 1) {
|
||||
return cat(".");
|
||||
}
|
||||
|
||||
uint64_t code = 0;
|
||||
uint64_t code = EXIT_CODE_OK;
|
||||
for (uint64_t i = 1; i < argc; i++) {
|
||||
if (cat(argv[i]) == (uint64_t)-1) {
|
||||
code = (uint64_t)-1;
|
||||
exit_code_t c = cat(argv[i]);
|
||||
if (c != EXIT_CODE_OK) {
|
||||
code = c;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user