Merge config aliasing bug fix.

[disorder] / plugins / exec.c

diff --git a/plugins/exec.c b/plugins/exec.c
index fb01df7b841eed99b60bb45bf6c55d1a3bd5ddeb..f6ed8b37d4c8b1eeb6e75658a74b19bc67121826 100644 (file)
--- a/plugins/exec.c
+++ b/plugins/exec.c
@@ -1,23 +1,23 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  *
  * (at your option) any later version.
  *

- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file plugins/exec.c
+ * @brief Plugin to play a track by executing a command

  */
  */

-

 #include <config.h>
 
 #include <unistd.h>
 #include <config.h>
 
 #include <unistd.h>


@@ -46,7 +46,7 @@ void disorder_play_track(const char *const *parameters,
   vec[j++] = path;
   vec[j] = 0;
   execvp(vec[0], (char **)vec);
   vec[j++] = path;
   vec[j] = 0;
   execvp(vec[0], (char **)vec);

-  disorder_fatal(errno, "error executing %s", vec[0]);
+  disorder_fatal(errno, "executing %s", vec[0]);

 }
 
 /*
 }
 
 /*