chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't report failure just because MTA is being over-picky
[disorder]
/
clients
/
disorderfm.c
diff --git
a/clients/disorderfm.c
b/clients/disorderfm.c
index ccb2472783068fda484c13c2b5a47d80da06d5a4..b29330181e047ed3347f9085588d8274bc2ecf63 100644
(file)
--- a/
clients/disorderfm.c
+++ b/
clients/disorderfm.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006
, 2007, 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,8
+18,7
@@
* USA
*/
* USA
*/
-#include <config.h>
-#include "types.h"
+#include "common.h"
#include <getopt.h>
#include <unistd.h>
#include <getopt.h>
#include <unistd.h>
@@
-29,7
+28,6
@@
#include <dirent.h>
#include <sys/stat.h>
#include <langinfo.h>
#include <dirent.h>
#include <sys/stat.h>
#include <langinfo.h>
-#include <string.h>
#include <fnmatch.h>
#include "syscalls.h"
#include <fnmatch.h>
#include "syscalls.h"
@@
-38,6
+36,7
@@
#include "charset.h"
#include "defs.h"
#include "mem.h"
#include "charset.h"
#include "defs.h"
#include "mem.h"
+#include "version.h"
/* Arguments etc ----------------------------------------------------------- */
/* Arguments etc ----------------------------------------------------------- */
@@
-127,13
+126,6
@@
static void help(void) {
exit(0);
}
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("disorderfm version %s\n", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
/* Utilities --------------------------------------------------------------- */
/* Copy FROM to TO. Has the same signature as link/symlink. */
/* Utilities --------------------------------------------------------------- */
/* Copy FROM to TO. Has the same signature as link/symlink. */
@@
-356,7
+348,7
@@
int main(int argc, char **argv) {
while((n = getopt_long(argc, argv, "hVdf:t:i:e:ET:u:wlscn", options, 0)) >= 0) {
switch(n) {
case 'h': help();
while((n = getopt_long(argc, argv, "hVdf:t:i:e:ET:u:wlscn", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version(
"disorderfm"
);
case 'd': debugging = 1; break;
case 'f': fromencoding = optarg; break;
case 't': toencoding = optarg; break;
case 'd': debugging = 1; break;
case 'f': fromencoding = optarg; break;
case 't': toencoding = optarg; break;