X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=5f9b2a77f657f3e4c02dd68518e8a7d39cf66c31;hb=a7c271ac71ac5213ccf492909f00e055bf59f836;hp=a6756fc3cea3459d2272f1d2231769a8bb955e81;hpb=671020aabbf0d8d10e1fa5f7e20e33e92df085fc;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index a6756fc3ce..5f9b2a77f6 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "main.hh" @@ -33,37 +33,39 @@ using namespace std; #include "freetype.hh" #include "getopt-long.hh" #include "global-ctor.hh" +#include "international.hh" #include "lily-guile.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 "program-option.hh" -#include "relocate.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; /* Selected output backend One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */ -String output_backend_global = "ps"; +string output_backend_global = "ps"; + /* Output formats to generate. */ -String output_format_global = ""; +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; @@ -76,8 +78,8 @@ 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; -String init_scheme_variables; +string init_scheme_code_string; +string init_scheme_variables; /* Generate preview of first system. */ bool make_preview = false; @@ -87,7 +89,7 @@ bool make_print = true; bool relocate_binary = -#if ARGV0_RELOCATION +#if 1 true; #else false @@ -135,10 +137,10 @@ static char const *WARRANTY /* Where the init files live. Typically: LILYPOND_DATADIR = /usr/share/lilypond */ -String prefix_directory; +string prefix_directory; /* The jail specification: USER,GROUP,JAIL,DIR. */ -String jail_spec; +string jail_spec; /* The option parser */ static Getopt_long *option_parser = 0; @@ -169,12 +171,12 @@ static Long_option_init options_static[] {_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")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, {0, "preview", 'p', _i ("generate a preview of the first system")}, {0, "safe-mode", 's', _i ("disallow unsafe Scheme and PostScript operations")}, {0, "version", 'v', _i ("print version number")}, @@ -183,7 +185,7 @@ static Long_option_init options_static[] {0, 0, 0, 0} }; -const char *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION; +char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION; static void env_var_info (FILE *out, char const *key) @@ -200,7 +202,7 @@ dir_info (FILE *out) env_var_info (out, "LILYPONDPREFIX"); fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); - fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.to_str0 ()); + fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.c_str ()); if (relocate_binary) { @@ -210,6 +212,7 @@ dir_info (FILE *out) 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"); } } @@ -218,15 +221,15 @@ static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2005", - AUTHORS).to_str0 ()); + "1996--2006", + 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); } @@ -234,7 +237,7 @@ static void notice () { identify (stdout); - puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + puts (_f (NOTICE, PROGRAM_NAME).c_str ()); printf ("\n"); copyright (); } @@ -244,21 +247,21 @@ LY_DEFINE (ly_usage, "ly:usage", "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 via %s", "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" - ).to_str0 ()); + ).c_str ()); printf ("\n"); printf ("\n"); return SCM_UNSPECIFIED; @@ -271,14 +274,14 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).to_str0 ()); + printf (_ (WARRANTY).c_str ()); } static void -prepend_load_path (String dir) +prepend_load_path (string dir) { - String s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; - scm_c_eval_string (s.to_str0 ()); + string s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; + scm_c_eval_string (s.c_str ()); } void init_global_tweak_registry (); @@ -299,11 +302,11 @@ do_chroot_jail () USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX }; - Array components = String_convert::split (jail_spec, ','); + vector components = string_split (jail_spec, ','); if (components.size () != JAIL_MAX) { - error (_f ("expected %d arguments with jail, found: %d", JAIL_MAX, - components.size ())); + error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX, + (unsigned) components.size ())); exit (2); } @@ -311,7 +314,7 @@ do_chroot_jail () errno = 0; int uid; - if (passwd * passwd = getpwnam (components[USER_NAME].to_str0 ())) + if (passwd * passwd = getpwnam (components[USER_NAME].c_str ())) uid = passwd->pw_uid; else { @@ -328,7 +331,7 @@ do_chroot_jail () errno = 0; int gid; - if (group * group = getgrnam (components[GROUP_NAME].to_str0 ())) + if (group * group = getgrnam (components[GROUP_NAME].c_str ())) gid = group->gr_gid; else { @@ -341,7 +344,7 @@ do_chroot_jail () exit (3); } - if (chroot (components[JAIL].to_str0 ())) + if (chroot (components[JAIL].c_str ())) { error (_f ("can't chroot to: %s: %s", components[JAIL], strerror (errno))); @@ -360,7 +363,7 @@ do_chroot_jail () exit (3); } - if (chdir (components[DIR].to_str0 ())) + if (chdir (components[DIR].c_str ())) { error (_f ("can't change working directory to: %s: %s", components[DIR], strerror (errno))); @@ -387,8 +390,6 @@ main_with_guile (void *, int, char **) ly_c_init_guile (); call_constructors (); - ly_set_option (ly_symbol2scm ("verbose"), scm_from_bool (be_verbose_global)); - init_global_tweak_registry (); init_fontconfig (); @@ -396,19 +397,19 @@ main_with_guile (void *, int, char **) all_fonts_global = new All_font_metrics (global_path.to_string ()); - if (!init_scheme_variables.is_empty () - || !init_scheme_code_string.is_empty ()) + if (!init_scheme_variables.empty () + || !init_scheme_code_string.empty ()) { init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr x))) (list " + init_scheme_variables + "))"; init_scheme_code_string - += "(begin #t " + = "(begin #t " + init_scheme_variables + init_scheme_code_string + ")"; - char const *str0 = init_scheme_code_string.to_str0 (); + char const *str0 = init_scheme_code_string.c_str (); if (be_verbose_global) progress_indication (_f ("Evaluating %s", str0)); @@ -430,7 +431,7 @@ main_with_guile (void *, int, char **) option_parser = 0; #if HAVE_CHROOT - if (!jail_spec.is_empty ()) + if (!jail_spec.empty ()) do_chroot_jail (); #endif @@ -452,17 +453,17 @@ setup_localisation () Disable localisation of float values. This breaks TeX output. */ setlocale (LC_NUMERIC, "C"); - String localedir = LOCALEDIR; + string localedir = LOCALEDIR; if (char const *env = getenv ("LILYPOND_LOCALEDIR")) localedir = env; - bindtextdomain ("lilypond", localedir.to_str0 ()); + bindtextdomain ("lilypond", localedir.c_str ()); textdomain ("lilypond"); #endif } static void -add_output_format (String format) +add_output_format (string format) { if (output_format_global != "") output_format_global += ","; @@ -479,32 +480,32 @@ parse_argv (int argc, char **argv) switch (opt->shortname_char_) { case 0: - 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") + 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_) == "preview") + else if (string (opt->longname_str0_) == "preview") make_preview = true; - else if (String (opt->longname_str0_) == "no-pages") + else if (string (opt->longname_str0_) == "no-pages") make_print = false; - else if (String (opt->longname_str0_) == "relocate") + else if (string (opt->longname_str0_) == "relocate") relocate_binary = true; break; case 'd': { - String arg (option_parser->optional_argument_str0_); - int eq = arg.index ('='); + string arg (option_parser->optional_argument_str0_); + ssize eq = arg.find ('='); - String key = arg; - String val = "#t"; + string key = arg; + string val = "#t"; - if (eq >= 0) + if (eq != NPOS) { - key = arg.left_string (eq); - val = arg.right_string (arg.length () - eq - 1); + key = arg.substr (0, eq); + val = arg.substr (eq + 1, key.length () - 1); } init_scheme_variables @@ -518,7 +519,7 @@ parse_argv (int argc, char **argv) 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 (); } @@ -544,7 +545,7 @@ parse_argv (int argc, char **argv) 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_); @@ -560,6 +561,9 @@ parse_argv (int argc, char **argv) break; case 's': be_safe_global = true; + init_scheme_variables + += "(cons \'safe #t)\n"; + break; case 'p': make_preview = true; @@ -588,7 +592,7 @@ parse_argv (int argc, char **argv) void setup_guile_env () { - char *yield = getenv ("LILYPOND_GC_YIELD"); + const char *yield = getenv ("LILYPOND_GC_YIELD"); bool overwrite = true; if (!yield) { @@ -601,6 +605,9 @@ setup_guile_env () sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); } +void +read_relocation_dir (string); + int main (int argc, char **argv) { @@ -614,7 +621,16 @@ main (int argc, char **argv) setup_paths (argv[0]); setup_guile_env (); - scm_boot_guile (argc, argv, main_with_guile, 0); + + /* Debugging aid. */ + try + { + scm_boot_guile (argc, argv, main_with_guile, 0); + } + catch (exception e) + { + error (_f ("exception caught: %s", e.what ())); + }; /* Only reachable if GUILE exits. That is an error. */ return 1;