Skip to content

Issue #451 - Allow recfm=f specs to use stdin #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yoavnir merged 1 commit into from
Jun 25, 2026
Merged

Issue #451 - Allow recfm=f specs to use stdin #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manpage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2168,7 +2168,7 @@ Sets the record format for the primary input stream. Supported options are
.B D (delimited)
for records delimited by a character in the input stream (this is the default);
.B F (fixed)
for records or a fixed length (see --lrecl);
for records of a fixed length (see --lrecl);
.B FD (fixed-delimited)
for records delimited as in
.B fixed,
Expand Down
23 changes: 14 additions & 9 deletions specs/src/processing/Reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ PSpecString Reader::peek(int offset)


StandardReader::StandardReader() {
m_NeedToClose = false;
m_EOF = false;
m_buffer = nullptr;
m_recfm = RECFM_DELIMITED;
Expand All @@ -140,7 +139,6 @@ StandardReader::StandardReader(std::istream* f) {
m_EOF = true;
}
m_File = std::shared_ptr<std::istream>(f);
m_NeedToClose = false;
m_buffer = nullptr;
m_recfm = RECFM_DELIMITED;
m_lineDelimiter = 0;
Expand All @@ -157,7 +155,6 @@ StandardReader::StandardReader(std::string& fn) {
std::string err = "File not found: " + fn;
MYTHROW(err);
}
m_NeedToClose = true;
m_EOF = false;
m_buffer = nullptr;
m_recfm = RECFM_DELIMITED;
Expand All @@ -170,7 +167,6 @@ StandardReader::StandardReader(std::string& fn) {

StandardReader::StandardReader(pipeType pipe) {
m_pipe = pipe;
m_NeedToClose = false;
m_EOF = false;
m_buffer = nullptr;
m_recfm = RECFM_DELIMITED;
Expand All @@ -182,7 +178,7 @@ StandardReader::StandardReader(pipeType pipe) {
}

StandardReader::~StandardReader() {
if (m_NeedToClose) {
if (m_File) {
auto pInputFile = std::dynamic_pointer_cast<std::ifstream>(m_File);
if (pInputFile) pInputFile->close();
}
Expand Down Expand Up @@ -278,7 +274,7 @@ PSpecString StandardReader::getNextRecordInternal() {
case RECFM_DELIMITED: {
if (0 != m_lineDelimiter) {
m_Timer.changeClass(timeClassIO);
if (m_NeedToClose) {
if (m_File) {
ok = std::getline(*m_File, line, m_lineDelimiter) ? true : false;
} else if (m_pipe) {
int c = fgetc(m_pipe.get());
Expand All @@ -302,7 +298,7 @@ PSpecString StandardReader::getNextRecordInternal() {
} else {
bool ok;
m_Timer.changeClass(timeClassIO);
if (m_NeedToClose) {
if (m_File) {
ok = std::getline(*m_File, line) ? true : false;
} else if (m_pipe) {
int c = fgetc(m_pipe.get());
Expand Down Expand Up @@ -342,10 +338,19 @@ PSpecString StandardReader::getNextRecordInternal() {
return std::make_shared<std::string>(line);
}
case RECFM_FIXED: {
std::streamsize bytesRead;
m_Timer.changeClass(timeClassIO);
m_File->read(m_buffer, m_lrecl);
if (m_File) {
m_File->read(m_buffer, m_lrecl);
bytesRead = m_File->gcount();
} else if (m_pipe) {
bytesRead = (std::streamsize)fread(m_buffer, 1, m_lrecl, m_pipe.get());
} else {
std::cin.read(m_buffer, m_lrecl);
bytesRead = std::cin.gcount();
}
m_Timer.changeClass(timeClassProcessing);
if (m_File->gcount() < m_lrecl) {
if (bytesRead < (std::streamsize)m_lrecl) {
if (!m_EOF) g_readRecordCounter++;
m_EOF = true;
return nullptr;
Expand Down
2 changes: 1 addition & 1 deletion specs/src/processing/Reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class StandardReader : public Reader {
pipeType m_pipe;
char* m_buffer;
bool m_EOF;
bool m_NeedToClose;

recordFormat m_recfm;
unsigned int m_lrecl;
char m_lineDelimiter;
Expand Down
Loading