xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When file to open is a fifo, do not read from it (use -fifo for that)

Browse Source 
Fixes #267
This commit is contained in:
Maxime Coste 2015-04-29 13:46:04 +01:00
parent 1337763cb5
commit d169558e09
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/file.cc
View File

@ -144,7 +144,7 @@ Buffer* create_buffer_from_file(StringView filename)
{ {
String real_filename = real_path(parse_filename(filename)); String real_filename = real_path(parse_filename(filename));
int fd = open(real_filename.c_str(), O_RDONLY); int fd = open(real_filename.c_str(), O_RDONLY | O_NONBLOCK);
if (fd == -1) if (fd == -1)
{ {
if (errno == ENOENT) if (errno == ENOENT)
@ -158,6 +158,9 @@ Buffer* create_buffer_from_file(StringView filename)
fstat(fd, &st); fstat(fd, &st);
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
throw file_access_error(real_filename, "is a directory"); throw file_access_error(real_filename, "is a directory");
if (S_ISFIFO(st.st_mode)) // Do not try to read fifos, use them as write only
return create_buffer_from_data({}, real_filename,
Buffer::Flags::File, st.st_mtime);
const char* data = (const char*)mmap(nullptr, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); const char* data = (const char*)mmap(nullptr, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
auto unmap = on_scope_end([&]{ munmap((void*)data, st.st_size); }); auto unmap = on_scope_end([&]{ munmap((void*)data, st.st_size); });