X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4fb142af4ad2ca73d141cc04af24e7c1b62f8a77..fcaa3047b2a23fc0c36be518d1ca1ea0b0cb3b66:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 4a453925..292f4695 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -5,12 +5,23 @@
  * 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"
 
 short ccto = -1;
@@ -282,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;
@@ -440,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,
@@ -457,7 +467,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 		arglist[argnum++] = formatproc;
 		break;
 	    case 0:
-	    	arglist[argnum++] = "-nofmtproc";
+		arglist[argnum++] = "-nofmtproc";
 		break;
 	    }
 
@@ -484,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;
 
@@ -525,7 +535,7 @@ fix_addresses (char *str) {
 
             /* With AD_NAME, errors are not reported to user. */
             if ((mp = getm (cp, dfhost, dftype, error,
-	    		    sizeof(error))) == NULL) {
+			    sizeof(error))) == NULL) {
                 const char *no_at_sign = "no at-sign after local-part";
 
                 adr_nodep->escape_local_part =