Update charater converter steams to funnel statefull logic, including windows console implementation and fix cat_ext exmaple, tested on Windows

Author: incoder1

examples/cat_ext/cat_ext.cbp

@@ -13,9 +13,7 @@
 				<Option compiler="gcc" />
 				<Option parameters="utf8-bom.txt" />
 				<Compiler>
-					<Add option="-std=gnu++23" />
-					<Add option="-ggdb" />
-					<Add option="-Og" />
+					<Add option="-std=gnu++26" />
 					<Add option="-g" />
 					<Add option="-fexceptions" />
 					<Add option="-D_WIN32_WINNT=0x0A00" />

examples/cat_ext/main.cpp

@@ -1,127 +1,118 @@
 /*
- *
- * Copyright (c) 2016-2023
+ * Copyright (c) 2016-2026
  * Viktor Gubin
  *
  * Use, modification and distribution are subject to the
  * Boost Software License, Version 1.0. (See accompanying file
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-/*
- * This example demonstrate IO library text API possibilities
- * It works as POSIX utility cat https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/cat.html
- * and in the same time auto-detect input file character set and convert it to system UNCODE before printing to console
- */
-
 #include <vector>
-
 #include <io/core/files.hpp>
 #include <io/console/console.hpp>
-
 #include <io/textapi/charset_detector.hpp>
 #include <io/textapi/charset_converter.hpp>
 
-void print_error(io::console_error_stream& err,const char* reason, const char* f, const char* what);
-void file_to_console(std::error_code& ec,io::file&& f, io::console_out_writer& out);
+/// Prints an error into console if any
+void print_error(io::console_error_stream& err, const char* reason, const char* f, const char* what);
+/// Prints a text file into console, detect character set automatically and reconvert into system UNICODE
+void file_to_console(std::error_code& ec, io::file&& f, io::console_out_writer& out);
 
 int main(int argc, const char** argv)
 {
     int ret = ERROR_SUCCESS;
 
     io::console cons;
     io::console_error_stream cerr(cons);
-
     io::console_out_writer out(cons);
 
-    if(argc < 2) {
-        cerr <<  io::cclr::light_red << "No files to display." << io::cclr::reset << std::endl << std::endl;
+    if (argc < 2) {
+        cerr << io::cclr::light_red << "No files to display." << io::cclr::reset << std::endl << std::endl;
         cerr << "\tCommand usage : ";
-        cerr <<  io::cclr::navy_green << "cat_ext " << io::cclr::reset;
+        cerr << io::cclr::navy_green << "cat_ext " << io::cclr::reset;
         cerr << '[' << io::cclr::magenta << "file..." << io::cclr::reset << ']' << std::endl;
-        ret = EINVAL;
+        return EINVAL;
     }
 
     std::error_code ec;
-    for(std::size_t i =1; i < static_cast<std::size_t>(argc); i++) {
+    for (std::size_t i = 1; i < static_cast<std::size_t>(argc); i++) {
         io::file src_file(argv[i]);
-        if( !src_file.exist() ) {
+        if (!src_file.exist()) {
             ret = ENOENT;
-            print_error(cerr,"Requested",argv[i],"not found");
+            print_error(cerr, "Requested", argv[i], "not found");
             break;
         }
-        file_to_console(ec,std::move(src_file), out);
-        if(ec) {
+
+        file_to_console(ec, std::move(src_file), out);
+        if (ec) {
             ret = ec.value();
-            print_error(cerr,"Issue with",argv[i], ec.message().data() );
+            print_error(cerr, "Issue with", argv[i], ec.message().data());
             break;
         }
     }
 
     return ret;
 }
 
-
-void print_error(io::console_error_stream& err,const char* reason, const char* f, const char* what)
+void print_error(io::console_error_stream& err, const char* reason, const char* f, const char* what)
 {
-    err <<  io::cclr::light_red << "Error" << io::cclr::reset << ": ";
+    err << io::cclr::light_red << "Error" << io::cclr::reset << ": ";
     err << reason << " file ";
     err << io::cclr::yellow << f << io::cclr::reset;
     err << ' ' << what << io::cclr::reset << std::endl;
 }
 
-#ifdef __IO_WINDOWS_BACKEND__
-static const char* WENDL = "\r\n";
-#else
-static const char* WENDL = "\n";
-#endif // __IO_WINDOWS_BACKEND__
-
-
-io::s_pump data_pump_for_charset(std::error_code& ec,const io::s_read_channel& rch, const io::charset* chst, io::byte_buffer&& buff)
+io::s_pump data_pump_for_charset(std::error_code& ec, const io::s_read_channel& rch, const io::charset* chst, io::byte_buffer&& buff)
 {
-    io::s_pump ret;
-    if(io::code_pages::utf8() == chst)
-        ret = io::buffered_channel_pump::create(ec, rch, std::forward<io::byte_buffer>(buff) );
-    else
-        ret = io::charset_converting_channel_pump::create(ec, rch, chst, io::code_pages::utf8(), std::forward<io::byte_buffer>(buff) );
-    return ret;
+    if (io::code_pages::utf8() == chst) {
+        return io::buffered_channel_pump::create(ec, rch, std::move(buff));
+    }
+    return io::charset_converting_channel_pump::create(ec, rch, chst, io::code_pages::utf8(), std::move(buff));
 }
 
-void file_to_console(std::error_code& ec,io::file&& f, io::console_out_writer& out)
+void file_to_console(std::error_code& ec, io::file&& f, io::console_out_writer& out)
 {
     io::s_read_channel rch = f.open_for_read(ec);
-    if(!ec) {
-        // detect character set
-        io::byte_buffer buff = io::byte_buffer::allocate(ec, 1024);
-        if(!ec) {
-            std::size_t read = rch->read(ec, const_cast<uint8_t*>(buff.position().get()), buff.capacity());
-            if(!ec && read > 0 ) {
-                io::s_charset_detector chdet = io::charset_detector::create(ec);
-                buff.move(read);
-                buff.flip();
-                auto detect_status = chdet->detect( ec, buff.position().get(), read );
-                if(!ec) {
-                    if(!detect_status) {
-                        ec = std::make_error_code(std::errc::illegal_byte_sequence);
-                    }
-                    else {
-                        out.write("Detected : ");
-                        out.write(detect_status.character_set()->name());
-                        out.write(WENDL);
-                        io::s_pump pmp = data_pump_for_charset(ec, rch, detect_status.character_set(), std::move(buff) );
-                        if(!ec) {
-                            io::reader in( std::move(pmp) );
-                            char tmp[1024] = {'\0'};
-                            std::size_t read = 0;
-                            do {
-                                read = in.read(ec, tmp, 1024);
-                                if(read > 0 && !ec)
-                                    out.write(tmp, read);
-                            } while(read > 0 && !ec);
-                        }
-                    }
-                }
-            }
-        }
+    if (ec)
+        return;
+
+    io::byte_buffer buff = io::byte_buffer::allocate(ec, 1024);
+    if (ec)
+        return;
+
+    // Read initial block to detect character set
+    std::size_t bytes_read = rch->read(ec, const_cast<uint8_t*>(buff.position().get()), buff.capacity());
+    if (ec || bytes_read == 0)
+        return;
+
+    io::s_charset_detector chdet = io::charset_detector::create(ec);
+    if (ec)
+        return;
+
+    buff.move(bytes_read);
+    buff.flip();
+
+    auto detect_status = chdet->detect(ec, buff.position().get(), bytes_read);
+    if (ec)
+        return;
+
+    if (!detect_status) {
+        ec = std::make_error_code(std::errc::illegal_byte_sequence);
+        return;
+    }
+
+    // Print detected charset
+    out.write("Detected : ");
+    out.writeln(detect_status.character_set()->name());
+
+    io::s_pump pmp = data_pump_for_charset(ec, rch, detect_status.character_set(), std::move(buff));
+    if (ec)
+        return;
+
+    // Stream the converted content directly to the console
+    io::reader in(std::move(pmp));
+    char tmp[1024];
+    while ((bytes_read = in.read(ec, tmp, sizeof(tmp))) > 0 && !ec) {
+        out.write(tmp, bytes_read);
     }
 }

libio/include/io/config/compiler/gcc.hpp

@@ -149,7 +149,7 @@
 #	define io_snprintf __builtin_snprintf
 #endif
 
-// in case of intel compiler
+// in case of Intel compiler
 #ifdef __ICC
 #	define io_clz(__x) _lzcnt_u32((__x))
 #	ifdef  __LP64__