X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/93cf33c07eed0e56b4f3a0d1c07ff183ac1510ef..dbd0fa0a56a222bd118fea627eba53e5d9811d01:/uip/msh.c

diff --git a/uip/msh.c b/uip/msh.c
index 23398217..36286e0b 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -153,11 +153,8 @@ int told_to_quit;		/* SIGQUIT detected */
 /*
  * prototypes
  */
-int SOprintf (char *, ...);  /* from termsbr.c */
-int sc_width (void);         /* from termsbr.c */
 void fsetup (char *);
 void setup (char *);
-FILE *msh_ready (int, int);
 void readids (int);
 int readid (int);
 void display_info (int);
@@ -176,7 +173,6 @@ static int read_map (char *, long);
 static int read_file (long, int);
 
 static void m_gMsgs (int);
-FILE *msh_ready (int, int);
 static int check_folder (int);
 static void scanrange (int, int);
 static void scanstring (char *);
@@ -239,10 +235,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case IDSW: 
 		    if (!(cp = *argp++) || *cp == '-')
@@ -805,10 +801,10 @@ m_gMsgs (int n)
 FILE *
 msh_ready (int msgnum, int full)
 {
-    NMH_UNUSED (full);
     register int msgp;
     int fd;
     char *cp;
+    NMH_UNUSED (full);
 
     if (yp) {
 	fclose (yp);
@@ -1009,15 +1005,17 @@ readid (int msgnum)
 	return Msgs[msgnum].m_bboard_id;
 
     zp = msh_ready (msgnum, 0);
-    for (state = FLD;;)
-	switch (state = m_getfld (state, name, buf, sizeof(buf), zp)) {
+    for (state = FLD;;) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (state, name, buf, &bufsz, zp)) {
 	    case FLD: 
 	    case FLDEOF: 
 	    case FLDPLUS: 
 		if (!mh_strcasecmp (name, BBoard_ID)) {
 		    bp = getcpy (buf);
 		    while (state == FLDPLUS) {
-			state = m_getfld (state, name, buf, sizeof(buf), zp);
+			bufsz = sizeof buf;
+			state = m_getfld (state, name, buf, &bufsz, zp);
 			bp = add (buf, bp);
 		    }
 		    i = atoi (bp);
@@ -1028,13 +1026,15 @@ readid (int msgnum)
 			continue;
 		}
 		while (state == FLDPLUS)
-		    state = m_getfld (state, name, buf, sizeof(buf), zp);
+		    bufsz = sizeof buf;
+		    state = m_getfld (state, name, buf, &bufsz, zp);
 		if (state != FLDEOF)
 		    continue;
 
 	    default: 
 		return 0;
 	}
+    }
 }