X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=3c0f7ae88eb7a4f28a065d1555ff4ffcf9c07aa9;hb=f5817f0eb5066fde9b0cb2b87b05ba8e776bd18b;hp=46890e593ac356c09dc05af06d81839cec24cb92;hpb=a5457b887fc91e5a582e6460c9d557a4bb077054;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 46890e593a..3c0f7ae88e 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--2007 Han-Wen Nienhuys */ #include "main.hh" @@ -11,61 +11,73 @@ #include #include #include +#include +using namespace std; +#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 "international.hh" #include "lily-version.hh" #include "misc.hh" #include "output-def.hh" +#include "program-option.hh" +#include "relocate.hh" +#include "string-convert.hh" +#include "version.hh" #include "warn.hh" -#include "freetype.hh" /* * Global options that can be overridden through command line. */ /* Names of header fields to be dumped to a separate file. */ -Array dump_header_fieldnames_global; +vector dump_header_fieldnames_global; /* Name of initialisation file. */ -String init_name_global; +string init_name_global; -/* Do not calculate and write layout output? */ -bool skip_layout_global = false; -/* Selected output format. - One of tex, ps, scm, as. -*/ -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; +string output_name_global; /* Run in safe mode? */ bool be_safe_global = false; +/* Provide URI links to the original file */ +bool point_and_click_global = true; + /* Verbose progress indication? */ 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_global; +string init_scheme_variables_global; -bool make_preview = false; -bool make_pages = true; +bool relocate_binary = true; /* @@ -73,137 +85,166 @@ bool make_pages = true; */ 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 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_directories[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; +*/ +string lilypond_datadir; + +/* 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"), "formats", '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 ("SYM[=VAL]"), "define-default", 'd', + _i ("set Scheme option SYM to VAL (default: #t).\n" + "Use -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 ("show this help and exit")}, + {_i ("FIELD"), "header", 'H', _i ("dump header field FIELD to file\n" + "named BASENAME.FIELD")}, + {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, + {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, +#if HAVE_CHROOT + {_i ("USER, GROUP, JAIL, DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n" + "and cd into DIR")}, +#endif + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, + {0, "relocate", 0, _i ("relocate using directory of lilypond program")}, + {0, "version", 'v', _i ("show version number and exit")}, + {0, "verbose", 'V', _i ("be verbose")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0, 0, 0, 0} +}; + +char const *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); + fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR); + env_var_info (out, "LILYPONDPREFIX"); + env_var_info (out, "LILYPOND_DATADIR"); + fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); - char *lilypond_prefix = getenv ("LILYPONDPREFIX"); - fprintf (out, "LILYPONDPREFIX =\"%s\"\n", - (lilypond_prefix ? lilypond_prefix : "")); + fprintf (out, "\nEffective prefix: \"%s\"\n", lilypond_datadir.c_str ()); + + if (relocate_binary) + { + 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, "PANGO_PREFIX"); + env_var_info (out, "PATH"); + } } static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2004", - AUTHORS).to_str0 ()); + "1996--2007", + AUTHORS).c_str ()); printf ("\n"); } static void identify (FILE *out) { - fputs (gnu_lilypond_version_string ().to_str0 (), out); + fputs (gnu_lilypond_version_string ().c_str (), out); fputs ("\n", out); } - + static void notice () { identify (stdout); - printf (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + puts (_f (NOTICE, PROGRAM_NAME).c_str ()); 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 ()); + printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ()); printf ("\n\n"); - printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); + printf (_ ("Typeset music and/or produce MIDI from FILE.").c_str ()); printf ("\n\n"); - printf (_ ("LilyPond produces beautiful music notation.").to_str0 ()); + printf (_ ("LilyPond produces beautiful music notation.").c_str ()); printf ("\n"); - printf (_f ("For more information, see %s", PROGRAM_URL).to_str0 ()); + printf (_f ("For more information, see %s", PROGRAM_URL).c_str ()); printf ("\n\n"); - printf (_ ("Options:").to_str0 ()); + printf (_ ("Options:").c_str ()); printf ("\n"); - printf (Long_option_init::table_string (options_static).to_str0 ()); + printf (Long_option_init::table_string (options_static).c_str ()); printf ("\n"); - printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); + printf (_f ("Report bugs via %s", + "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" + ).c_str ()); printf ("\n"); printf ("\n"); + return SCM_UNSPECIFIED; } static void @@ -213,71 +254,130 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).to_str0 ()); + printf (_ (WARRANTY).c_str ()); } static void -setup_paths () +prepend_load_path (string dir) { - if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) - prefix_directories[1] = lilypond_prefix; - - global_path.append (""); + string s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; + scm_c_eval_string (s.c_str ()); +} - /* 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}; +void init_global_tweak_registry (); +void init_fontconfig (); - for (unsigned i = 0; prefix_directories[i]; i++) - for (char **s = suffixes; *s; s++) - { - String p = prefix_directories[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 - } -} - +#if HAVE_CHROOT static void -prepend_load_path (String dir) +do_chroot_jail () { - String s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; - scm_c_eval_string (s.to_str0 ()); -} + /* 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. */ -void init_global_tweak_registry (); -void init_fontconfig (); + enum Jail + { + USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX + }; + + vector components = string_split (jail_spec, ','); + if (components.size () != JAIL_MAX) + { + error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX, + (unsigned) components.size ())); + exit (2); + } + + /* Hmm. */ + errno = 0; + + int uid; + if (passwd * passwd = getpwnam (components[USER_NAME].c_str ())) + uid = passwd->pw_uid; + else + { + if (errno == 0) + error (_f ("no such user: %s", components[USER_NAME])); + else + error (_f ("cannot 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].c_str ())) + gid = group->gr_gid; + else + { + if (errno == 0) + error (_f ("no such group: %s", components[GROUP_NAME])); + else + error (_f ("cannot get group id from group name: %s: %s", + components[GROUP_NAME], + strerror (errno))); + exit (3); + } + + if (chroot (components[JAIL].c_str ())) + { + error (_f ("cannot chroot to: %s: %s", components[JAIL], + strerror (errno))); + exit (3); + } + + if (setgid (gid)) + { + error (_f ("cannot change group id to: %d: %s", gid, strerror (errno))); + exit (3); + } + + if (setuid (uid)) + { + error (_f ("cannot change user id to: %d: %s", uid, strerror (errno))); + exit (3); + } + + if (chdir (components[DIR].c_str ())) + { + error (_f ("cannot 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_directories[i]; i++) - { - prepend_load_path (prefix_directories[i]); - /* Junk this. We should make real modules iso. just loading files. */ - prepend_load_path (String (prefix_directories[i]) + "/scm"); - } + + prepend_load_path (lilypond_datadir); + prepend_load_path (lilypond_datadir + "/scm"); if (be_verbose_global) dir_info (stderr); + is_pango_format_global = !is_TeX_format_global; + init_scheme_variables_global = "(list " + init_scheme_variables_global + ")"; + init_scheme_code_global = "(begin " + init_scheme_code_global + ")"; + ly_c_init_guile (); call_constructors (); - init_global_tweak_registry (); init_fontconfig (); + init_freetype (); - all_fonts_global = new All_font_metrics (global_path.to_string ()); + ly_reset_all_fonts (); - init_scheme_code_string += ")"; - scm_c_eval_string ((char*) init_scheme_code_string.to_str0 ()); + is_TeX_format_global = (get_output_backend_name () == "tex" + || get_output_backend_name () == "texstr"); + /* We accept multiple independent music files on the command line to reduce compile time when processing lots of small files. @@ -287,25 +387,21 @@ main_with_guile (void *, int, char **) SCM *tail = &files; while (char const *arg = option_parser->get_next_arg ()) { - *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL); + *tail = scm_cons (scm_from_locale_string (arg), SCM_EOL); tail = SCM_CDRLOC (*tail); } + 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.empty ()) + do_chroot_jail (); +#endif SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); (void) result; - /* Unreachable. */ exit (0); } @@ -316,82 +412,102 @@ 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.c_str ()); + textdomain ("lilypond"); #endif } static void -add_output_format (String format) +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" - || String (opt->longname_str0_) == "pdf" - || String (opt->longname_str0_) == "ps" - || String (opt->longname_str0_) == "dvi" - || String (opt->longname_str0_) == "tex") - { - 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; + 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_) == "tex") + add_output_format (opt->longname_str0_); + else if (string (opt->longname_str0_) == "relocate") + relocate_binary = true; break; - + + case 'd': + { + string arg (option_parser->optional_argument_str0_); + ssize eq = arg.find ('='); + + string key = arg; + string val = "#t"; + + if (eq != NPOS) + { + key = arg.substr (0, eq); + val = arg.substr (eq + 1, arg.length () - 1); + } + + init_scheme_variables_global + += "(cons \'" + key + " '" + val + ")\n"; + } + break; + case 'v': notice (); exit (0); break; case 'o': { - String s = option_parser->optional_argument_str0_; + string s = option_parser->optional_argument_str0_; File_name file_name (s); 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_; + init_scheme_code_global += option_parser->optional_argument_str0_ + string (" "); break; case 'w': warranty (); exit (0); break; - case 'b': - output_backend_global = option_parser->optional_argument_str0_; - is_pango_format_global = (output_backend_global != "tex" - &&output_backend_global != "texstr"); - break; case 'f': - output_format_global = option_parser->optional_argument_str0_; + { + vector components + = string_split (option_parser->optional_argument_str0_, ','); + for (vsize i = 0; i < components.size (); i++) + add_output_format (components[i]); + } break; - + case 'H': dump_header_fieldnames_global - .push (option_parser->optional_argument_str0_); + .push_back (option_parser->optional_argument_str0_); break; case 'I': global_path.append (option_parser->optional_argument_str0_); @@ -400,20 +516,11 @@ 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': be_verbose_global = true; break; - case 's': - be_safe_global = true; - break; - case 'm': - skip_layout_global = true; - break; - case 'p': - make_preview = true; - break; default: programming_error (to_string ("unhandled short option: %c", opt->shortname_char_)); @@ -422,27 +529,74 @@ parse_argv (int argc, char **argv) } } - if (help_b) + if (output_format_global == "") + output_format_global = "pdf"; + + if (show_help) { identify (stdout); - usage (); + ly_usage (); if (be_verbose_global) dir_info (stdout); exit (0); } } +void +setup_guile_env () +{ + const char *yield = getenv ("LILYPOND_GC_YIELD"); + bool overwrite = true; + if (!yield) + { + yield = "65"; + 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); + + + sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", + "10485760", overwrite); + sane_putenv ("GUILE_MAX_SEGMENT_SIZE", + "104857600", overwrite); +} + +vector start_environment_global; + int -main (int argc, char **argv) +main (int argc, char **argv, char **envp) { + for (char **p = envp; *p; p++) + start_environment_global.push_back(*p); + + if (getenv ("LILYPOND_VERBOSE")) + be_verbose_global = true; + setup_localisation (); - setup_paths (); 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); + setup_paths (argv[0]); + setup_guile_env (); - /* Unreachable */ - return 0; +#if 0 + /* Debugging aid. */ + try + { + scm_boot_guile (argc, argv, main_with_guile, 0); + } + catch (exception e) + { + error (_f ("exception caught: %s", e.what ())); + }; +#else + scm_boot_guile (argc, argv, main_with_guile, 0); +#endif + + /* Only reachable if GUILE exits. That is an error. */ + return 1; }