debian: Use debhelper to generate maint scripts

[userv.git] / servexec.c

diff --git a/servexec.c b/servexec.c
index 7b1bcc015be6ca93d8868857f769539b72d5d63f..80b754c1dd31938ae3092ce1363f8c62f9c50e76 100644 (file)
--- a/servexec.c
+++ b/servexec.c
@@ -2,11 +2,12 @@
  * userv - execserv.c
  * daemon code which executes actual service (ie child process)
  *
- * Copyright (C)1996-1997,1999-2001,2003 Ian Jackson
+ * userv is copyright Ian Jackson and other contributors.
+ * See README for full authorship information.
  *
  * This is free software; you can redistribute it and/or modify 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.
  *
  * This program is distributed in the hope that it will be useful, but
@@ -15,8 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with userv; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with userv; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -71,7 +71,7 @@ void bisexec_version(const char *const *argv) {
   const unsigned char *p;
   int i;
   
-  printf("uservd version " VERSION VEREXT "; copyright (C)1996-2000 Ian Jackson.\n"
+  printf("uservd version " VERSION VEREXT "\n"
 #ifdef DEBUG
         "DEBUGGING VERSION"
 #else
@@ -93,7 +93,8 @@ void bisexec_version(const char *const *argv) {
   printf("\n"
         "rendezvous socket: `" RENDEZVOUSPATH "'\n"
         "system config dir: `" SYSTEMCONFIGDIR "'\n"
-        "pipe filename format: `%s' (max length %d)\n",
+        "pipe filename format: `%s' (max length %d)\n"
+        COPYRIGHT("","\n"),
         PIPEFORMAT, PIPEMAXLEN);
   serv_checkstdoutexit();
 }
@@ -225,6 +226,7 @@ void execservice(const int synchsocket[], int clientfd) {
     0
   };
   int fd, realfd, holdfd, newfd, r, envvarbufsize=0, targ, nargs, i, l, fdflags;
+  int unused;
   char *envvarbuf=0;
   const char **args, *const *cpp;
   char *const *pp;
@@ -233,7 +235,8 @@ void execservice(const int synchsocket[], int clientfd) {
 
   if (dup2(fdarray[2].realfd,2)<0) {
     static const char duperrmsg[]= "uservd(service): cannot dup2 for stderr\n";
-    write(fdarray[2].realfd,duperrmsg,sizeof(duperrmsg)-1);
+    unused= write(fdarray[2].realfd,duperrmsg,sizeof(duperrmsg)-1);
+    (void)unused;
     _exit(-1);
   }
   serv_resetsignal(SIGPIPE);
@@ -247,6 +250,7 @@ void execservice(const int synchsocket[], int clientfd) {
   if (r!=1) serv_syscallfail("write synch byte to parent");
   r= synchread(synchsocket[1],'g');
   if (r) serv_syscallfail("reach synch byte from parent");
+  if (close(synchsocket[1])) serv_syscallfail("close our synch socket");
 
   if (close(clientfd)) serv_syscallfail("close client socket fd");