More debug stuff in client code.

Add missing rules to build man pages with .1m extension.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1594 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index fb6f97fb867ae609ae87cb76323f2d3ecf415426..72b55ce4c8863b69858d2aa20f71afc843ff8fd5 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.35 2001/02/20 17:32:58 mike Exp $"
+# "$Id: Makedefs.in,v 1.36 2001/03/01 18:10:40 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -149,14 +149,14 @@ MAN8EXT           =       @MAN8EXT@
 #
 
 .SILENT:
-.SUFFIXES:     .a .c .cxx .h .man .o .0 .1 .5 .8 .z
+.SUFFIXES:     .a .c .cxx .h .man .o .0 .1 .1m .5 .8 .z
 .c.o:
        echo Compiling $<...
        $(CC) $(OPTIM) $(CFLAGS) -c $<
 .cxx.o:
        echo Compiling $<...
        $(CXX) $(OPTIM) $(CXXFLAGS) -c $<
-.man.0 .man.1 .man.5 .man.8:
+.man.0 .man.1 .man.1m .man.5 .man.8:
        echo Formatting $<...
        $(RM) $@
        $(NROFF) -man $< >$@
@@ -168,5 +168,5 @@ MAN8EXT             =       @MAN8EXT@
        $(MV) t.z $@
 
 #
-# End of "$Id: Makedefs.in,v 1.35 2001/02/20 17:32:58 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.36 2001/03/01 18:10:40 mike Exp $"
 #

diff --git a/scheduler/client.c b/scheduler/client.c
index de1a80e565d43e3e1a9cea206f6db87433051296..0c3511554a413d41238e00ef638a1012e839d2e0 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.88 2001/02/23 01:15:15 mike Exp $"
+ * "$Id: client.c,v 1.89 2001/03/01 18:10:41 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -308,7 +308,7 @@ CloseClient(client_t *con)  /* I - Client to close */
 
   if (con->http.fd > 0)
   {
-    LogMessage(L_DEBUG2, "CloseClient: Removing fd %d from InputSet...",
+    LogMessage(L_DEBUG2, "CloseClient: Removing fd %d from InputSet and OutputSet...",
                con->http.fd);
     close(con->http.fd);
     FD_CLR(con->http.fd, &InputSet);
@@ -337,6 +337,8 @@ CloseClient(client_t *con)  /* I - Client to close */
 
     LogMessage(L_DEBUG2, "CloseClient() %d Closing data file %d.",
                con->http.fd, con->file);
+    LogMessage(L_DEBUG2, "CloseClient() %d Removing fd %d from InputSet.",
+               con->http.fd, con->file);
 
     FD_CLR(con->file, &InputSet);
     close(con->file);
@@ -1256,6 +1258,9 @@ SendCommand(client_t      *con,
   fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
 
   LogMessage(L_DEBUG2, "SendCommand: Adding fd %d to InputSet...", con->file);
+  LogMessage(L_DEBUG2, "SendCommand: Adding fd %d to OutputSet...",
+             con->http.fd);
+
   FD_SET(con->file, &InputSet);
   FD_SET(con->http.fd, &OutputSet);
 
@@ -1393,6 +1398,8 @@ SendFile(client_t    *con,
   if (httpPrintf(HTTP(con), "\r\n") < 0)
     return (0);
 
+  LogMessage(L_DEBUG2, "SendFile: Adding fd %d to OutputSet...", con->http.fd);
+
   FD_SET(con->http.fd, &OutputSet);
 
   return (1);
@@ -1572,6 +1579,9 @@ WriteClient(client_t *con)                /* I - Client connection */
 
     con->http.state = HTTP_WAITING;
 
+    LogMessage(L_DEBUG2, "WriteClient() Removing fd %d from OutputSet...",
+               con->http.fd);
+
     FD_CLR(con->http.fd, &OutputSet);
 
     if (con->file)
@@ -2101,5 +2111,5 @@ pipe_command(client_t *con,       /* I - Client connection */
 
 
 /*
- * End of "$Id: client.c,v 1.88 2001/02/23 01:15:15 mike Exp $".
+ * End of "$Id: client.c,v 1.89 2001/03/01 18:10:41 mike Exp $".
  */