flush stdio from libc

Author: Suavesito-Olimpiada

Project.toml

@@ -8,9 +8,7 @@ CBinding = "d43a6710-96b8-4a2d-833c-c424785e5374"
 LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 LibTeXPrintf_jll = "31c4d84e-4279-5ed4-9345-4512eef47f95"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
 
 [compat]
 CBinding = "1"
-Suppressor = "0.2"
 LaTeXStrings = "1"

src/LibTeXPrintf.jl

@@ -3,23 +3,26 @@ module LibTeXPrintf
 using Base: ImmutableDict
 using Printf: Format, argmismatch
 using LaTeXStrings
-using Suppressor
 
 include("wrapper.jl")
 using .libtexprintf
 
+include("capture.jl")
+
 
 export stexprintf, texprintf, texsymbols, texfonts, texsetfont, texgetfont
 
 function __init__()
     # this is a workaround so `stdout` can work correctly and be captured by Suppressor
-    libtexprintf.texprintf("")
+    # libtexprintf.texprintf("")
     TEXSYMBOLS[] = ImmutableDict([
         if length(line) == 4
             String(line[2] * line[3]) => String(line[4])
         else
             String(line[2]) => String(line[3])
-        end for line in split.(split(rstrip(@capture_out libtexprintf.texlistsymbols(), '\n'), '\n'))
+        end for line in split.(split(strip(capture_out() do
+                    libtexprintf.texlistsymbols()
+                end, '\n'), '\n'))
     ]...)
 end
 
@@ -172,7 +175,7 @@ julia> LibTeXPrintf.texerrors() # queue cleaned
 ```
 """
 function texerrors()
-    error = @capture_err begin
+    error = capture_err() do
         libtexprintf.texerrors()
     end
     if iszero(length(error))
@@ -318,7 +321,9 @@ function texprintf(io::IO, format::String, args...)
     else
         length(args) == 0 || argmismatch(0, length(args))
     end
-    out = @capture_out libtexprintf.texprintf(format, args...)
+    out = capture_out() do
+        libtexprintf.texprintf(format, args...)
+    end
     if !iszero(libtexprintf.TEXPRINTF_ERR[])
         error = texerrors()
         throw(ArgumentError(error))

src/capture.jl

@@ -0,0 +1,45 @@
+# taken from Suppressor, but flush stdio from libc
+
+function capture_out(cb)
+    if ccall(:jl_generating_output, Cint, ()) == 0
+        original_stdout = stdout
+        out_rd, out_wr = redirect_stdout()
+        out_reader = @async read(out_rd, String)
+    end
+    try
+        cb()
+        Base.Libc.flush_cstdio()
+    finally
+        if ccall(:jl_generating_output, Cint, ()) == 0
+            redirect_stdout(original_stdout)
+            close(out_wr)
+        end
+    end
+    if ccall(:jl_generating_output, Cint, ()) == 0
+        fetch(out_reader)
+    else
+        ""
+    end
+end
+
+function capture_err(cb)
+    if ccall(:jl_generating_output, Cint, ()) == 0
+        original_stderr = stderr
+        err_rd, err_wr = redirect_stderr()
+        err_reader = @async read(err_rd, String)
+    end
+    try
+        cb()
+        Base.Libc.flush_cstdio()
+    finally
+        if ccall(:jl_generating_output, Cint, ()) == 0
+            redirect_stderr(original_stderr)
+            close(err_wr)
+        end
+    end
+    if ccall(:jl_generating_output, Cint, ()) == 0
+        fetch(err_reader)
+    else
+        ""
+    end
+end

src/wrapper.jl

@@ -14,7 +14,7 @@ let
     end
 end
 
-const c"size_t" = Csize_t
+const c"size_t"  = Csize_t
 const c"FILE"    = Cvoid
 const c"va_list" = Cvoid