patches/procmail-03-large-files.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 218 39b7a0a2d4b2
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
60fdac847787 initial import
laca_
parents:
diff changeset
     1
diff -urN procmail-3.22/src/cstdio.c procmail-3.22-hacked/src/cstdio.c
60fdac847787 initial import
laca_
parents:
diff changeset
     2
--- procmail-3.22/src/cstdio.c	2000-12-31 19:08:20.000000000 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
     3
+++ procmail-3.22-hacked/src/cstdio.c	2005-10-21 13:22:42.484383152 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
     4
@@ -266,7 +266,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
     5
 }
60fdac847787 initial import
laca_
parents:
diff changeset
     6
 
60fdac847787 initial import
laca_
parents:
diff changeset
     7
 /* read a bunch of characters from the LMTP input stream */
60fdac847787 initial import
laca_
parents:
diff changeset
     8
-int readL(p,len)char*p;const int len;
60fdac847787 initial import
laca_
parents:
diff changeset
     9
+int readL(p,len)char*p;const size_t len;
60fdac847787 initial import
laca_
parents:
diff changeset
    10
 { size_t min;
60fdac847787 initial import
laca_
parents:
diff changeset
    11
   if(rcbufp==rcbufend)
60fdac847787 initial import
laca_
parents:
diff changeset
    12
      refillL();
60fdac847787 initial import
laca_
parents:
diff changeset
    13
@@ -282,8 +282,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    14
  * read exactly len bytes from the LMTP input stream
60fdac847787 initial import
laca_
parents:
diff changeset
    15
  * return 1 on success, 0 on EOF, and -1 on read error
60fdac847787 initial import
laca_
parents:
diff changeset
    16
  */
60fdac847787 initial import
laca_
parents:
diff changeset
    17
-int readLe(p,len)char*p;int len;
60fdac847787 initial import
laca_
parents:
diff changeset
    18
-{ long got=rcbufend-rcbufp;
60fdac847787 initial import
laca_
parents:
diff changeset
    19
+int readLe(p,len)char*p;size_t len;
60fdac847787 initial import
laca_
parents:
diff changeset
    20
+{  off_t got = rcbufend-rcbufp;
60fdac847787 initial import
laca_
parents:
diff changeset
    21
   if(got>0)				      /* first, copy from the buffer */
60fdac847787 initial import
laca_
parents:
diff changeset
    22
    { if(got>len)			       /* is that more than we need? */
60fdac847787 initial import
laca_
parents:
diff changeset
    23
 	got=len;
60fdac847787 initial import
laca_
parents:
diff changeset
    24
diff -urN procmail-3.22/src/cstdio.h procmail-3.22-hacked/src/cstdio.h
60fdac847787 initial import
laca_
parents:
diff changeset
    25
--- procmail-3.22/src/cstdio.h	2000-12-31 19:08:21.000000000 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
    26
+++ procmail-3.22-hacked/src/cstdio.h	2005-10-21 13:22:42.476384368 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
    27
@@ -26,6 +26,6 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    28
 int
60fdac847787 initial import
laca_
parents:
diff changeset
    29
  endoread P((void)),
60fdac847787 initial import
laca_
parents:
diff changeset
    30
  getL P((void)),
60fdac847787 initial import
laca_
parents:
diff changeset
    31
- readL P((char*,const int)),
60fdac847787 initial import
laca_
parents:
diff changeset
    32
- readLe P((char*,int));
60fdac847787 initial import
laca_
parents:
diff changeset
    33
+ readL P((char*,const size_t)),
60fdac847787 initial import
laca_
parents:
diff changeset
    34
+ readLe P((char*,size_t));
60fdac847787 initial import
laca_
parents:
diff changeset
    35
 #endif
60fdac847787 initial import
laca_
parents:
diff changeset
    36
diff -urN procmail-3.22/src/formail.c procmail-3.22-hacked/src/formail.c
60fdac847787 initial import
laca_
parents:
diff changeset
    37
--- procmail-3.22/src/formail.c	2005-10-21 13:22:14.140692048 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
    38
+++ procmail-3.22-hacked/src/formail.c	2005-10-21 13:22:42.509379352 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
    39
@@ -304,7 +304,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    40
 }
60fdac847787 initial import
laca_
parents:
diff changeset
    41
 			     /* lifted out of main() to reduce main()'s size */
60fdac847787 initial import
laca_
parents:
diff changeset
    42
 static void elimdups(namep,idcache,maxlen,split)const char*const namep;
60fdac847787 initial import
laca_
parents:
diff changeset
    43
- FILE*idcache;const long maxlen;const int split;
60fdac847787 initial import
laca_
parents:
diff changeset
    44
+ FILE*idcache;const off_t maxlen;const int split;
60fdac847787 initial import
laca_
parents:
diff changeset
    45
 { int dupid=0;char*key,*oldnewl;
60fdac847787 initial import
laca_
parents:
diff changeset
    46
   key=(char*)namep;		  /* not to worry, no change will be noticed */
60fdac847787 initial import
laca_
parents:
diff changeset
    47
   if(!areply)
60fdac847787 initial import
laca_
parents:
diff changeset
    48
@@ -313,7 +313,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    49
 	*(oldnewl=(key=msid->rexp)+msid->rexl-1)='\0';
60fdac847787 initial import
laca_
parents:
diff changeset
    50
    }						/* wipe out trailing newline */
60fdac847787 initial import
laca_
parents:
diff changeset
    51
   if(key)
60fdac847787 initial import
laca_
parents:
diff changeset
    52
-   { long insoffs=maxlen;
60fdac847787 initial import
laca_
parents:
diff changeset
    53
+   { off_t insoffs=maxlen;
60fdac847787 initial import
laca_
parents:
diff changeset
    54
      while(*key==' ')				     /* strip leading spaces */
60fdac847787 initial import
laca_
parents:
diff changeset
    55
 	key++;
60fdac847787 initial import
laca_
parents:
diff changeset
    56
      do
60fdac847787 initial import
laca_
parents:
diff changeset
    57
@@ -350,7 +350,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    58
      fseek(idcache,insoffs,SEEK_SET);fwrite(key,1,strlen(key)+1,idcache);
60fdac847787 initial import
laca_
parents:
diff changeset
    59
      putc('\0',idcache);			   /* mark new end of buffer */
60fdac847787 initial import
laca_
parents:
diff changeset
    60
 dupfound:
60fdac847787 initial import
laca_
parents:
diff changeset
    61
-     fseek(idcache,(long)0,SEEK_SET);		 /* rewind, for any next run */
60fdac847787 initial import
laca_
parents:
diff changeset
    62
+     fseek(idcache,(off_t)0,SEEK_SET);		 /* rewind, for any next run */
60fdac847787 initial import
laca_
parents:
diff changeset
    63
      if(!areply)
60fdac847787 initial import
laca_
parents:
diff changeset
    64
 	*oldnewl='\n';				      /* restore the newline */
60fdac847787 initial import
laca_
parents:
diff changeset
    65
    }
60fdac847787 initial import
laca_
parents:
diff changeset
    66
@@ -366,7 +366,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    67
 { int i,split=0,force=0,bogus=1,every=0,headreply=0,digest=0,nowait=0,keepb=0,
60fdac847787 initial import
laca_
parents:
diff changeset
    68
    minfields=(char*)progid-(char*)progid,conctenate=0,babyl=0,babylstart,
60fdac847787 initial import
laca_
parents:
diff changeset
    69
    berkeley=0,forgetclen;
60fdac847787 initial import
laca_
parents:
diff changeset
    70
-  long maxlen,ctlength;FILE*idcache=0;pid_t thepid;
60fdac847787 initial import
laca_
parents:
diff changeset
    71
+  off_t maxlen,ctlength;FILE*idcache=0;pid_t thepid;
60fdac847787 initial import
laca_
parents:
diff changeset
    72
   size_t j,lnl,escaplen;char*chp,*namep,*escap=ESCAP;
60fdac847787 initial import
laca_
parents:
diff changeset
    73
   struct field*fldp,*fp2,**afldp,*fdate,*fcntlength,*fsubject,*fFrom_;
60fdac847787 initial import
laca_
parents:
diff changeset
    74
   if(lastm)			       /* sanity check, any argument at all? */
60fdac847787 initial import
laca_
parents:
diff changeset
    75
diff -urN procmail-3.22/src/lmtp.c procmail-3.22-hacked/src/lmtp.c
60fdac847787 initial import
laca_
parents:
diff changeset
    76
--- procmail-3.22/src/lmtp.c	2001-06-29 14:20:51.000000000 +1200
60fdac847787 initial import
laca_
parents:
diff changeset
    77
+++ procmail-3.22-hacked/src/lmtp.c	2005-10-21 13:22:42.516378288 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
    78
@@ -72,8 +72,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    79
  protobad[]="503 5.5.1 command unexpected\r\n";
60fdac847787 initial import
laca_
parents:
diff changeset
    80
 
60fdac847787 initial import
laca_
parents:
diff changeset
    81
 static void bufwrite(buffer,len,flush)
60fdac847787 initial import
laca_
parents:
diff changeset
    82
-const char*buffer;int len;int flush;
60fdac847787 initial import
laca_
parents:
diff changeset
    83
-{ int already;
60fdac847787 initial import
laca_
parents:
diff changeset
    84
+const char*buffer;size_t len;int flush;
60fdac847787 initial import
laca_
parents:
diff changeset
    85
+{ size_t already;
60fdac847787 initial import
laca_
parents:
diff changeset
    86
   if((already=bufcur-buf2)+len>linebuf||flush)
60fdac847787 initial import
laca_
parents:
diff changeset
    87
    { if(already&&already!=rwrite(savstdout,bufcur=buf2,already)||
60fdac847787 initial import
laca_
parents:
diff changeset
    88
       len&&len!=rwrite(savstdout,buffer,len))
60fdac847787 initial import
laca_
parents:
diff changeset
    89
diff -urN procmail-3.22/src/lockfile.c procmail-3.22-hacked/src/lockfile.c
60fdac847787 initial import
laca_
parents:
diff changeset
    90
--- procmail-3.22/src/lockfile.c	2001-09-11 16:58:04.000000000 +1200
60fdac847787 initial import
laca_
parents:
diff changeset
    91
+++ procmail-3.22-hacked/src/lockfile.c	2005-10-21 13:22:42.478384064 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
    92
@@ -263,7 +263,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    93
 { return open(name,mode,mask);					     /* stub */
60fdac847787 initial import
laca_
parents:
diff changeset
    94
 }
60fdac847787 initial import
laca_
parents:
diff changeset
    95
 
60fdac847787 initial import
laca_
parents:
diff changeset
    96
-int rwrite(fd,a,len)const int fd;const void*const a;const int len;   /* stub */
60fdac847787 initial import
laca_
parents:
diff changeset
    97
+int rwrite(fd,a,len)const int fd;const void*const a;const size_t len;   /* stub */
60fdac847787 initial import
laca_
parents:
diff changeset
    98
 { return write(fd,a,len);
60fdac847787 initial import
laca_
parents:
diff changeset
    99
 }
60fdac847787 initial import
laca_
parents:
diff changeset
   100
 
60fdac847787 initial import
laca_
parents:
diff changeset
   101
diff -urN procmail-3.22/src/mailfold.c procmail-3.22-hacked/src/mailfold.c
60fdac847787 initial import
laca_
parents:
diff changeset
   102
--- procmail-3.22/src/mailfold.c	2005-10-21 13:22:14.227678824 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   103
+++ procmail-3.22-hacked/src/mailfold.c	2005-10-21 13:22:42.527376616 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   104
@@ -30,7 +30,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   105
 
60fdac847787 initial import
laca_
parents:
diff changeset
   106
 int logopened,rawnonl;
60fdac847787 initial import
laca_
parents:
diff changeset
   107
 off_t lasttell;
60fdac847787 initial import
laca_
parents:
diff changeset
   108
-static long lastdump;
60fdac847787 initial import
laca_
parents:
diff changeset
   109
+static off_t lastdump;
60fdac847787 initial import
laca_
parents:
diff changeset
   110
 static volatile int mailread;	/* if the mail is completely read in already */
60fdac847787 initial import
laca_
parents:
diff changeset
   111
 static struct dyna_array confield;		  /* escapes, concatenations */
60fdac847787 initial import
laca_
parents:
diff changeset
   112
 static const char*realstart,*restbody;
60fdac847787 initial import
laca_
parents:
diff changeset
   113
@@ -78,8 +78,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   114
 #endif /* eMAILBOX_SEPARATOR */
60fdac847787 initial import
laca_
parents:
diff changeset
   115
 
60fdac847787 initial import
laca_
parents:
diff changeset
   116
 long dump(s,type,source,len)const int s,type;const char*source;
60fdac847787 initial import
laca_
parents:
diff changeset
   117
- long len;
60fdac847787 initial import
laca_
parents:
diff changeset
   118
-{ int i;long part;
60fdac847787 initial import
laca_
parents:
diff changeset
   119
+ size_t len;
60fdac847787 initial import
laca_
parents:
diff changeset
   120
+{ int i;size_t part;
60fdac847787 initial import
laca_
parents:
diff changeset
   121
   lasttell=i= -1;SETerrno(EBADF);
60fdac847787 initial import
laca_
parents:
diff changeset
   122
   if(s>=0)
60fdac847787 initial import
laca_
parents:
diff changeset
   123
    { if(ft_lock(type)&&(lseek(s,(off_t)0,SEEK_END),fdlock(s)))
60fdac847787 initial import
laca_
parents:
diff changeset
   124
@@ -105,7 +105,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   125
      goto jin;
60fdac847787 initial import
laca_
parents:
diff changeset
   126
      do
60fdac847787 initial import
laca_
parents:
diff changeset
   127
       { part=getchunk(s,source,len);
60fdac847787 initial import
laca_
parents:
diff changeset
   128
-jin:	while(part&&(i=rwrite(s,source,BLKSIZ<part?BLKSIZ:(int)part)))
60fdac847787 initial import
laca_
parents:
diff changeset
   129
+jin:	while(part&&(i=rwrite(s,source, BLKSIZ < part ? BLKSIZ : (size_t)part )))
60fdac847787 initial import
laca_
parents:
diff changeset
   130
 	 { if(i<0)
60fdac847787 initial import
laca_
parents:
diff changeset
   131
 	      goto writefin;
60fdac847787 initial import
laca_
parents:
diff changeset
   132
 	   part-=i;len-=i;source+=i;
60fdac847787 initial import
laca_
parents:
diff changeset
   133
diff -urN procmail-3.22/src/mailfold.h procmail-3.22-hacked/src/mailfold.h
60fdac847787 initial import
laca_
parents:
diff changeset
   134
--- procmail-3.22/src/mailfold.h	2000-12-31 19:08:34.000000000 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   135
+++ procmail-3.22-hacked/src/mailfold.h	2005-10-21 13:22:42.510379200 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   136
@@ -1,7 +1,7 @@
218
39b7a0a2d4b2 2007-04-02 Damien Carbery <[email protected]>
daymobrew
parents: 1
diff changeset
   137
 /*$Id: mailfold.h,v 1.24 2000/10/25 08:13:20 guenther Exp $*/
1
60fdac847787 initial import
laca_
parents:
diff changeset
   138
 
60fdac847787 initial import
laca_
parents:
diff changeset
   139
 long
60fdac847787 initial import
laca_
parents:
diff changeset
   140
- dump P((const int s,const int type,const char*source,long len));
60fdac847787 initial import
laca_
parents:
diff changeset
   141
+ dump P((const int s,const int type,const char*source,size_t len));
60fdac847787 initial import
laca_
parents:
diff changeset
   142
 int
60fdac847787 initial import
laca_
parents:
diff changeset
   143
  writefolder P((char*boxname,char*linkfolder,const char*source,long len,
60fdac847787 initial import
laca_
parents:
diff changeset
   144
   const int ignwerr,const int dolock));
60fdac847787 initial import
laca_
parents:
diff changeset
   145
diff -urN procmail-3.22/src/memblk.c procmail-3.22-hacked/src/memblk.c
60fdac847787 initial import
laca_
parents:
diff changeset
   146
--- procmail-3.22/src/memblk.c	2005-10-21 13:22:14.141691896 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   147
+++ procmail-3.22-hacked/src/memblk.c	2005-10-21 13:22:42.535375400 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   148
@@ -29,7 +29,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   149
 #define set_fd(mb,num)	do{}while(0)
60fdac847787 initial import
laca_
parents:
diff changeset
   150
 #endif
60fdac847787 initial import
laca_
parents:
diff changeset
   151
 
60fdac847787 initial import
laca_
parents:
diff changeset
   152
-void makeblock(mb,len)memblk*const mb;const long len;
60fdac847787 initial import
laca_
parents:
diff changeset
   153
+void makeblock(mb,len)memblk*const mb;const off_t len;
60fdac847787 initial import
laca_
parents:
diff changeset
   154
 { mb->len=0;mb->p=malloc(1);set_fd(mb,-1);
60fdac847787 initial import
laca_
parents:
diff changeset
   155
   if(len)
60fdac847787 initial import
laca_
parents:
diff changeset
   156
      resizeblock(mb,len,0);
60fdac847787 initial import
laca_
parents:
diff changeset
   157
@@ -51,7 +51,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   158
 {
60fdac847787 initial import
laca_
parents:
diff changeset
   159
 #ifdef USE_MMAP
60fdac847787 initial import
laca_
parents:
diff changeset
   160
   if(mb->fd>=0)
60fdac847787 initial import
laca_
parents:
diff changeset
   161
-   { long mlen=mb->len+1;
60fdac847787 initial import
laca_
parents:
diff changeset
   162
+   { off_t mlen=mb->len+1;
60fdac847787 initial import
laca_
parents:
diff changeset
   163
      if(munmap(mb->p,mlen))
60fdac847787 initial import
laca_
parents:
diff changeset
   164
 	mmapfailed(mlen);		      /* don't want to continue here */
60fdac847787 initial import
laca_
parents:
diff changeset
   165
      if((mb->p=mmap(0,mlen,PROT_READ,MAP_PRIVATE,mb->fd,(off_t)0))==MAP_FAILED)
60fdac847787 initial import
laca_
parents:
diff changeset
   166
@@ -62,7 +62,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   167
 #endif
60fdac847787 initial import
laca_
parents:
diff changeset
   168
 }
60fdac847787 initial import
laca_
parents:
diff changeset
   169
 
60fdac847787 initial import
laca_
parents:
diff changeset
   170
-int resizeblock(mb,len,nonfatal)memblk*const mb;const long len;
60fdac847787 initial import
laca_
parents:
diff changeset
   171
+int resizeblock(mb,len,nonfatal)memblk*const mb;const off_t len;
60fdac847787 initial import
laca_
parents:
diff changeset
   172
  const int nonfatal;
60fdac847787 initial import
laca_
parents:
diff changeset
   173
 { if(len==mb->len)
60fdac847787 initial import
laca_
parents:
diff changeset
   174
      goto ret1;
60fdac847787 initial import
laca_
parents:
diff changeset
   175
@@ -134,7 +134,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   176
  read_func_type*read_func;cleanup_func_type*cleanup_func;
60fdac847787 initial import
laca_
parents:
diff changeset
   177
  long*const filledp;void*data;
60fdac847787 initial import
laca_
parents:
diff changeset
   178
 { int blksiz=BLKSIZ,ok;unsigned int shift=EXPBLKSIZ;
60fdac847787 initial import
laca_
parents:
diff changeset
   179
-  long filled= *filledp,origfilled=filled;
60fdac847787 initial import
laca_
parents:
diff changeset
   180
+  size_t filled= *filledp,origfilled=filled;
60fdac847787 initial import
laca_
parents:
diff changeset
   181
   if(filled<mb->len)		 /* skip the initial resize if we have space */
60fdac847787 initial import
laca_
parents:
diff changeset
   182
      goto jumpin;
60fdac847787 initial import
laca_
parents:
diff changeset
   183
   for(;;)
60fdac847787 initial import
laca_
parents:
diff changeset
   184
@@ -160,7 +160,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   185
 	   blksiz=newbs;				    /* yes, take me! */
60fdac847787 initial import
laca_
parents:
diff changeset
   186
       }
60fdac847787 initial import
laca_
parents:
diff changeset
   187
    }
60fdac847787 initial import
laca_
parents:
diff changeset
   188
-  if(cleanup_func&&(*cleanup_func)(mb,&filled,origfilled,data))
60fdac847787 initial import
laca_
parents:
diff changeset
   189
+  if(cleanup_func&&(*cleanup_func)(mb,(long*)&filled,origfilled,data))
60fdac847787 initial import
laca_
parents:
diff changeset
   190
      goto jumpin;
60fdac847787 initial import
laca_
parents:
diff changeset
   191
   resizeblock(mb,filled+1,1);		      /* minimise+1 for housekeeping */
60fdac847787 initial import
laca_
parents:
diff changeset
   192
   *filledp=filled;				 /* write back the new value */
60fdac847787 initial import
laca_
parents:
diff changeset
   193
diff -urN procmail-3.22/src/memblk.h procmail-3.22-hacked/src/memblk.h
60fdac847787 initial import
laca_
parents:
diff changeset
   194
--- procmail-3.22/src/memblk.h	2005-10-21 13:22:14.194683840 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   195
+++ procmail-3.22-hacked/src/memblk.h	2005-10-21 13:22:42.473384824 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   196
@@ -1,6 +1,6 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   197
 typedef struct memblk {
60fdac847787 initial import
laca_
parents:
diff changeset
   198
     char*p;						  /* where it starts */
60fdac847787 initial import
laca_
parents:
diff changeset
   199
-    long len;			 /* current size, not including trailing NUL */
60fdac847787 initial import
laca_
parents:
diff changeset
   200
+    off_t len;			 /* current size, not including trailing NUL */
60fdac847787 initial import
laca_
parents:
diff changeset
   201
 #ifdef USE_MMAP
60fdac847787 initial import
laca_
parents:
diff changeset
   202
     off_t filelen;				     /* how long is the file */
60fdac847787 initial import
laca_
parents:
diff changeset
   203
     int fd;					   /* file which is mmap()ed */
60fdac847787 initial import
laca_
parents:
diff changeset
   204
@@ -11,11 +11,11 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   205
 typedef int(cleanup_func_type) P((memblk*,long*,long,void*));
60fdac847787 initial import
laca_
parents:
diff changeset
   206
 
60fdac847787 initial import
laca_
parents:
diff changeset
   207
 void
60fdac847787 initial import
laca_
parents:
diff changeset
   208
- makeblock P((memblk*const,const long)), /* create block of the given length */
60fdac847787 initial import
laca_
parents:
diff changeset
   209
+ makeblock P((memblk*const,const off_t)), /* create block of the given length */
60fdac847787 initial import
laca_
parents:
diff changeset
   210
  freeblock P((memblk*const)),				    /* deallocate it */
60fdac847787 initial import
laca_
parents:
diff changeset
   211
  lockblock P((memblk*const));	   /* protect this block from future changes */
60fdac847787 initial import
laca_
parents:
diff changeset
   212
 int							  /* by this process */
60fdac847787 initial import
laca_
parents:
diff changeset
   213
- resizeblock P((memblk*const,const long,const int));	  /* change the size */
60fdac847787 initial import
laca_
parents:
diff changeset
   214
+ resizeblock P((memblk*const,const off_t,const int));	  /* change the size */
60fdac847787 initial import
laca_
parents:
diff changeset
   215
 char		      /* dynamically grow a block to fit data as it comes in */
60fdac847787 initial import
laca_
parents:
diff changeset
   216
  *read2blk P((memblk*const,long*const,read_func_type*,cleanup_func_type*,void*));
60fdac847787 initial import
laca_
parents:
diff changeset
   217
 
60fdac847787 initial import
laca_
parents:
diff changeset
   218
diff -urN procmail-3.22/src/pipes.c procmail-3.22-hacked/src/pipes.c
60fdac847787 initial import
laca_
parents:
diff changeset
   219
--- procmail-3.22/src/pipes.c	2005-10-21 13:22:14.185685208 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   220
+++ procmail-3.22-hacked/src/pipes.c	2005-10-21 13:22:42.522377376 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   221
@@ -262,7 +262,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   222
   return len;
60fdac847787 initial import
laca_
parents:
diff changeset
   223
 }
60fdac847787 initial import
laca_
parents:
diff changeset
   224
 
60fdac847787 initial import
laca_
parents:
diff changeset
   225
-static char*read_read(p,left,data)char*p;long left;void*data;
60fdac847787 initial import
laca_
parents:
diff changeset
   226
+static char*read_read(p,left,data)char*p; size_t left;void*data;
60fdac847787 initial import
laca_
parents:
diff changeset
   227
 { long got;
60fdac847787 initial import
laca_
parents:
diff changeset
   228
   do
60fdac847787 initial import
laca_
parents:
diff changeset
   229
      if(0>=(got=rread(STDIN,p,left)))				/* read mail */
60fdac847787 initial import
laca_
parents:
diff changeset
   230
@@ -311,7 +311,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   231
   rclose(PWRI);p=dest;
60fdac847787 initial import
laca_
parents:
diff changeset
   232
   if(!forkerr(pidchild,name))
60fdac847787 initial import
laca_
parents:
diff changeset
   233
    { name=tstrdup(name);
60fdac847787 initial import
laca_
parents:
diff changeset
   234
-     while(0<(i=rread(PRDI,p,(int)max))&&(p+=i,max-=i));    /* read its lips */
60fdac847787 initial import
laca_
parents:
diff changeset
   235
+     while(0<(i=rread(PRDI,p,max))&&(p+=i,max-=i));    /* read its lips */
60fdac847787 initial import
laca_
parents:
diff changeset
   236
      if(0<rread(PRDI,p,1))
60fdac847787 initial import
laca_
parents:
diff changeset
   237
       { nlog("Excessive output quenched from");logqnl(name);
60fdac847787 initial import
laca_
parents:
diff changeset
   238
 	setoverflow();
60fdac847787 initial import
laca_
parents:
diff changeset
   239
diff -urN procmail-3.22/src/robust.c procmail-3.22-hacked/src/robust.c
60fdac847787 initial import
laca_
parents:
diff changeset
   240
--- procmail-3.22/src/robust.c	2001-06-29 14:21:11.000000000 +1200
60fdac847787 initial import
laca_
parents:
diff changeset
   241
+++ procmail-3.22-hacked/src/robust.c	2005-10-21 13:22:42.481383608 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   242
@@ -165,13 +165,13 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   243
   return i;
60fdac847787 initial import
laca_
parents:
diff changeset
   244
 }
60fdac847787 initial import
laca_
parents:
diff changeset
   245
 
60fdac847787 initial import
laca_
parents:
diff changeset
   246
-int rread(fd,a,len)const int fd,len;void*const a;      /* a SysV secure read */
60fdac847787 initial import
laca_
parents:
diff changeset
   247
+int rread(fd,a,len)const int fd; const size_t len; void*const a;      /* a SysV secure read */
60fdac847787 initial import
laca_
parents:
diff changeset
   248
 { int i;
60fdac847787 initial import
laca_
parents:
diff changeset
   249
   while(0>(i=read(fd,a,(size_t)len))&&errno==EINTR);
60fdac847787 initial import
laca_
parents:
diff changeset
   250
   return i;
60fdac847787 initial import
laca_
parents:
diff changeset
   251
 }
60fdac847787 initial import
laca_
parents:
diff changeset
   252
 						      /* a SysV secure write */
60fdac847787 initial import
laca_
parents:
diff changeset
   253
-int rwrite(fd,a,len)const int fd,len;const void*const a;
60fdac847787 initial import
laca_
parents:
diff changeset
   254
+int rwrite(fd,a,len)const int fd; const size_t len;const void*const a;
60fdac847787 initial import
laca_
parents:
diff changeset
   255
 { int i;
60fdac847787 initial import
laca_
parents:
diff changeset
   256
   while(0>(i=write(fd,a,(size_t)len))&&errno==EINTR);
60fdac847787 initial import
laca_
parents:
diff changeset
   257
   return i;
60fdac847787 initial import
laca_
parents:
diff changeset
   258
diff -urN procmail-3.22/src/robust.h procmail-3.22-hacked/src/robust.h
60fdac847787 initial import
laca_
parents:
diff changeset
   259
--- procmail-3.22/src/robust.h	2001-06-29 14:21:11.000000000 +1200
60fdac847787 initial import
laca_
parents:
diff changeset
   260
+++ procmail-3.22-hacked/src/robust.h	2005-10-21 13:22:42.533375704 +1300
60fdac847787 initial import
laca_
parents:
diff changeset
   261
@@ -18,7 +18,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   262
  rpipe P((int fd[2])),
60fdac847787 initial import
laca_
parents:
diff changeset
   263
  rdup P((const int p)),
60fdac847787 initial import
laca_
parents:
diff changeset
   264
  rclose P((const int fd)),
60fdac847787 initial import
laca_
parents:
diff changeset
   265
- rread P((const int fd,void*const a,const int len)),
60fdac847787 initial import
laca_
parents:
diff changeset
   266
- rwrite P((const int fd,const void*const a,const int len));
60fdac847787 initial import
laca_
parents:
diff changeset
   267
+ rread P((const int fd,void*const a,const size_t len)),
60fdac847787 initial import
laca_
parents:
diff changeset
   268
+ rwrite P((const int fd,const void*const a,const size_t len));
60fdac847787 initial import
laca_
parents:
diff changeset
   269
 
60fdac847787 initial import
laca_
parents:
diff changeset
   270
 extern mode_t cumask;