X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..f0feb22e80bfe438c16d212a7cc8be6d2282b6ac:/server/trackname.c diff --git a/server/trackname.c b/server/trackname.c index 743ac06..b14e9e5 100644 --- a/server/trackname.c +++ b/server/trackname.c @@ -57,7 +57,7 @@ static void help(void) { /* display version number and terminate */ static void version(void) { - xprintf("disorder version %s\n", disorder_version_string); + xprintf("%s", disorder_version_string); xfclose(stdout); exit(0); } @@ -66,7 +66,6 @@ int main(int argc, char **argv) { int n; const char *s; - mem_init(0); if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); while((n = getopt_long(argc, argv, "hVc:d", options, 0)) >= 0) { switch(n) { @@ -79,7 +78,7 @@ int main(int argc, char **argv) { } if(argc - optind < 3) fatal(0, "not enough arguments"); if(argc - optind > 3) fatal(0, "too many arguments"); - if(config_read()) fatal(0, "cannot read configuration"); + if(config_read(0)) fatal(0, "cannot read configuration"); s = trackname_part(argv[optind], argv[optind+1], argv[optind+2]); if(!s) fatal(0, "trackname_part returned NULL"); xprintf("%s\n", nullcheck(utf82mb(s)));