Header file reorganization and cleaning up the public API for pppd version 2.5.0...

[ppp.git] / pppd / utils.c

diff --git a/pppd/utils.c b/pppd/utils.c
index bd82e2b4ec20031f5db5b70246e4ab9e83654426..c1bdbbbfe4e52d8a06edb3c8b22462580b3644a3 100644 (file)
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -58,7 +58,7 @@
 #include <sys/mkdev.h>
 #endif
 
-#include "pppd.h"
+#include "pppd-private.h"
 #include "fsm.h"
 #include "lcp.h"
 #include "pathnames.h"
@@ -768,7 +768,7 @@ complete_read(int fd, void *buf, size_t count)
        for (done = 0; done < count; ) {
                nb = read(fd, ptr, count - done);
                if (nb < 0) {
-                       if (errno == EINTR && !got_sigterm)
+                       if (errno == EINTR && !ppp_signaled(SIGTERM))
                                continue;
                        return -1;
                }