chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog WIP
[userv.git]
/
client.c
diff --git
a/client.c
b/client.c
index c5fbcd5a356dffaa61d3178932035dad1070a1a4..47600090ecc09fcda86200b41f3e08db83bf6463 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-432,8
+432,8
@@
static void usage(FILE *stream) {
"(separate with commas) append sync excl[usive] creat[e] fd\n"
"userv -B 'X' ... is same as userv --override 'execute-builtin X' - 'X' ...\n"
" for help, type `userv -B help'; remember to quote multi-word X\n"
"(separate with commas) append sync excl[usive] creat[e] fd\n"
"userv -B 'X' ... is same as userv --override 'execute-builtin X' - 'X' ...\n"
" for help, type `userv -B help'; remember to quote multi-word X\n"
- "userv and uservd version " VERSION VEREXT "
; copyright (C)1996-1999 Ian Jackson
.\n"
-
"there is NO WARRANTY; type `userv --copyright' for details.\n"
,
+ "userv and uservd version " VERSION VEREXT ".\n"
+
COPYRIGHT("","\n")
,
stream) < 0)
syscallerror("write usage message");
}
stream) < 0)
syscallerror("write usage message");
}
@@
-725,7
+725,9
@@
static void of_version(const struct optioninfo *oip, const char *value, char *ke
static void of_copyright(const struct optioninfo *oip, const char *value, char *key) {
if (fputs(
static void of_copyright(const struct optioninfo *oip, const char *value, char *key) {
if (fputs(
-" userv - user service daemon and client; copyright (C)1996-1999 Ian Jackson\n\n"
+" userv - user service daemon and client\n\n"
+COPYRIGHT(" ","\n")
+"\n"
" This is free software; you can redistribute it and/or modify it under the\n"
" terms of the GNU General Public License as published by the Free Software\n"
" Foundation; either version 2 of the License, or (at your option) any\n"
" This is free software; you can redistribute it and/or modify it under the\n"
" terms of the GNU General Public License as published by the Free Software\n"
" Foundation; either version 2 of the License, or (at your option) any\n"
@@
-735,9
+737,7
@@
static void of_copyright(const struct optioninfo *oip, const char *value, char *
" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General\n"
" Public License for more details.\n\n"
" You should have received a copy of the GNU General Public License along\n"
" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General\n"
" Public License for more details.\n\n"
" You should have received a copy of the GNU General Public License along\n"
-" with userv; if not, write to Ian Jackson <ian@davenant.greenend.org.uk> or\n"
-" to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,\n"
-" MA 02111-1307, USA.\n",
+" with userv; if not, see <http://www.gnu.org/licenses/>.\n",
stdout) < 0) syscallerror("write usage to stderr");
exit(0);
}
stdout) < 0) syscallerror("write usage to stderr");
exit(0);
}
@@
-1160,7
+1160,7
@@
static void prepare_asynchsignals(void) {
if (sigaction(SIGALRM,&sig,0)) syscallerror("set up sigalrm handler");
if (!timeout) return;
if (sigaction(SIGALRM,&sig,0)) syscallerror("set up sigalrm handler");
if (!timeout) return;
-
if (alarm(timeout)<0) syscallerror("set up timeout alarm"
);
+
alarm(timeout
);
}
}