X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1df63930a063aa03a7bd09bb719803ea4820d4e1..5bc2777230cdc4cea23ff87df356af3fb0cfadf9:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index bafc7d92..61bf7965 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -5,13 +5,34 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/signals.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/tws.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "mhlsbr.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/concat.h"
+#include "sbr/smatch.h"
+#include "sbr/r1bindex.h"
+#include "sbr/snprintb.h"
+#include "sbr/copyip.h"
+#include "sbr/discard.h"
+#include "sbr/trimcpy.h"
+#include "sbr/vfgets.h"
+#include "sbr/check_charset.h"
+#include "sbr/getcpy.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/pidstatus.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/signals.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_popen.h"
 #include <setjmp.h>
 #include <sys/types.h>
@@ -1816,7 +1837,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state,
     switch (filterpid = fork()) {
         char **args, *program;
 	struct arglist *a;
-	int i, dat[5], s, argp;
+	int i, dat[5], argp;
 
     case 0:
     	/*
@@ -1841,14 +1862,9 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state,
 	    fmt_scan(a->a_fmt, scanl, BUFSIZ, dat, NULL);
 	    args[i] = charstring_buffer_copy (scanl);
 	    charstring_free (scanl);
-	    /*
-	     * fmt_scan likes to put a trailing newline at the end of the
-	     * format string.  If we have one, get rid of it.
-	     */
-	    s = strlen(args[i]);
-	    if (args[i][s - 1] == '\n')
-		args[i][s - 1] = '\0';
-
+	    /* Trim a trailing linefeed that fmt_scan() likes to put at
+             * the end of the format string. */
+            trim_suffix_c(args[i], '\n');
 	    if (mhldebug)
 		fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n",
 			a->a_nfs, args[i]);