Macintosh-SW/mpw-shell
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw-shell.git synced 2024-12-27 18:30:39 +00:00
Code Issues Projects Releases Wiki Activity

builtin catenate (builtin so cr/lf conversion blocked)

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-07-23 23:50:28 -04:00
parent 84737e1cf7
commit 9b577bdbb1
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
builtins.cpp
View File

@ -19,6 +19,7 @@
//MAXPATHLEN
#include <sys/param.h>
#include <fcntl.h>
#include "version.h"
@ -820,6 +821,59 @@ int builtin_which(Environment &env, const std::vector<std::string> &tokens, cons
return 2; // not found.
}
int cat_helper(int in, int out) {
static uint8_t buffer[4096];
for(;;) {
ssize_t rcount = read(in, buffer, sizeof(buffer));
if (rcount < 0) {
if (errno == EINTR) continue;
return 2;
}
if (rcount == 0) break;
for (;;) {
ssize_t wcount = write(out, buffer, rcount);
if (wcount < 0) {
if (errno == EINTR) continue;
return 2;
}
if (wcount != rcount) return 2;
break;
}
}
return 0;
}
int builtin_catenate(Environment &env, const std::vector<std::string> &tokens, const fdmask &fds) {
if (tokens.size() == 1) {
int rv = cat_helper(stdin, stdout);
if (rv) fputs("### Catenate - I/O Error\n", stderr);
return rv;
}
for (const auto &s : make_offset_range(tokens, 1)) {
std::string path = ToolBox::MacToUnix(s);
int fd = open(path.c_str(), O_RDONLY);
if (fd < 0) {
fprintf(stderr, "### Catenate - Unable to open \"%s\".\n", path.c_str());
return 1;
}
int rv = cat_helper(fd, stdout);
close(fd);
if (rv) {
fputs("### Catenate - I/O Error\n", stderr);
return rv;
}
}
return 0;
}
int builtin_version(Environment &env, const std::vector<std::string> &tokens, const fdmask &fds) {

1
builtins.h
View File

@ -9,6 +9,7 @@ class fdmask;
class token;
int builtin_aboutbox(Environment &e, const std::vector<std::string> &, const fdmask &);
int builtin_catenate(Environment &e, const std::vector<std::string> &, const fdmask &);
int builtin_directory(Environment &e, const std::vector<std::string> &, const fdmask &);
int builtin_echo(Environment &e, const std::vector<std::string> &, const fdmask &);
int builtin_exists(Environment &e, const std::vector<std::string> &, const fdmask &);

1
command.cpp
View File

@ -191,6 +191,7 @@ namespace {
std::unordered_map<std::string, int (*)(Environment &, const std::vector<std::string> &, const fdmask &)> builtins = {
{"aboutbox", builtin_aboutbox},
{"alias", builtin_alias},
{"catenate", builtin_catenate},
{"directory", builtin_directory},
{"echo", builtin_echo},
{"exists", builtin_exists},