papd: Send replies to client when printing to prompt more data to be …

…sent. Original patch by Nat Sloss.
rdmark · Jan 28, 2022 · c17f794 · c17f794
1 parent 196782d
commit c17f794
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/etc/papd/file.c b/etc/papd/file.c
@@ -40,7 +40,7 @@ int markline( struct papfile *pf, char **start, int *linelength, int *crlflength
     if ( *linelength >= pf->pf_datalen ) {
 	if ( pf->pf_state & PF_EOF ) {
 	    append( pf, "\n", 1 );
-	} else if (*linelength < 1024) {
+	} else {
 	    return( -1 );
 	}
     }
@@ -109,6 +109,20 @@ void append(struct papfile *pf, const char *data, int len)
 }
 
 
+void spoolreply(struct papfile *out, char *str)
+{
+    char	*pserr1 = "%%[ status: ";
+    char	*pserr2 = " ]%%\n";
+
+    if ( str == NULL ) {
+	str = "Spooler error.";
+    }
+
+    append( out, pserr1, strlen( pserr1 ));
+    append( out, str, strlen( str ));
+    append( out, pserr2, strlen( pserr2 ));
+}
+
 void spoolerror(struct papfile *out, char *str)
 {
     char	*pserr1 = "%%[ Error: ";

diff --git a/etc/papd/file.h b/etc/papd/file.h
@@ -41,5 +41,6 @@ int markline ( struct papfile *, char **, int *, int * );
 void morespace ( struct papfile *, const char *, int );
 void append ( struct papfile *, const char *, int );
 void spoolerror ( struct papfile *, char * );
+void spoolreply ( struct papfile *, char * );
 
 #endif /* PAPD_FILE_H */
diff --git a/etc/papd/magics.c b/etc/papd/magics.c
@@ -78,6 +78,7 @@ int ps( struct papfile *infile, struct papfile *outfile, struct sockaddr_at *sat
 		return( 0 );
 
 	    case -1 :
+		spoolreply( outfile, "Processing..." );
 		return( 0 );
 	    }
 
@@ -130,6 +131,7 @@ int cm_psquery( struct papfile *in, struct papfile *out, struct sockaddr_at *sat
 	    return( CH_DONE );
 
 	case -1 :
+	    spoolreply( out, "Processing..." );
 	    return( CH_MORE );
 
         case -2 :