source file of the GNU LilyPond music typesetter
- (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
if (char const *env = getenv ("LILYPOND_DATADIR"))
{
-#ifdef __MINGW32__
/* Normalize file name. */
lilypond_datadir = File_name (env).to_string ();
-#else
- lilypond_datadir = env;
-#endif
}
/* When running from build dir, a full LILYPOND_DATADIR is set-up at
if (!is_dir (lilypond_datadir.c_str ())
&& is_dir (build_datadir_current.c_str ()))
lilypond_datadir = build_datadir_current;
+
+
+ lilypond_datadir = File_name (lilypond_datadir).canonicalized().to_string();
global_path.append ("");
string out;
while (ptr < start_ptr + len)
{
- char *dollar = strchr (ptr, '$');
+ const char *dollar = strchr (ptr, '$');
if (dollar != NULL)
{
- char *start_var = dollar + 1;
- char *end_var = start_var;
- char *start_next = end_var;
+ const char *start_var = dollar + 1;
+ const char *end_var = start_var;
+ const char *start_next = end_var;
out += string (ptr, dollar - ptr);
ptr = dollar;
return out;
}
-
+// Ugh - very inefficient, but safer than fgets.
static string
read_line (FILE *f)
{
int c = 0;
while ((c = fgetc (f)) != EOF && c != '\n')
- out += c;
+ out += char(c);
return out;
}