Remove MIME content caching code

[nmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 2fadb1d10548a5a31b42a7bacd3dd34486db61d9..ed5e94ed9b3cbfa06ea22a2b9f326830897f8c75 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -5,17 +5,29 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/m_getfld.h"
+#include "sbr/read_switch.h"
+#include "sbr/concat.h"
+#include "sbr/uprf.h"
+#include "sbr/escape_addresses.h"
+#include "sbr/pidstatus.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
 #include "h/done.h"
-#include <h/utils.h>
-#include <sys/file.h>          /* L_SET */
+#include "h/utils.h"
+#include <sys/file.h>
+#include "replsbr.h"
 
-extern short ccto;             /* from repl.c */
-extern short cccc;
-extern short ccme;
-extern short querysw;
+short ccto = -1;
+short cccc = -1;
+short ccme = -1;
+short querysw = 0;
 
 static int dftype=0;
 
@@ -281,7 +293,7 @@ static char *
 replformataddr (char *orig, char *str)
 {
     int len;
-    char baddr[BUFSIZ], error[BUFSIZ];
+    char baddr[BUFSIZ+6], error[BUFSIZ];
     bool isgroup;
     char *dst;
     char *cp;
@@ -439,7 +451,6 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
        case OK:
            dup2 (fileno (in), fileno (stdin));
            dup2 (fileno (out), fileno (stdout));
-           closefds (3);
 
            /*
             * We're not allocating the memory for the extra arguments,
@@ -483,9 +494,9 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 }
 
 
-static
-char *
-fix_addresses (char *str) {
+static char *
+fix_addresses (char *str)
+{
     char *fixed_str = NULL;
     bool fixed_address = false;