X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/00d760f7506c2d5c32ab5abf9f11b3066999f08a..ec173fd2c:/uip/replsbr.c?ds=sidebyside

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 966744c0..e3c88949 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -5,17 +5,30 @@
  * 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/closefds.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;
 
@@ -23,7 +36,7 @@ static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
 static struct mailname mq;
-static int nodupcheck = 0;		/* If set, no check for duplicates */
+static bool nodupcheck;		/* If set, no check for duplicates */
 
 static char *addrcomps[] = {
     "from",
@@ -281,8 +294,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 +325,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 +333,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 +344,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);
@@ -367,9 +380,9 @@ replconcataddr(char *orig, char *str)
 {
     char *cp;
 
-    nodupcheck = 1;
+    nodupcheck = true;
     cp = replformataddr(orig, str);
-    nodupcheck = 0;
+    nodupcheck = false;
     return cp;
 }
 
@@ -483,11 +496,11 @@ 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;
-    int fixed_address = 0;
+    bool fixed_address = false;
 
     if (str) {
         /*
@@ -564,7 +577,7 @@ fix_addresses (char *str) {
                 adr = getname (new_adr);
                 if (adr != NULL  &&
                     (mp = getm (adr, dfhost, dftype, NULL, 0)) != NULL) {
-                    fixed_address = 1;
+                    fixed_address = true;
                     mnfree (mp);
                 }
                 free (angle_addr);