X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=2245a71396eae47652a074982db1f5747c3adf1b;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=c8f0b12d64d27ccc434f6b4c46ba360baa6f574d;hpb=998a8bd9765808b0419b1b66a4ee7947e6534cc5;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index c8f0b12d64..2245a71396 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ #include "main.hh" @@ -11,24 +11,38 @@ #include #include #include +#include +using namespace std; + +#include +#include +#include #include "config.hh" +#if HAVE_GRP_H +#include +#endif +#if HAVE_PWD_H +#include +#endif #if HAVE_GETTEXT #include #endif #include "all-font-metrics.hh" #include "file-name.hh" +#include "freetype.hh" #include "getopt-long.hh" #include "global-ctor.hh" -#include "kpath.hh" #include "lily-guile.hh" #include "lily-version.hh" #include "misc.hh" #include "output-def.hh" +#include "string-convert.hh" +#include "version.hh" #include "warn.hh" -#include "freetype.hh" +#include "program-option.hh" /* * Global options that can be overridden through command line. @@ -40,130 +54,160 @@ Array dump_header_fieldnames_global; /* Name of initialisation file. */ String init_name_global; -/* Do not calculate and write layout output? */ -bool no_layout_global_b = false; - -/* Selected output format. - One of tex, ps, scm, as. -*/ +/* Selected output backend + One of (gnome, ps [default], scm, svg, tex, texstr)") */ String output_backend_global = "ps"; -String output_format_global = "pdf"; +/* Output formats to generate. */ +String output_format_global = ""; + +bool is_pango_format_global; +bool is_TeX_format_global; /* Current output name. */ String output_name_global; /* Run in safe mode? */ -bool safe_global_b = false; +bool be_safe_global = false; + +/* Provide URI links to the original file */ +bool point_and_click_global = true; /* Verbose progress indication? */ -bool verbose_global_b = false; +bool be_verbose_global = false; -/* Scheme code to execute before parsing, after .scm init - This is where -e arguments are appended to. -*/ -String init_scheme_code_string = "(begin #t "; +/* Scheme code to execute before parsing, after .scm init. + This is where -e arguments are appended to. */ +String init_scheme_code_string; +String init_scheme_variables; +/* Generate preview of first system. */ bool make_preview = false; -bool make_pages = true; +/* Generate printed output. */ +bool make_print = true; /* * Miscellaneous global stuff. */ File_path global_path; - /* * File globals. */ -static char const *AUTHORS = -" Han-Wen Nienhuys \n" -" Jan Nieuwenhuizen \n"; +static char const *AUTHORS += " Han-Wen Nienhuys \n" + " Jan Nieuwenhuizen \n"; static char const *PROGRAM_NAME = "lilypond"; static char const *PROGRAM_URL = "http://lilypond.org"; -static char const *NOTICE = -_i ("This program is free software. It is covered by the GNU General Public\n" - "License and you are welcome to change it and/or distribute copies of it\n" - "under certain conditions. Invoke as `lilypond --warranty' for more\n" - "information.\n"); - -static char const *WARRANTY = -_i (" This program is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU General Public License version 2\n" - "as published by the Free Software Foundation.\n" - "\n" - " This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "General Public License for more details.\n" - "\n" - " You should have received a copy (refer to the file COPYING) of the\n" - "GNU General Public License along with this program; if not, write to\n" - "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n" - "Boston, MA 02111-1307, USA.\n"); - +static char const *NOTICE += _i ("This program is free software. It is covered by the GNU General Public\n" + "License and you are welcome to change it and/or distribute copies of it\n" + "under certain conditions. Invoke as `%s --warranty' for more\n" + "information.\n"); + +static char const *WARRANTY += _i (" This program is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU General Public License version 2\n" + "as published by the Free Software Foundation.\n" + "\n" + " This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" + "General Public License for more details.\n" + "\n" + " You should have received a copy (refer to the file COPYING) of the\n" + "GNU General Public License along with this program; if not, write to\n" + "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n" + "Boston, MA 02111-1307, USA.\n"); /* Where the init files live. Typically: LILYPOND_DATADIR = /usr/share/lilypond - LOCAL_LILYPOND_DATADIR = /usr/share/lilypond/ */ -char const *prefix_directory[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; +*/ +String prefix_directory; + +/* The jail specification: USER,GROUP,JAIL,DIR. */ +String jail_spec; /* The option parser */ static Getopt_long *option_parser = 0; /* Internationalisation kludge in two steps: - * use _i () to get entry in POT file - * call gettext () explicitely for actual "translation" */ - -static Long_option_init options_static[] = - { - {_i ("EXPR"), "evaluate", 'e', - _i ("set option, use -e '(ly:option-usage)' for help")}, - /* Bug in option parser: --output =foe is taken as an abbreviation - for --output-format. */ - {_i ("EXT"), "backend", 'b', _i ("select back-end to use")}, - {_i ("EXTs"), "format", 'f', _i ("list of formats to dump")}, - {0, "help", 'h', _i ("print this help")}, - {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, - {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, - {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, - {0, "no-layout", 'm', _i ("produce MIDI output only")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, - {0, "preview", 'p', _i ("generate a preview")}, - {0, "no-pages", 0, _i ("don't generate full pages")}, - {0, "png", 0, _i ("generate PNG")}, - {0, "ps", 0, _i ("generate PostScript")}, - {0, "dvi", 0, _i ("generate DVI")}, - {0, "pdf", 0, _i ("generate PDF (default)")}, - {0, "tex", 0, _i ("generate TeX")}, - {0, "safe-mode", 's', _i ("run in safe mode")}, - {0, "version", 'v', _i ("print version number")}, - {0, "verbose", 'V', _i ("be verbose")}, - {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0,0} - }; + * use _i () to get entry in POT file + * call gettext () explicitely for actual "translation" */ + +static Long_option_init options_static[] += { + {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\nscm, svg, tex, texstr)")}, + + {_i ("SYM=VAL"), "define-default", 'd', + _i ("set a Scheme program option. Uses #t if VAL is not specified\n" + "Try -dhelp for help.")}, + + {_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")}, + /* Bug in option parser: --output =foe is taken as an abbreviation + for --output-format. */ + {_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,... Also as separate options:")}, + {0, "dvi", 0, _i ("generate DVI (tex backend only)")}, + {0, "pdf", 0, _i ("generate PDF (default)")}, + {0, "png", 0, _i ("generate PNG")}, + {0, "ps", 0, _i ("generate PostScript")}, + {0, "tex", 0, _i ("generate TeX (tex backend only)")}, + {0, "help", 'h', _i ("print this help")}, + {_i ("FIELD"), "header", 'H', _i ("dump a header field to file BASENAME.FIELD")}, + {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, + {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, +#if HAVE_CHROOT + {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n" + "and cd into DIR")}, +#endif + {0, "no-print", 0, _i ("do not generate printed output")}, + {0, "preview", 'p', _i ("generate a preview of the first system")}, + {0, "safe-mode", 's', _i ("run in safe mode")}, + {0, "version", 'v', _i ("print version number")}, + {0, "verbose", 'V', _i ("be verbose")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0, 0, 0, 0} +}; + +#define LILYPOND_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION + +static void +env_var_info (FILE *out, char const *key) +{ + if (char const *value = getenv (key)) + fprintf (out, "%s=\"%s\"\n", key, value); +} static void dir_info (FILE *out) { fputs ("\n", out); - fprintf (out, "LILYPOND_DATADIR =\"%s\"\n", LILYPOND_DATADIR); - fprintf (out, "LOCAL_LILYPOND_DATADIR =\"\%s\"\n", LOCAL_LILYPOND_DATADIR); - fprintf (out, "LOCALEDIR =\"%s\"\n", LOCALEDIR); - - char *lilypond_prefix = getenv ("LILYPONDPREFIX"); - fprintf (out, "LILYPONDPREFIX =\"%s\"\n", - (lilypond_prefix ? lilypond_prefix : "")); + fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR); + env_var_info (out, "LILYPONDPREFIX"); + fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); + + fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.to_str0 ()); + +#if ARGV0_RELOCATION + env_var_info (out, "FONTCONFIG_FILE"); + env_var_info (out, "FONTCONFIG_PATH"); + env_var_info (out, "GS_FONTPATH"); + env_var_info (out, "GS_LIB"); + env_var_info (out, "GUILE_LOAD_PATH"); + env_var_info (out, "PANGO_RC_FILE"); + env_var_info (out, "PATH"); +#endif } static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2004", + "1996--2005", AUTHORS).to_str0 ()); printf ("\n"); } @@ -174,18 +218,19 @@ identify (FILE *out) fputs (gnu_lilypond_version_string ().to_str0 (), out); fputs ("\n", out); } - + static void notice () { identify (stdout); - printf (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); printf ("\n"); copyright (); } -static void -usage () +LY_DEFINE (ly_usage, "ly:usage", + 0, 0, 0, (), + "Print usage message.") { /* No version number or newline here. It confuses help2man. */ printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); @@ -203,6 +248,7 @@ usage () printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); printf ("\n"); printf ("\n"); + return SCM_UNSPECIFIED; } static void @@ -215,33 +261,161 @@ warranty () printf (_ (WARRANTY).to_str0 ()); } +static int +sane_putenv (char const *key, String value, bool overwrite = true) +{ + if (overwrite || !getenv (key)) + { + String combine = String (key) + "=" + value; + char *s = strdup (combine.to_str0 ()); + return putenv (s); + } + return -1; +} + +#if ARGV0_RELOCATION +static int +set_env_file (char const *key, String value) +{ + if (is_file (value)) + return sane_putenv (key, value, false); + else if (be_verbose_global) + warning (_f ("no such file: %s", value)); + return -1; +} + +static int +prepend_env_path (char const *key, String value) +{ + if (is_dir (value)) + { + if (char const *cur = getenv (key)) + value += to_string (PATHSEP) + cur; + return sane_putenv (key, value.to_str0 ()); + } + else if (be_verbose_global) + warning (_f ("no such directory: %s", value)); + return -1; +} + +String +dir_name (String const file_name) +{ + String s = file_name; + s.substitute ('\\', '/'); + s = s.left_string (s.index_last ('/')); + return s; +} +#endif + +#ifdef __MINGW32__ +#include +#endif + static void -setup_paths () +setup_paths (char const *argv0) { - if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) - prefix_directory[1] = lilypond_prefix; + prefix_directory = LILYPOND_DATADIR; + +#if ARGV0_RELOCATION + + if (getenv ("LILYPOND_VERBOSE")) + be_verbose_global = true; + + String bindir = dir_name (argv0); + String argv0_prefix = dir_name (bindir); + if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory)))) + { + if (be_verbose_global) + warning (_f ("argv0 relocation: argv0=%s, prefix=%s", argv0, + prefix_directory)); + String datadir = argv0_prefix + "/share"; + String libdir = argv0_prefix + "/lib"; + String localedir = datadir + "/locale"; + String sysconfdir = argv0_prefix + "/etc"; + String argv0_lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION; + + if (is_dir (argv0_lilypond_datadir)) + prefix_directory = argv0_lilypond_datadir; + +#if HAVE_GETTEXT + if (is_dir (localedir)) + bindtextdomain ("lilypond", localedir.to_str0 ()); +#endif + + set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf"); +#ifdef __MINGW32__ + char font_dir[PATH_MAX]; + ExpandEnvironmentStrings ("%windir%/fonts", font_dir, sizeof (font_dir)); + prepend_env_path ("GS_FONTPATH", font_dir); +#endif + + /* FIXME: *cough* 8.15 *cough* */ + prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/8.15/fonts"); + prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/Resource"); + prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/lib"); + + prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts"); + prepend_env_path ("GS_LIB", datadir + "/gs/Resource"); + prepend_env_path ("GS_LIB", datadir + "/gs/lib"); + + prepend_env_path ("GUILE_LOAD_PATH", datadir + + to_string ("/guile/%d.%d", + SCM_MAJOR_VERSION, SCM_MINOR_VERSION)); + set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc"); + prepend_env_path ("PATH", bindir); + } +#else + (void) argv0; +#endif /* ARGV0_RELOCATION */ + + /* FIXME: use LILYPOND_DATADIR. */ + if (char const *env = getenv ("LILYPONDPREFIX")) + { +#ifdef __MINGW32__ + /* Normalize file name. */ + env = File_name (env).to_string ().get_copy_str0 (); +#endif + prefix_directory = env; + } global_path.append (""); /* Adding mf/out make lilypond unchanged source directory, when setting LILYPONDPREFIX to lilypond-x.y.z */ - char *suffixes[] = {"ly", "otf", "mf/out", "scm", "tfm", "ps", "svg", 0}; - - for (unsigned i = 0; prefix_directory[i]; i++) - for (char **s = suffixes; *s; s++) - { - String p = prefix_directory[i] + to_string ('/') + String (*s); - global_path.prepend (p); - -#if !KPATHSEA - /* Urg: GNU make's $ (word) index starts at 1 */ - int i = 1; - while (global_path.try_append (p + to_string (".") + to_string (i))) - i++; -#endif - } -} + char *suffixes[] = {"ly", "ps", "scm", 0 }; + + Array dirs; + for (char **s = suffixes; *s; s++) + { + String path = prefix_directory + to_string ('/') + String (*s); + dirs.push (path); + } + + /* + When running from build dir, a full LILYPOND_PREFIX is set-up at + + share/lilypond/TOPLEVEL_VERSION + + This historical hack will allow the shorthand + + LILYPONDPREFIX=. lily/out/lilypond ... + + */ + struct stat statbuf; + String build_prefix = prefix_directory + "share/lilypond/" TOPLEVEL_VERSION; + if (stat (build_prefix.to_str0 (), &statbuf) == 0) + prefix_directory = build_prefix; + dirs.push (prefix_directory + "/fonts/otf/"); + dirs.push (prefix_directory + "/fonts/type1/"); + dirs.push (prefix_directory + "/fonts/cff/"); + dirs.push (prefix_directory + "/fonts/svg/"); + + for (int i = 0; i < dirs.size (); i++) + global_path.prepend (dirs[i]); +} + static void prepend_load_path (String dir) { @@ -250,30 +424,138 @@ prepend_load_path (String dir) } void init_global_tweak_registry (); +void init_fontconfig (); + +#if HAVE_CHROOT +static void +do_chroot_jail () +{ + /* Now we chroot, setuid/setgrp and chdir. If something goes wrong, + we exit (this is a security-sensitive area). First we split + jail_spec into its components, then we retrieve the user/group id + (necessarily *before* chroot'ing) and finally we perform the + actual actions. */ + + enum Jail + { + USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX + }; + + Array components = String_convert::split (jail_spec, ','); + if (components.size () != JAIL_MAX) + { + error (_f ("expected %d arguments with jail, found: %d", JAIL_MAX, + components.size ())); + exit (2); + } + + /* Hmm. */ + errno = 0; + + int uid; + if (passwd * passwd = getpwnam (components[USER_NAME].to_str0 ())) + uid = passwd->pw_uid; + else + { + if (errno == 0) + error (_f ("no such user: %s", components[USER_NAME])); + else + error (_f ("can't get user id from user name: %s: %s", + components[USER_NAME], + strerror (errno))); + exit (3); + } + + /* Hmm. */ + errno = 0; + + int gid; + if (group * group = getgrnam (components[GROUP_NAME].to_str0 ())) + gid = group->gr_gid; + else + { + if (errno == 0) + error (_f ("no such group: %s", components[GROUP_NAME])); + else + error (_f ("can't get group id from group name: %s: %s", + components[GROUP_NAME], + strerror (errno))); + exit (3); + } + + if (chroot (components[JAIL].to_str0 ())) + { + error (_f ("can't chroot to: %s: %s", components[JAIL], + strerror (errno))); + exit (3); + } + + if (setgid (gid)) + { + error (_f ("can't change group id to: %d: %s", gid, strerror (errno))); + exit (3); + } + + if (setuid (uid)) + { + error (_f ("can't change user id to: %d: %s", uid, strerror (errno))); + exit (3); + } + + if (chdir (components[DIR].to_str0 ())) + { + error (_f ("can't change working directory to: %s: %s", components[DIR], + strerror (errno))); + exit (3); + } +} +#endif static void main_with_guile (void *, int, char **) { /* Engravers use lily.scm contents, need to make Guile find it. Prepend onto GUILE %load-path, very ugh. */ - for (unsigned i = 0; prefix_directory[i]; i++) - { - prepend_load_path (prefix_directory[i]); - /* Junk this. We should make real modules iso. just loading files. */ - prepend_load_path (String (prefix_directory[i]) + "/scm"); - } - if (verbose_global_b) + prepend_load_path (prefix_directory); + prepend_load_path (prefix_directory + "/scm"); + + if (be_verbose_global) dir_info (stderr); + is_TeX_format_global = (output_backend_global == "tex" + || output_backend_global == "texstr"); + + is_pango_format_global = !is_TeX_format_global; ly_c_init_guile (); call_constructors (); + ly_set_option (ly_symbol2scm ("verbose"), scm_from_bool (be_verbose_global)); + init_global_tweak_registry (); + init_fontconfig (); + init_freetype (); + all_fonts_global = new All_font_metrics (global_path.to_string ()); - init_scheme_code_string += ")"; - scm_c_eval_string ((char*) init_scheme_code_string.to_str0 ()); + if (!init_scheme_variables.is_empty () + || !init_scheme_code_string.is_empty ()) + { + init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr x))) (list " + + init_scheme_variables + "))"; + + init_scheme_code_string + += "(begin #t " + + init_scheme_variables + + init_scheme_code_string + + ")"; + + char const *str0 = init_scheme_code_string.to_str0 (); + + if (be_verbose_global) + progress_indication (_f ("Evaluating %s", str0)); + scm_c_eval_string ((char *) str0); + } /* We accept multiple independent music files on the command line to reduce compile time when processing lots of small files. @@ -289,19 +571,14 @@ main_with_guile (void *, int, char **) delete option_parser; option_parser = 0; - if (files == SCM_EOL) - { - /* No FILE arguments is now a usage error to help newbies. If you - want a filter, you're not a newbie and should know to use file - argument `-'. */ - usage (); - exit (2); - } +#if HAVE_CHROOT + if (!jail_spec.is_empty ()) + do_chroot_jail (); +#endif SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); (void) result; - /* Unreachable. */ exit (0); } @@ -312,51 +589,69 @@ setup_localisation () #if HAVE_GETTEXT /* Enable locales */ setlocale (LC_ALL, ""); - + /* FIXME: check if this is still true. - Disable localisation of float values. This breaks TeX output. */ + Disable localisation of float values. This breaks TeX output. */ setlocale (LC_NUMERIC, "C"); - - String name (PACKAGE); - name.to_lower (); - bindtextdomain (name.to_str0 (), LOCALEDIR); - textdomain (name.to_str0 ()); + + String localedir = LOCALEDIR; + if (char const *env = getenv ("LILYPOND_LOCALEDIR")) + localedir = env; + + bindtextdomain ("lilypond", localedir.to_str0 ()); + textdomain ("lilypond"); #endif } static void add_output_format (String format) { - if (output_name_global != "") - output_name_global += ","; - output_name_global += format; + if (output_format_global != "") + output_format_global += ","; + output_format_global += format; } - static void parse_argv (int argc, char **argv) { - bool help_b = false; + bool show_help = false; option_parser = new Getopt_long (argc, argv, options_static); while (Long_option_init const *opt = (*option_parser) ()) { switch (opt->shortname_char_) { case 0: - if (String (opt->longname_str0_) == "png" + if (String (opt->longname_str0_) == "dvi" || String (opt->longname_str0_) == "pdf" + || String (opt->longname_str0_) == "png" || String (opt->longname_str0_) == "ps" - || String (opt->longname_str0_) == "dvi" || String (opt->longname_str0_) == "tex") - { - add_output_format (opt->longname_str0_); - } + add_output_format (opt->longname_str0_); else if (String (opt->longname_str0_) == "preview") make_preview = true; else if (String (opt->longname_str0_) == "no-pages") - make_pages = false; + make_print = false; + break; + + case 'd': + { + String arg (option_parser->optional_argument_str0_); + int eq = arg.index ('='); + + String key = arg; + String val = "#t"; + + if (eq >= 0) + { + key = arg.left_string (eq); + val = arg.right_string (arg.length () - eq - 1); + } + + init_scheme_variables + += "(cons \'" + key + " " + val + ")\n"; + } break; - + case 'v': notice (); exit (0); @@ -368,6 +663,9 @@ parse_argv (int argc, char **argv) output_name_global = file_name.to_string (); } break; + case 'j': + jail_spec = option_parser->optional_argument_str0_; + break; case 'e': init_scheme_code_string += option_parser->optional_argument_str0_; break; @@ -375,6 +673,7 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; + case 'b': output_backend_global = option_parser->optional_argument_str0_; break; @@ -382,7 +681,7 @@ parse_argv (int argc, char **argv) case 'f': output_format_global = option_parser->optional_argument_str0_; break; - + case 'H': dump_header_fieldnames_global .push (option_parser->optional_argument_str0_); @@ -394,16 +693,13 @@ parse_argv (int argc, char **argv) init_name_global = option_parser->optional_argument_str0_; break; case 'h': - help_b = true; + show_help = true; break; case 'V': - verbose_global_b = true; + be_verbose_global = true; break; case 's': - safe_global_b = true; - break; - case 'm': - no_layout_global_b = true; + be_safe_global = true; break; case 'p': make_preview = true; @@ -416,27 +712,47 @@ parse_argv (int argc, char **argv) } } - if (help_b) + if (output_format_global == "") + output_format_global = "pdf"; + + if (show_help) { identify (stdout); - usage (); - if (verbose_global_b) + ly_usage (); + if (be_verbose_global) dir_info (stdout); exit (0); } } +void +setup_guile_env () +{ + char *yield = getenv ("LILYPOND_GC_YIELD"); + bool overwrite = true; + if (!yield) + { + yield = "70"; + overwrite = false; + } + + sane_putenv ("GUILE_MIN_YIELD_1", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_2", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); +} + int main (int argc, char **argv) { setup_localisation (); - setup_paths (); + setup_paths (argv[0]); + setup_guile_env (); parse_argv (argc, argv); - identify (stderr); - initialize_kpathsea (argv[0]); + if (isatty (STDIN_FILENO)) + identify (stderr); scm_boot_guile (argc, argv, main_with_guile, 0); - /* Unreachable */ - return 0; + /* Only reachable if GUILE exits. That is an error. */ + return 1; }