X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3395ff90fe5c311285e15357d06fb08938b9b849..fcaa3047b2a23fc0c36be518d1ca1ea0b0cb3b66:/uip/scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index df9ef645..b6df6830 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -5,19 +5,26 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/scansbr.h>
-#include <h/tws.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/dtime.h"
+#include "scansbr.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getcpy.h"
+#include "sbr/error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "sbr/terminal.h"
 
 static struct format *fmt;
 static struct comp *datecomp;		/* pntr to "date" comp             */
 static struct comp *bodycomp;		/* pntr to "body" pseudo-comp      *
 					 * (if referenced)                 */
 static int ncomps = 0;			/* # of interesting components     */
-static char **compbuffers = 0; 		/* buffers for component text      */
+static char **compbuffers = 0;		/* buffers for component text      */
 static struct comp **used_buf = 0;	/* stack for comp that use buffers */
 
 static int dat[5];			/* aux. data for format routine    */
@@ -48,7 +55,9 @@ int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
       int unseen, char *folder, long size, int noisy, charstring_t *scanl)
 {
-    int i, compnum, encrypted, state;
+    static bool deja_vu;
+    static int tty_width;
+    int i, compnum, state;
     char *cp, *tmpbuf, *startbody, **nxtbuf;
     char *saved_c_text = NULL;
     struct comp *cptr;
@@ -64,9 +73,12 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        scanl used to be a global. */
     if (! *scanl) {
 	if (width == -1) {
-	    /* Default:  width of the terminal, but at least WIDTH/2. */
-	    if ((width = sc_width ()) < WIDTH/2)
-		width = WIDTH/2;
+            if (!deja_vu) {
+                deja_vu = true;
+                tty_width = sc_width();
+            }
+
+            width = max(tty_width, WIDTH / 2);
 	} else if (width == 0) {
 	    /* Unlimited width. */
 	    width = INT_MAX;
@@ -84,9 +96,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	cptr = fmt_findcomp("folder");
 	if (cptr && folder)
 	    cptr->c_text = mh_xstrdup(folder);
-	if (fmt_addcompentry("encrypted")) {
-		ncomps++;
-	}
 	cptr =  fmt_findcomp("dtimenow");
 	if (cptr)
 	    cptr->c_text = getcpy(dtimenow (0));
@@ -218,7 +227,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		if (outnum == 0) {
 		    state = FILEEOF; /* stop now if scan cmd */
 		    if (bodycomp && startbody == NULL)
-		    	startbody = tmpbuf;
+			startbody = tmpbuf;
 		    goto finished;
 		}
                 if (scnout) {
@@ -257,7 +266,7 @@ body:;
 
 	    case LENERR: 
 	    case FMTERR: 
-	    	if (innum)
+		if (innum)
 		    fprintf (stderr, "??Format error (message %d) in ",
 			     outnum ? outnum : innum);
 		else
@@ -278,7 +287,7 @@ body:;
 		goto finished;
 
 	    default: 
-		adios (NULL, "getfld() returned %d", state);
+		die("getfld() returned %d", state);
 	}
     }
 
@@ -331,9 +340,6 @@ finished:
     if (noisy)
 	fputs (charstring_buffer (*scanl), stdout);
 
-    cptr = fmt_findcomp ("encrypted");
-    encrypted = cptr && cptr->c_text;
-
     /* return dynamically allocated buffers to pool */
     while ((cptr = *savecomp++)) {
 	cptr->c_text = NULL;
@@ -342,17 +348,19 @@ finished:
     if (scnout && (ferror(scnout) || fclose (scnout) == EOF))
 	DIEWRERR();
 
-    return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
+    return state != FILEEOF ? SCNERR : SCNMSG;
 }
 
 
 /* The following two functions allow access to the global gstate above. */
 void
-scan_finished(void) {
+scan_finished(void)
+{
     m_getfld_state_destroy (&gstate);
 }
 
 void
-scan_detect_mbox_style (FILE *f) {
+scan_detect_mbox_style (FILE *f)
+{
     m_unknown (&gstate, f);
 }