Only retry connect on EINTR.

[userv.git] / servexec.c

diff --git a/servexec.c b/servexec.c
index 71412a7266f7fd5804b37992dfa1d94a0b389f7b..2b110126abc0fa5fabf93d530eb5c6ff8733c77c 100644 (file)
--- a/servexec.c
+++ b/servexec.c
@@ -68,23 +68,23 @@ void bisexec_version(const char *const *argv) {
         "production version"
 #endif
         " - protocol magic number %08lx\n"
         "production version"
 #endif
         " - protocol magic number %08lx\n"

-        "protocol checksum: ",
-        BASE_MAGIC);
-  for (i=0, p=protocolchecksumversion; i<sizeof(protocolchecksumversion); i++, p++)
-    printf("%02x",*p);
-  printf("\n"
-        "rendezvous socket: `" RENDEZVOUSPATH "'\n"
-        "system config dir: `" SYSTEMCONFIGDIR "'\n"
-        "pipe filename format: `%s' (max length %d)\n"

         "maximums:    fd %-10d                general string %d\n"
         "maximums:    fd %-10d                general string %d\n"

-        "             gids %-10d              override length %d\n\n"
+        "             gids %-10d              override length %d\n"

         "             args or variables %-10d error message %d\n"
         "             args or variables %-10d error message %d\n"

-        "             nested inclusion %-10d  errno string reserve %d\n",
-        PIPEFORMAT, PIPEMAXLEN,
+        "             nested inclusion %-10d  errno string reserve %d\n"
+        "protocol checksum: ",
+        BASE_MAGIC,

         MAX_ALLOW_FD, MAX_GENERAL_STRING,
         MAX_GIDS, MAX_OVERRIDE_LEN,
         MAX_ARGSDEFVAR, ERRMSG_RESERVE_ERRNO,
         MAX_INCLUDE_NEST, MAX_ERRMSG_LEN);
         MAX_ALLOW_FD, MAX_GENERAL_STRING,
         MAX_GIDS, MAX_OVERRIDE_LEN,
         MAX_ARGSDEFVAR, ERRMSG_RESERVE_ERRNO,
         MAX_INCLUDE_NEST, MAX_ERRMSG_LEN);

+  for (i=0, p=protocolchecksumversion; i<sizeof(protocolchecksumversion); i++, p++)
+    printf("%02x",*p);
+  printf("\n"
+        "rendezvous socket: `" RENDEZVOUSPATH "'\n"
+        "system config dir: `" SYSTEMCONFIGDIR "'\n"
+        "pipe filename format: `%s' (max length %d)\n",
+        PIPEFORMAT, PIPEMAXLEN);

   serv_checkstdoutexit();
 }
 
   serv_checkstdoutexit();
 }