X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=291a9c8cc9ddaedcbe9d43d7d1ed048dfe952c5e;hb=10fce7970987502ec8340819411897a829f6be23;hp=ca5bc6b2407ce082014269fa02805b97110849b3;hpb=e8936ee66fdd3e7ebe30556590e8dc913908a533;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index ca5bc6b240..291a9c8cc9 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -1,50 +1,44 @@ /* - main.cc -- implement main: entrypoints + main.cc -- implement main () entrypoint. source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include -#include -#include -#include -#include +#include "main.hh" + +#include +#include +#include +#include +#include +#include +#include +#include -#include "config.h" +#include "config.hh" #if HAVE_GETTEXT #include #endif -#include "lily-guile.hh" -#include "lily-version.hh" #include "all-font-metrics.hh" +#include "file-name.hh" +#include "freetype.hh" #include "getopt-long.hh" +#include "global-ctor.hh" +#include "lily-guile.hh" +#include "lily-version.hh" #include "misc.hh" -#include "string.hh" -#include "main.hh" -#include "file-path.hh" -#include "input-file-results.hh" +#include "output-def.hh" +#include "string-convert.hh" +#include "version.hh" #include "warn.hh" -#include "lily-guile.hh" -#include "paper-def.hh" -#include "midi-def.hh" -#include "global-ctor.hh" -#include "kpath.hh" - -static int sane_putenv (char const* key, char const* value, bool overwrite = false); /* - Global options that can be overridden through command line. -*/ - -/* Write dependencies file? */ -bool dependency_global_b = false; - -/* Prepend to dependencies */ -String dependency_prefix_global; + * 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; @@ -52,459 +46,497 @@ 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 = "tex"; + 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? -- FIXME: should be re-analised */ -bool safe_global_b = false; +/* Run in safe mode? */ +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 */ +/* 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_preview = false; +bool make_pages = true; + /* - Misc. global stuff. + * Miscellaneous global stuff. */ +File_path global_path; -All_font_metrics *all_fonts_global; -int exit_status_global; -File_path global_path; +/* + * File globals. + */ -/* Number of current score output block. If there's more than one - score block, this counter will be added to the output filename. */ -int score_count_global; +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 = +"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 = +" 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 +*/ +String prefix_directory; -/* - File globals. - */ +/* The jail specification: USER,GROUP,JAIL,DIR. */ +String jail_spec; /* The option parser */ -static Getopt_long *oparser_p_static = 0; +static Getopt_long *option_parser = 0; -/* - Internationalisation kludge in two steps: +/* Internationalisation kludge in two steps: * use _i () to get entry in POT file - * call gettext () explicitely for actual "translation" + * call gettext () explicitely for actual "translation" */ + +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 ("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")}, + {_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 (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} + }; + +static void +dir_info (FILE *out) +{ + fputs ("\n", out); + 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); - Note: these messages all start with lower case (ie, don't - follow regular localisation guidelines). - */ -static Long_option_init options_static[] = { - {_i ("EXPR"), "evaluate", 'e', - _i ("set options, use -e '(ly-option-usage)' for help")}, - /* another bug in option parser: --output=foe is taken as an abbreviation - for --output-format */ - {_i ("EXT"), "format", 'f', _i ("use output format EXT")}, - {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, "dependencies", 'M', _i ("write Makefile dependencies for every input file")}, - {0, "no-paper", 'm', _i ("produce MIDI output only")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, - {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, -#if 0 - /* - should audit again. - */ - {0, "safe", 's', _i ("inhibit file output naming and exporting")}, -#endif - {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} -}; + fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.to_str0()); +} -void +static void +copyright () +{ + printf (_f ("Copyright (c) %s by\n%s and others.", + "1996--2005", + AUTHORS).to_str0 ()); + printf ("\n"); +} + +static void identify (FILE *out) { fputs (gnu_lilypond_version_string ().to_str0 (), out); + fputs ("\n", out); } -void -dirinfo (FILE *out) +static void +notice () { - 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); - - char *lilypond_prefix = getenv ("LILYPONDPREFIX"); - fprintf (out, "LILYPONDPREFIX: `%s'\n", - (lilypond_prefix ? lilypond_prefix : "")); + identify (stdout); + puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + printf ("\n"); + copyright (); } -void +static void usage () { - printf ("\n"); - /* No version number or newline here. It confuses help2man. */ - printf (_f ("Usage: %s [OPTIONS]... FILE...", "lilypond").to_str0 ()); + /* No version number or newline here. It confuses help2man. */ + printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); printf ("\n\n"); - printf (_ ("Typeset music and or play MIDI from FILE.").to_str0 ()); + printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); printf ("\n\n"); - printf(_ ( -"LilyPond is a music typesetter. It produces beautiful sheet music\n" -"using a high level description file as input. LilyPond is part of \n" -"the GNU Project.\n" -).to_str0 ()); - + printf (_ ("LilyPond produces beautiful music notation.").to_str0 ()); printf ("\n"); + printf (_f ("For more information, see %s", PROGRAM_URL).to_str0 ()); + printf ("\n\n"); printf (_ ("Options:").to_str0 ()); printf ("\n"); printf (Long_option_init::table_string (options_static).to_str0 ()); printf ("\n"); - printf ("\n"); - printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); printf ("\n"); printf ("\n"); } -void -version () +static void +warranty () { identify (stdout); printf ("\n"); - printf (_f ( - "This is free software. It is covered by the GNU General Public License,\n" - "and you are welcome to change it and/or distribute copies of it under\n" - "certain conditions. Invoke as `%s --warranty' for more information.\n", - "lilypond").to_str0 ()); - printf ("\n"); - - printf (_f ("Copyright (c) %s by", "1996--2003").to_str0 ()); - printf ("\n"); - printf (" Han-Wen Nienhuys \n"); - printf (" Jan Nieuwenhuizen \n"); -} - -void -notice () -{ - printf ("\n"); - printf (_ ("GNU LilyPond -- The music typesetter").to_str0 ()); - printf ("\n"); - printf (_f ("Copyright (c) %s by", "1996--2003").to_str0 ()); - printf ("\n"); - printf (" Han-Wen Nienhuys \n"); - printf (" Jan Nieuwenhuizen \n"); + copyright (); printf ("\n"); - printf ( _ ( - " 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, Boston, MA 02111-1307,\n" - "USA.\n").to_str0 ()); + printf (_ (WARRANTY).to_str0 ()); } - -/* Where LilyPond's init files live. Typically: - LILYPOND_DATADIR = /usr/local/share/lilypond - LOCAL_LILYPOND_DATADIR = /usr/local/share/lilypond/1.5.68 */ -char const *prefix_directory[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; - -void +static void setup_paths () { - if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) - prefix_directory[1] = lilypond_prefix; - -#if HAVE_GETTEXT - /* Enable locales */ - setlocale (LC_ALL, ""); - /* Mustn't have commas in TeX output... */ - setlocale (LC_NUMERIC, "C"); - String lily_locale_dir; - String name (PACKAGE); - name.to_lower (); - bindtextdomain (name.to_str0 (), LOCALEDIR); - textdomain (name.to_str0 ()); -#endif - - global_path.add (""); + 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}; + 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_add (p + to_string (".") + to_string (i))) + while (global_path.try_append (path + to_string (".") + to_string (i))) i++; #endif - } - } + } +} -/** - Make input file name from command argument. +static void +prepend_load_path (String dir) +{ + String s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; + scm_c_eval_string (s.to_str0 ()); +} - Path describes file name with added default extension, - ".ly" if none. "-" is stdin. - */ -Path -distill_inname (String str) +void init_global_tweak_registry (); +void init_fontconfig (); + +static void +do_chroot_jail () { - Path p = split_path (str); - if (str.empty_b () || str == "-") - p.base = "-"; + /* 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 { - String orig_ext = p.ext; - char const *extensions[] = {"ly", "", 0}; - for (int i = 0; extensions[i]; i++) - { - p.ext = orig_ext; - if (*extensions[i] && !p.ext.empty_b ()) - p.ext += "."; - p.ext += extensions[i]; - if (!global_path.find (p.to_string ()).empty_b ()) - break; - } - /* Reshuffle extension */ - p = split_path (p.to_string ()); + 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); } - return p; -} -String -format_to_ext (String format) -{ - if (format == "tex") - /* .lytex change put off */ - return "tex"; // "lytex"; - return format; -} + /* Hmm. */ + errno = 0; -void -prepend_load_path (String dir) -{ - String s = "(set! %load-path (cons \"" - + dir - + "\" %load-path))"; - scm_c_eval_string (s.to_str0 ()); + 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: ", + 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); + } } -void -main_prog (void *, int, char **) +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"); - } + prepend_load_path (prefix_directory); + prepend_load_path (prefix_directory + "/scm"); - if (verbose_global_b) - dirinfo (stderr); - - ly_init_guile (); - call_constructors (); + 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; + - progress_indication ("\n"); + 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 += ")"; - gh_eval_str ((char *)init_scheme_code_string.to_str0 ()); - - int p=0; - const char *arg = oparser_p_static->get_next_arg (); + scm_c_eval_string ((char*) init_scheme_code_string.to_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. */ + + SCM files = SCM_EOL; + SCM *tail = &files; + while (char const *arg = option_parser->get_next_arg ()) + { + *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + delete option_parser; + option_parser = 0; - /* Only exit until after running init_scheme_code, for - (ly-option-usage) or - -e "(ly-set-option 'help #t)" */ - if (!arg) + 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 (); - /* No FILE arguments is now a usage error */ exit (2); } - do - { - String infile (arg); - Midi_def::reset_score_count (); - Paper_def::reset_score_count (); - - Path inpath = distill_inname (infile); - - /* By default, use base name of input file for output file name */ - Path outpath = inpath; - if (inpath.to_string () != "-") - outpath.ext = format_to_ext (output_format_global); - - /* By default, write output to cwd; do not copy directory part - of input file name */ - outpath.root = ""; - outpath.dir = ""; - - if (!output_name_global.empty_b ()) - outpath = split_path (output_name_global); - - String init; - if (!init_name_global.empty_b ()) - init = init_name_global; - else - init = "init.ly"; - - /* Burp: output name communication goes through _global */ - String save_output_name_global = output_name_global; - output_name_global = outpath.to_string (); - do_one_file (init, inpath.to_string ()); - output_name_global = save_output_name_global; - - p++; - } while ((arg = oparser_p_static->get_next_arg ())); - delete oparser_p_static; - oparser_p_static = 0; - exit (exit_status_global); -} + if (! jail_spec.is_empty ()) + do_chroot_jail (); + SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); + (void) result; -static int -sane_putenv (char const* key, char const* value, bool overwrite) -{ - if (overwrite || !getenv (key)) - { - String combine = String (key) + "=" + String (value); - char * s = strdup(combine.to_str0 ()); - return putenv (s); - } - return -1; + /* Unreachable. */ + exit (0); } -int -main (int argc, char **argv) +static void +setup_localisation () { - setup_paths (); - - /* - - These settings hopefully prepare lily for a lot of memory usage. - - In practice the effect on GC times is barely measurable -- larger - segments cost slighly less time for the conservative marking. (but - not impressively much) - - */ - sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304", false); - sane_putenv ("GUILE_MAX_SEGMENT_SIZE", "8388608", false); +#if HAVE_GETTEXT + /* Enable locales */ + setlocale (LC_ALL, ""); + + /* FIXME: check if this is still true. + 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 ()); +#endif +} - init_kpath (argv[0]); +static void +add_output_format (String format) +{ + if (output_format_global != "") + output_format_global += ","; + output_format_global += format; +} - bool help_b = false; - oparser_p_static = new Getopt_long (argc, argv, options_static); - while (Long_option_init const * opt = (*oparser_p_static) ()) +static void +parse_argv (int argc, char **argv) +{ + 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; + break; + case 'v': - version (); - exit (0); // we print a version anyway. + notice (); + exit (0); break; case 'o': { - String s = oparser_p_static->optional_argument_str0_; - Path p = split_path (s); - if (s != "-" && p.ext.empty_b ()) - p.ext = format_to_ext (output_format_global); - output_name_global = p.to_string (); + 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 += - oparser_p_static->optional_argument_str0_; + init_scheme_code_string += option_parser->optional_argument_str0_; break; case 'w': - notice (); + warranty (); exit (0); break; - case 'f': - if (oparser_p_static->optional_argument_str0_ == "help") - { - printf("See http://lilypond.org/wiki?OutputFormats for more information.\n"\ - "This option is for developers only.\n"); - exit (0); - } - output_format_global = oparser_p_static->optional_argument_str0_; + + case 'b': + output_backend_global = option_parser->optional_argument_str0_; break; - case 'P': - dependency_prefix_global = oparser_p_static->optional_argument_str0_; + + case 'f': + output_format_global = option_parser->optional_argument_str0_; break; + case 'H': - dump_header_fieldnames_global.push (oparser_p_static->optional_argument_str0_); + dump_header_fieldnames_global + .push (option_parser->optional_argument_str0_); break; case 'I': - global_path.push (oparser_p_static->optional_argument_str0_); + global_path.append (option_parser->optional_argument_str0_); break; case 'i': - init_name_global = oparser_p_static->optional_argument_str0_; + 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': - dependency_global_b = 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; } } - identify (stderr); - if (help_b) + if (show_help) { + identify (stdout); usage (); - if (verbose_global_b) - dirinfo (stdout); + if (be_verbose_global) + dir_info (stdout); exit (0); } +} + +int +main (int argc, char **argv) +{ + setup_localisation (); + setup_paths (); + parse_argv (argc, argv); + identify (stderr); - scm_boot_guile (argc, argv, (void (*) (void*, int, char**))main_prog, 0); + scm_boot_guile (argc, argv, main_with_guile, 0); - return 0; // unreachable + /* Unreachable */ + return 0; }