chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux build fix
[disorder]
/
server
/
trackname.c
diff --git
a/server/trackname.c
b/server/trackname.c
index b14e9e5a12903d5f2e4a4a77eb7cd8492e51ce70..3639c52bd43c3f9c347cc7f6f59a144caba9ffb6 100644
(file)
--- a/
server/trackname.c
+++ b/
server/trackname.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004
, 2005, 2006
Richard Kettlewell
+ * Copyright (C) 2004
-2008
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-18,21
+18,7
@@
* USA
*/
* USA
*/
-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <locale.h>
-#include <errno.h>
-#include <string.h>
-
-#include "configuration.h"
-#include "syscalls.h"
-#include "log.h"
-#include "trackname.h"
-#include "mem.h"
-#include "charset.h"
-#include "defs.h"
+#include "disorder-server.h"
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
@@
-55,13
+41,6
@@
static void help(void) {
exit(0);
}
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("%s", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
int main(int argc, char **argv) {
int n;
const char *s;
int main(int argc, char **argv) {
int n;
const char *s;
@@
-70,7
+49,7
@@
int main(int argc, char **argv) {
while((n = getopt_long(argc, argv, "hVc:d", options, 0)) >= 0) {
switch(n) {
case 'h': help();
while((n = getopt_long(argc, argv, "hVc:d", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version(
"trackname"
);
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
default: fatal(0, "invalid option");
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
default: fatal(0, "invalid option");