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

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 46742e66..292f4695 100644
--- 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,8 +293,8 @@ static char *
 replformataddr (char *orig, char *str)
 {
     int len;
-    char baddr[BUFSIZ], error[BUFSIZ];
-    int isgroup;
+    char baddr[BUFSIZ+6], error[BUFSIZ];
+    bool isgroup;
     char *dst;
     char *cp;
     char *sp;
@@ -312,7 +324,7 @@ replformataddr (char *orig, char *str)
     }
 
     /* concatenate all the new addresses onto 'buf' */
-    for (isgroup = 0; (cp = getname (fixed_str)); ) {
+    for (isgroup = false; (cp = getname (fixed_str)); ) {
 	if ((mp = getm (cp, dfhost, dftype, error, sizeof(error))) == NULL) {
 	    snprintf (baddr, sizeof(baddr), "\t%s -- %s\n", cp, error);
 	    badaddrs = add (baddr, badaddrs);
@@ -320,7 +332,7 @@ replformataddr (char *orig, char *str)
 	}
 	if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
 	    *dst++ = ';';
-	    isgroup = 0;
+	    isgroup = false;
 	}
 	if (insert (mp)) {
 	    /* if we get here we're going to add an address */
@@ -331,7 +343,7 @@ replformataddr (char *orig, char *str)
 	    if (mp->m_gname) {
 		CHECKMEM (mp->m_gname);
 		CPY (mp->m_gname);
-		isgroup++;
+		isgroup = true;
 	    }
 	    sp = adrformat (mp);
 	    CHECKMEM (sp);
@@ -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,
@@ -456,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;
 	    }
 
@@ -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;
 
@@ -524,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 =