X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=1f4a1a5e3016de284ba53e609a3c1c3be311c9f6;hb=d874d6b47710ce90a900e6ecd4d87c0f0f5e7273;hp=35d07b844a781cdf4ba010daaec2b2e7f953965e;hpb=207ff3900c435070d808a685429068f444b02406;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 35d07b844a..1f4a1a5e30 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,14 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ + +#include "main.hh" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "config.hh" @@ -20,16 +25,15 @@ #include "all-font-metrics.hh" #include "file-name.hh" -#include "file-path.hh" +#include "freetype.hh" #include "getopt-long.hh" #include "global-ctor.hh" -#include "kpath.hh" #include "lily-guile.hh" #include "lily-version.hh" -#include "main.hh" #include "misc.hh" #include "output-def.hh" -#include "string.hh" +#include "string-convert.hh" +#include "version.hh" #include "warn.hh" /* @@ -42,32 +46,32 @@ Array dump_header_fieldnames_global; /* Name of initialisation file. */ String init_name_global; -/* Do not calculate and write paper output? */ -bool no_paper_global_b = false; - /* Selected output format. - One of tex, ps, scm, as. */ -String output_format_global = "ps"; + One of tex, ps, scm, as. +*/ +String output_backend_global = "ps"; +String output_format_global = "pdf"; + +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; /* 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 "; -bool make_pdf = false; -bool make_dvi = false; -bool make_ps = true; -bool make_png = false; bool make_preview = false; +bool make_pages = true; + /* * Miscellaneous global stuff. @@ -83,35 +87,37 @@ static char const *AUTHORS = " Han-Wen Nienhuys \n" " Jan Nieuwenhuizen \n"; -static char const *PROGRAM_NAME = "lilypond-bin"; +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-bin --warranty' for more\n" - "information.\n"); +_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"); - +_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; @@ -122,27 +128,30 @@ static Getopt_long *option_parser = 0; static Long_option_init options_static[] = { + {_i ("EXT"), "backend", 'b', _i ("select backend to use")}, {_i ("EXPR"), "evaluate", 'e', - _i ("set options, use -e '(ly:option-usage)' for help")}, - /* Bug in option parser: --output=foe is taken as an abbreviation + _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"), "format", 'f', _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-paper", 'm', _i ("produce MIDI output only")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, + {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP and cd into DIR")}, {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")}, + {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} + {0, 0, 0, 0} }; static void @@ -150,19 +159,18 @@ 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); + if (char const * env = getenv ("LILYPONDPREFIX")) + fprintf (out, "LILYPONDPREFIX=\"%s\"\n", env); 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", prefix_directory.to_str0()); } static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2004", + "1996--2005", AUTHORS).to_str0 ()); printf ("\n"); } @@ -171,14 +179,14 @@ static void identify (FILE *out) { fputs (gnu_lilypond_version_string ().to_str0 (), out); + fputs ("\n", out); } static void notice () { identify (stdout); - printf ("\n"); - printf (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); printf ("\n"); copyright (); } @@ -187,7 +195,7 @@ static void usage () { /* No version number or newline here. It confuses help2man. */ - printf (_f ("Usage: %s [OPTIONS]... FILE...", PROGRAM_NAME).to_str0 ()); + printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); printf ("\n\n"); printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); printf ("\n\n"); @@ -217,28 +225,22 @@ warranty () static void setup_paths () { - if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) - prefix_directory[1] = lilypond_prefix; + prefix_directory = LILYPOND_DATADIR; + if (char const * env = getenv ("LILYPONDPREFIX")) + 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", "afm", "mf/out", "scm", "tfm", "ps", 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", "cff", "otf", "mf/out", "scm", "tfm", "ps", "svg", + 0}; + + for (char **s = suffixes; *s; s++) + { + String path = prefix_directory + to_string ('/') + String (*s); + global_path.prepend (path); + } } static void @@ -248,46 +250,118 @@ prepend_load_path (String dir) scm_c_eval_string (s.to_str0 ()); } +void init_global_tweak_registry (); +void init_fontconfig (); + static void -determine_output_options () +do_chroot_jail () { - bool found_tex = false; - SCM formats = ly_output_formats (); - for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s)) + /* 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 { - found_tex = found_tex || (ly_scm2string (ly_car (s)) == "tex"); + 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); } - if (make_ps && found_tex) + /* Hmm. */ + errno = 0; + + int gid; + if (group *group = getgrnam (components[GROUP_NAME].to_str0 ())) + gid = group->gr_gid; + else { - make_dvi = true; + if (errno == 0) + error (_f ("no such group: %s", components[GROUP_NAME])); + else + error (_f ("can't get group id from group name: %s: ", + components[GROUP_NAME], + strerror (errno))); + exit (3); } - if (make_pdf || make_png) + + if (chroot (components[JAIL].to_str0 ())) { - make_ps = true; + 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); } } +void test_pango(); + 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 (); - progress_indication ("\n"); + init_global_tweak_registry (); + init_fontconfig (); + + init_freetype (); - determine_output_options (); all_fonts_global = new All_font_metrics (global_path.to_string ()); init_scheme_code_string += ")"; @@ -316,9 +390,11 @@ main_with_guile (void *, int, char **) exit (2); } - SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), files); - (void) result; + if (! jail_spec.is_empty ()) + do_chroot_jail (); + SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); + (void) result; /* Unreachable. */ exit (0); @@ -342,26 +418,36 @@ setup_localisation () #endif } +static void +add_output_format (String 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") - make_png = true; - else if (String (opt->longname_str0_) == "pdf") - make_pdf = true; - else if (String (opt->longname_str0_) == "ps") - make_ps = true; - else if (String (opt->longname_str0_) == "dvi") - make_dvi = true; + 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; break; case 'v': @@ -375,6 +461,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; @@ -382,15 +471,15 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; + + case 'b': + output_backend_global = option_parser->optional_argument_str0_; + break; + case 'f': - if (option_parser->optional_argument_str0_ == "help") - { - printf (_ ("This option is for developers only.").to_str0 ()); - printf (_ ("Read the sources for more information.").to_str0 ()); - exit (0); - } output_format_global = option_parser->optional_argument_str0_; break; + case 'H': dump_header_fieldnames_global .push (option_parser->optional_argument_str0_); @@ -402,27 +491,30 @@ 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; + be_safe_global = true; break; - case 'm': - no_paper_global_b = true; + case 'p': + make_preview = true; break; default: + programming_error (to_string ("unhandled short option: %c", + opt->shortname_char_)); assert (false); break; } } - if (help_b) + if (show_help) { + identify (stdout); usage (); - if (verbose_global_b) + if (be_verbose_global) dir_info (stdout); exit (0); } @@ -431,10 +523,10 @@ parse_argv (int argc, char **argv) int main (int argc, char **argv) { - setup_localisation (); + setup_localisation (); setup_paths (); parse_argv (argc, argv); - initialize_kpathsea (argv[0]); + identify (stderr); scm_boot_guile (argc, argv, main_with_guile, 0);