X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=af2bcd73b4337e06689c74615a2310b0cf60996f;hb=891168789fc24185ad592b16c707970253e29d6c;hp=e74bf0bf1627b2a8e96ed232d923194a9cd396c6;hpb=86713eefa608f7dc738420ce0225c2a92c4539b2;p=lilypond.git diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index e74bf0bf16..af2bcd73b4 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -102,8 +102,8 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file", LY_DEFINE (ly_dir_p, "ly:dir?", 1, 0, 0, (SCM s), - "Is @var{s} a direction? Valid directions are @code{-1}," - " @code{0}, or@tie{}@code{1}, where @code{-1} represents" + "Is @var{s} a direction? Valid directions are @w{@code{-1}}," + " @code{0}, or@tie{}@code{1}, where @w{@code{-1}} represents" " left or down, @code{1}@tie{}represents right or up, and @code{0}" " represents a neutral direction.") { @@ -187,7 +187,7 @@ LY_DEFINE (ly_string_percent_encode, "ly:string-percent-encode", 1, 0, 0, (SCM str), "Encode all characters in string @var{str} with hexadecimal" " percent escape sequences, with the following exceptions:" - " characters @code{-}, @code{.}, @code{/}, and @code{_}; and" + " characters @w{@code{-},} @code{.}, @code{/}, and @code{_}; and" " characters in ranges @code{0-9}, @code{A-Z}, and @code{a-z}.") { LY_ASSERT_TYPE (scm_is_string, str, 1); @@ -379,13 +379,16 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect", LY_ASSERT_TYPE (scm_is_string, file_name, 1); string m = "w"; + string f = ly_scm2string (file_name); FILE *stderrfile; - if (mode != SCM_UNDEFINED && scm_string_p (mode)) + if (scm_is_string (mode)) m = ly_scm2string (mode); /* dup2 and (fileno (current-error-port)) do not work with mingw'c gcc -mwindows. */ fflush (stderr); - stderrfile = freopen (ly_scm2string (file_name).c_str (), m.c_str (), stderr); + stderrfile = freopen (f.c_str (), m.c_str (), stderr); + if (!stderrfile) + error (_f ("failed redirecting stderr to `%s'", f.c_str ())); return SCM_UNSPECIFIED; }