patch-mime_alter_c 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. $OpenBSD: patch-mime_alter_c,v 1.1.1.1 2012/05/30 16:47:01 ajacoutot Exp $
  2. http://bugs.debian.org/625307
  3. --- mime_alter.c.orig Sun Nov 16 09:45:45 2008
  4. +++ mime_alter.c Wed May 30 15:44:10 2012
  5. @@ -2432,7 +2432,6 @@ int AM_add_disclaimer( char *mpackname )
  6. char mpackold[AM_1K_BUFFER_SIZE+1]="";
  7. struct AM_disclaimer_details dd;
  8. int result = 0;
  9. - int segment_read = 0;
  10. /* create our temp filename */
  11. snprintf(mpacktmp,AM_1K_BUFFER_SIZE, "%s.tmp",mpackname);
  12. @@ -2623,7 +2622,6 @@ int AM_add_disclaimer( char *mpackname )
  13. */
  14. - segment_read = 0;
  15. if (FFGET_feof(&f)) break;
  16. // If we've found a boundary and a text content section...
  17. @@ -3698,7 +3696,6 @@ Changes:
  18. int AM_attachment_replace_recurse( struct MIMEH_header_info *hinfo, FFGET_FILE *f, FILE *outputfile, regex_t *preg, char *new_attachment_name, int iteration )
  19. {
  20. int result = 0;
  21. - int boundary_exists=0;
  22. size_t bc;
  23. if (AM_DNORMAL) LOGGER_log("%s:%d:AM_attachment_replace_recurse:DEBUG: Starting: iteration=%d",FL, iteration );
  24. @@ -3776,7 +3773,6 @@ int AM_attachment_replace_recurse( struct MIMEH_header
  25. {
  26. if (AM_DNORMAL)LOGGER_log("%s:%d:AM_attachment_replace_recurse:DEBUG: pushing BS='%s'",FL, hinfo->boundary );
  27. BS_push( hinfo->boundary );
  28. - boundary_exists = 1;
  29. }
  30. // Now, determine if this block/segment is the one which contains our file which we must 'nullify'