chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New disorder-choose program for performing random selection.
[disorder]
/
server
/
disorderd.c
diff --git
a/server/disorderd.c
b/server/disorderd.c
index e03e4d777dc665f994d3a5129f910edb031bc05f..2fd317d05b9d54ca99ab756c5dd1389f81e47616 100644
(file)
--- a/
server/disorderd.c
+++ b/
server/disorderd.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004
, 2005, 2006, 2007
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
@@
-57,6
+57,7
@@
#include "mixer.h"
#include "eventlog.h"
#include "printf.h"
#include "mixer.h"
#include "eventlog.h"
#include "printf.h"
+#include "version.h"
static ev_source *ev;
static ev_source *ev;
@@
-93,13
+94,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);
-}
-
/* SIGHUP callback */
static int handle_sighup(ev_source attribute((unused)) *ev_,
int attribute((unused)) sig,
/* SIGHUP callback */
static int handle_sighup(ev_source attribute((unused)) *ev_,
int attribute((unused)) sig,
@@
-217,7
+211,7
@@
int main(int argc, char **argv) {
while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) {
switch(n) {
case 'h': help();
while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version(
"disorderd"
);
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'f': background = 0; break;
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'f': background = 0; break;