X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmsh.c;h=d87f92eabfb8cc15f67ee31274b079e4b04b2f7d;hp=2769c240af70be88ca2b5373a260f599759a868f;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90

diff --git a/uip/msh.c b/uip/msh.c
index 2769c24..d87f92e 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -3,6 +3,10 @@
  * msh.c -- The nmh shell
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 /*
@@ -16,8 +20,9 @@
 #include <h/dropsbr.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/tws.h>
+#include <h/mts.h>
+#include <h/utils.h>
 
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
@@ -346,7 +351,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	}
 	else
 	    if (file)
@@ -408,7 +413,8 @@ main (int argc, char **argv)
 
     m_reset ();
     
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
@@ -754,7 +760,7 @@ setup (char *file)
     if (!(mp = (struct msgs  *) calloc ((size_t) 1, sizeof(*mp))))
 	padios (NULL, "unable to allocate folder storage");
 
-    if (!(mp->msgstats = calloc ((size_t) 1, msgp + 3)))
+    if (!(mp->msgstats = calloc ((size_t) msgp + 3, sizeof(*(mp->msgstats)))))
 	padios (NULL, "unable to allocate message status storage");
 
     mp->hghmsg = msgp;
@@ -937,9 +943,7 @@ m_gMsgs (int n)
 	return;
 
     nmsgs = nMsgs + n + MAXFOLDER / 2;
-    Msgs = (struct Msg *) realloc ((char *) Msgs, (size_t) (nmsgs + 2) * sizeof *Msgs);
-    if (Msgs == NULL)
-	padios (NULL, "unable to reallocate Msgs structure");
+    Msgs = (struct Msg *) mh_xrealloc ((char *) Msgs, (size_t) (nmsgs + 2) * sizeof *Msgs);
     memset((char *) (Msgs + nMsgs + 2), 0, (size_t) ((nmsgs - nMsgs) * sizeof *Msgs));
 
     nMsgs = nmsgs;
@@ -1222,7 +1226,7 @@ readid (int msgnum)
 	    case FLD: 
 	    case FLDEOF: 
 	    case FLDPLUS: 
-		if (!strcasecmp (name, BBoard_ID)) {
+		if (!mh_strcasecmp (name, BBoard_ID)) {
 		    bp = getcpy (buf);
 		    while (state == FLDPLUS) {
 			state = m_getfld (state, name, buf, sizeof(buf), zp);
@@ -1471,7 +1475,7 @@ getargs (char *prompt, struct swit *sw, struct Cmd *cmdp)
 	    continue;
 	if (buffer[0] == '?') {
 	    printf ("commands:\n");
-	    print_sw (ALL, sw, "");
+	    print_sw (ALL, sw, "", stdout);
 	    printf ("type CTRL-D or use ``quit'' to leave %s\n",
 		    invo_name);
 	    continue;
@@ -1541,7 +1545,8 @@ static int
 parse (char *buffer, struct Cmd *cmdp)
 {
     int argp = 0;
-    char c, *cp, *pp;
+    unsigned char c, *cp;
+    char *pp;
 
     cmdp->line[0] = 0;
     pp = cmdp->args[argp++] = cmdp->line;
@@ -1888,7 +1893,7 @@ static int
 pINI (void)
 {
     int i, vrsn;
-    char *bp;
+    unsigned char *bp;
     struct record rcs, *rc;
 
     rc = &rcs;
@@ -2137,7 +2142,7 @@ pCMD (char *str, struct swit *sw, struct Cmd *cmdp)
 
 	    case OK: 
 		printf ("commands:\n");
-		print_sw (ALL, sw, "");
+		print_sw (ALL, sw, "", stdout);
 		printf ("type ``quit'' to leave %s\n", invo_name);
 		fflush (stdout);
 		fflush (stderr);