Remove bdb env on exit

[netatalk.git] / etc / papd / file.c

diff --git a/etc/papd/file.c b/etc/papd/file.c
index 62e3c033eb35515fa2f8a010dcc18e535efdfd51..068b5d71634418e09f884d0e86e09e2f0df1171b 100644 (file)
--- a/etc/papd/file.c
+++ b/etc/papd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.9 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: file.c,v 1.12 2009-10-14 02:24:05 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -17,10 +17,9 @@
 
 #include "file.h"
 
-int markline( pf, start, linelength, crlflength )
-    char               **start;
-    int                        *linelength, *crlflength;
-    struct papfile     *pf;
+/* 
+*/
+int markline( struct papfile *pf, char **start, int *linelength, int *crlflength )
 {
     char               *p;
 
@@ -53,15 +52,18 @@ int markline( pf, start, linelength, crlflength )
     (p[*crlflength]=='\r' || p[*crlflength]=='\n')) {
        (*crlflength)++;
     }
+    
+    if (!*crlflength) {
+        /* line is way too long, something fishy is going on, give up */
+        LOG(log_error, logtype_papd, "markline: no crlf in comment, give up" );
+        return( -2 );
+    }
 
     /* success, return 1 */
     return( 1 );
 }
 
-void morespace( pf, data, len )
-    struct papfile     *pf;
-    const char         *data;
-    int                        len;
+void morespace(struct papfile *pf, const char *data, int len)
 {
     char               *nbuf;
     int                        nsize;
@@ -75,11 +77,11 @@ void morespace( pf, data, len )
        nsize = (( pf->pf_bufsize + len ) / PF_MORESPACE +
                (( pf->pf_bufsize + len ) % PF_MORESPACE != 0 )) * PF_MORESPACE;
        if ( pf->pf_buf ) {
-           if (( nbuf = (char *)realloc( pf->pf_buf, nsize )) == 0 ) {
+           if (( nbuf = (char *)realloc( pf->pf_buf, nsize )) == NULL ) {
                exit( 1 );
            }
        } else {
-           if (( nbuf = (char *)malloc( nsize )) == 0 ) {
+           if (( nbuf = (char *)malloc( nsize )) == NULL ) {
                exit( 1 );
            }
        }
@@ -93,10 +95,7 @@ void morespace( pf, data, len )
 }
 
 
-void append(pf, data, len)
-    struct papfile     *pf;
-    const char         *data;
-    int                        len;
+void append(struct papfile *pf, const char *data, int len)
 {
     if ((pf->pf_data + pf->pf_datalen + len) >
        (pf->pf_buf + pf->pf_bufsize)) {
@@ -108,9 +107,7 @@ void append(pf, data, len)
 }
 
 
-void spoolerror( out, str )
-    struct papfile     *out;
-    char               *str;
+void spoolerror(struct papfile *out, char *str)
 {
     char       *pserr1 = "%%[ Error: ";
     char       *pserr2 = " ]%%\n";