chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed spurious failure with Interrupted system call; Fixed race when fd closed at...
[userv.git]
/
process.c
diff --git
a/process.c
b/process.c
index b091f4e5b8876b490f6159eb0a0f071eac07a51d..3ca468cea0414cffc31e94c7cc7299a6c5db6bb5 100644
(file)
--- a/
process.c
+++ b/
process.c
@@
-2,7
+2,7
@@
* userv - process.c
* daemon code to process one request (is parent of service process)
*
* userv - process.c
* daemon code to process one request (is parent of service process)
*
- * Copyright (C)1996-199
7
Ian Jackson
+ * Copyright (C)1996-199
9
Ian Jackson
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
@@
-60,6
+60,7
@@
#include "config.h"
#include "common.h"
#include "config.h"
#include "common.h"
+#include "both.h"
#include "daemon.h"
#include "lib.h"
#include "tokens.h"
#include "daemon.h"
#include "lib.h"
#include "tokens.h"
@@
-147,7
+148,7
@@
static void xfflush(FILE *file) {
static void xfread(void *p, size_t sz) {
size_t nr;
static void xfread(void *p, size_t sz) {
size_t nr;
- nr=
fread(p,1
,sz,srfile); if (nr == sz) return;
+ nr=
working_fread(p
,sz,srfile); if (nr == sz) return;
if (ferror(srfile)) syscallerror("reading from client");
blocksignals();
assert(feof(srfile));
if (ferror(srfile)) syscallerror("reading from client");
blocksignals();
assert(feof(srfile));