X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=eb2f222d174a76227600f01958ad6fe294b6432e;hb=0fcd8c283c45644a92d2308f1cd0d82a1e63380b;hp=225779a68b8079961b03e59df80d8de05b03f5cb;hpb=ba9f8c7b737b63c29e1a7f6956c7cec69d1180bb;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 225779a68b..eb2f222d17 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,35 @@ #include #include #include +#include +#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" /* * Global options that can be overridden through command line. @@ -40,15 +51,14 @@ Array dump_header_fieldnames_global; /* Name of initialisation file. */ 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. -*/ +/* Selected output backend + One of (gnome, ps [default], scm, svg, tex, texstr)") */ String output_backend_global = "ps"; +/* Output formats to generate. */ String output_format_global = "pdf"; + bool is_pango_format_global; +bool is_TeX_format_global; /* Current output name. */ String output_name_global; @@ -56,115 +66,127 @@ 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_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],\n scm, svg, tex, texstr)")}, + + {_i ("SYM=VAL"), "define-default", 'd', + _i ("define a default Scheme setting.")}, + + {_i ("EXPR"), "evaluate", 'e', _i ("set scheme option, for help use\n -e '(ly:option-usage)'")}, + /* 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 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"); } @@ -175,18 +197,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 ()); @@ -204,6 +227,7 @@ usage () printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); printf ("\n"); printf ("\n"); + return SCM_UNSPECIFIED; } static void @@ -219,28 +243,43 @@ 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", "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); + } + + /* + ugh. C&P font-config.cc + */ + struct stat statbuf; + String builddir = prefix_directory + "/mf/out/"; + if (stat (builddir.to_str0 (), &statbuf) == 0) + { + dirs.push (builddir.to_str0 ()); + } + else + { + dirs.push (prefix_directory + "/fonts/otf/"); + dirs.push (prefix_directory + "/fonts/type1/"); + dirs.push (prefix_directory + "/fonts/cff/"); + dirs.push (prefix_directory + "/fonts/svg/"); + dirs.push (prefix_directory + "/fonts/cff/"); + } + + for (int i = 0; i < dirs.size (); i++) + global_path.prepend (dirs[i]); } static void @@ -251,31 +290,143 @@ 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"); - } + + 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 (); + 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 = "(ly:set-option 'command-line-settings (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. Starting the GUILE engine is very time consuming. */ @@ -290,19 +441,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); } @@ -313,11 +459,11 @@ 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); @@ -328,34 +474,50 @@ setup_localisation () 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': @@ -369,6 +531,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; @@ -376,10 +541,9 @@ parse_argv (int argc, char **argv) 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': @@ -397,7 +561,7 @@ 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; @@ -405,9 +569,6 @@ parse_argv (int argc, char **argv) case 's': be_safe_global = true; break; - case 'm': - skip_layout_global = true; - break; case 'p': make_preview = true; break; @@ -419,27 +580,33 @@ parse_argv (int argc, char **argv) } } - if (help_b) + if (show_help) { identify (stdout); - usage (); + ly_usage (); if (be_verbose_global) dir_info (stdout); exit (0); } } +#ifdef __MINGW32__ +/* If no TTY and not using safe, assume running from GUI. + For mingw, the test must be inverted. */ +# define isatty(x) (!isatty (x)) +#endif + int main (int argc, char **argv) { 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); - /* Unreachable */ - return 0; + /* Only reachable if GUILE exits. That is an error. */ + return 1; }