X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=e754ea6ad0e0dbba429b4f03be88f91ab7ec7b1d;hb=266a1dfe19ef50999bec6543f261ce340f2bc808;hp=ba2ba61a6e91969d39c9e9159a1b172d82b36464;hpb=765d8e8dfee2fcc86493d8e01463947762079dbf;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index ba2ba61a6e..e754ea6ad0 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 "config.hh" @@ -20,15 +25,16 @@ #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" /* * Global options that can be overridden through command line. @@ -40,34 +46,32 @@ 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. */ -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 = false; -bool make_png = false; bool make_preview = false; bool make_pages = true; -bool make_tex = false; + /* * Miscellaneous global stuff. @@ -87,31 +91,34 @@ 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"); +"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"); +" 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,17 +129,18 @@ 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 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-layout", '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")}, @@ -144,27 +152,26 @@ static Long_option_init options_static[] = {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 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); + 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"); } @@ -180,7 +187,7 @@ static void notice () { identify (stdout); - printf (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); printf ("\n"); copyright (); } @@ -219,28 +226,29 @@ 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", "otf", "mf/out", "scm", "tfm", "ps", 0}; + char *suffixes[] = {"ly", "cff", "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); + for (char **s = suffixes; *s; s++) + { + String path = prefix_directory + to_string ('/') + String (*s); + global_path.prepend (path); #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))) + while (global_path.try_append (path + to_string (".") + to_string (i))) i++; #endif - } + } } static void @@ -250,72 +258,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_gnome = false; - bool found_svg = false; - bool found_tex = false; - SCM formats = ly_output_formats (); - for (SCM s = formats; scm_is_pair (s); s = scm_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) { - found_gnome = found_gnome || ly_scm2string(scm_car (s)) == "gnome"; - found_svg = found_gnome || ly_scm2string(scm_car (s)) == "svg"; - found_tex = found_tex || (ly_scm2string (scm_car (s)) == "tex"); + error (_f ("expected %d arguments with jail, found: %d", JAIL_MAX, + components.size ())); + exit (2); } - if (make_pdf || make_png) + /* Hmm. */ + errno = 0; + + int uid; + if (passwd *passwd = getpwnam (components[USER_NAME].to_str0 ())) + uid = passwd->pw_uid; + else { - make_ps = true; + 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_dvi && found_tex) + + if (chroot (components[JAIL].to_str0 ())) { - make_tex = true; + error (_f ("can't chroot to: %s: %s", components[JAIL], + strerror (errno))); + exit (3); } - if (!found_gnome - && !found_svg - && !(make_dvi - || make_tex - || make_ps - || make_png - || make_pdf)) + + if (setgid (gid)) { - make_pdf = true; - make_ps = true; - if (found_tex) - { - make_dvi = true; - make_tex = true; - } + 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 init_global_tweak_registry (); +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 (); 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 += ")"; @@ -344,9 +398,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); @@ -370,26 +426,32 @@ 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; - else if (String (opt->longname_str0_) == "tex") - make_tex = 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") @@ -407,6 +469,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; @@ -414,15 +479,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_); @@ -434,16 +499,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; @@ -456,11 +518,11 @@ parse_argv (int argc, char **argv) } } - if (help_b) + if (show_help) { identify (stdout); usage (); - if (verbose_global_b) + if (be_verbose_global) dir_info (stdout); exit (0); } @@ -473,7 +535,6 @@ main (int argc, char **argv) setup_paths (); parse_argv (argc, argv); identify (stderr); - initialize_kpathsea (argv[0]); scm_boot_guile (argc, argv, main_with_guile, 0);