Added missing insert/replace from standard input.

Author: dreibh

src/text-block.1

@@ -36,7 +36,7 @@
 .\" -------------------------------------------------------------------------
 .\"
 .\" ###### Setup ############################################################
-.Dd April 6, 2025
+.Dd May 9, 2025
 .Dt text-block 1
 .Os text-block
 .\" ###### Name #############################################################
@@ -169,10 +169,16 @@ Run in Highlight mode.
 Run in Delete mode.
 .It Fl F Ar insert_file | Fl Fl insert-front Ar insert_file
 Run in Insert-Front mode.
+"-" is placeholder for inserting from standard input.
+In this case, an input file is required.
 .It Fl B Ar insert_file | Fl Fl insert-back Ar insert_file
 Run in Insert-Back mode.
+"-" is placeholder for inserting from standard input.
+In this case, an input file is required.
 .It Fl R Ar insert_file | Fl Fl replace Ar insert_file
 Run in Replace mode.
+"-" is placeholder for replacing from standard input.
+In this case, an input file is required.
 .It Fl h | Fl Fl help
 Prints command-line parameters.
 .It Fl v | Fl Fl version
@@ -196,8 +202,10 @@ Sets a combined begin/end tag, i.e. the tag marks begin and end.
 Tags are mutually exclusive with line selection (--select|-s).
 .It Fl i | Fl Fl input Ar input_file
 Sets the input file.
+"-" is placeholder for reading from standard input (default).
 .It Fl o | Fl Fl output Ar output_file
 Sets the output file. By default, an existing output file will be overwritten.
+"-" is placeholder for writing to standard output (default)
 .It Fl a | Fl Fl append
 Opens the output file in append mode, appending new output instead of overwriting an existing file.
 .Op Fl m | Fl Fl min-actions

src/text-block.c

@@ -110,7 +110,9 @@ static const char*     Pointer;
 [[ noreturn ]] static void cleanUp(int exitCode)
 {
    if(InsertFile) {
-      fclose(InsertFile);
+      if(InsertFile != stdin) {
+         fclose(InsertFile);
+      }
       InsertFile = nullptr;
    }
 
@@ -162,7 +164,9 @@ static long long countLines(FILE* inputFile)
       lines++;
       line = Buffer;
    }
-   rewind(inputFile);
+   if(inputFile != stdin) {
+      rewind(inputFile);
+   }
 
    return lines;
 }
@@ -171,8 +175,6 @@ static long long countLines(FILE* inputFile)
 // ###### Write contents of insert file #####################################
 static void copyInsertFileIntoOutputFile()
 {
-   rewind(InsertFile);
-
    char    buffer[65536];
    ssize_t bytesRead;
    while( (bytesRead = fread((char*)&buffer, 1, sizeof(buffer), InsertFile)) > 0 ) {
@@ -184,6 +186,9 @@ static void copyInsertFileIntoOutputFile()
       fputs("\n", stderr);
       cleanUp(1);
    }
+   if(InsertFile != stdin) {
+      rewind(InsertFile);
+   }
 }
 
 
@@ -594,6 +599,9 @@ int main (int argc, char** argv)
 
    // ====== Open input file ================================================
    InputFile = stdin;
+   if( (InputFileName != nullptr) && (strcmp(InputFileName, "-") == 0) ) {
+      InputFileName = nullptr;   // Special case: - => stdin
+   }
    if(InputFileName != nullptr) {
       InputFile = fopen(InputFileName, "r");
       if(InputFile == nullptr) {
@@ -633,6 +641,9 @@ int main (int argc, char** argv)
 
    // ====== Open output file ===============================================
    OutputFile = stdout;
+   if( (OutputFileName != nullptr) && (strcmp(OutputFileName, "-") == 0) ) {
+      OutputFileName = nullptr;   // Special case: - => stdout
+   }
    if(OutputFileName != nullptr) {
       OutputFile = fopen(OutputFileName, (OpenOutputAppend == false) ? "w" : "a");
       if(OutputFile == nullptr) {
@@ -648,6 +659,15 @@ int main (int argc, char** argv)
    }
 
    // ====== Open insert file ===============================================
+   if( (InsertFileName != nullptr) && (strcmp(InsertFileName, "-") == 0) ) {
+      InsertFileName = nullptr;   // Special case: - => stdin
+      if(InputFile == stdin) {
+         fputs(gettext("ERROR: Insert from stdin requires an input file!"), stderr);
+         fputs("\n", stderr);
+         cleanUp(1);
+      }
+      InsertFile = stdin;
+   }
    if(InsertFileName != nullptr) {
       InsertFile = fopen(InsertFileName, "r");
       if(InsertFile == nullptr) {
@@ -660,7 +680,7 @@ int main (int argc, char** argv)
       posix_fadvise(fileno(InputFile), 0, 0, POSIX_FADV_SEQUENTIAL|POSIX_FADV_WILLNEED);
 #endif
    }
-   else {
+   if(InputFile == nullptr) {
       if( (Mode == InsertFront) || (Mode == InsertBack) || (Mode == Replace) ) {
          fputs(gettext("ERROR: No insert file provided!"), stderr);
          fputs("\n", stderr);