X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmsh.c;h=d87f92eabfb8cc15f67ee31274b079e4b04b2f7d;hp=6755a8cf07cf43f39afc8342163dd3cb6330622c;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/msh.c b/uip/msh.c
index 6755a8c..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>
@@ -67,7 +72,7 @@ static struct swit switches[] = {
 #define VERSIONSW            13
     { "version", 0 },
 #define	HELPSW               14
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -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)
@@ -409,6 +414,7 @@ main (int argc, char **argv)
     m_reset ();
     
     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;
@@ -1549,7 +1554,7 @@ parse (char *buffer, struct Cmd *cmdp)
     cmdp->direction = STDIO;
     cmdp->stream = NULL;
 
-    for (cp = buffer; c = *cp; cp++) {
+    for (cp = buffer; (c = *cp); cp++) {
 	if (!isspace (c))
 	    break;
     }
@@ -1615,7 +1620,7 @@ parse (char *buffer, struct Cmd *cmdp)
 		    cp++;
 		}
 		cmdp->redirect = pp + 1;/* sigh */
-		for (; c = *cp; cp++)
+		for (; (c = *cp); cp++)
 		    if (!isspace (c))
 			break;
 		if (c == 0) {
@@ -1888,7 +1893,7 @@ static int
 pINI (void)
 {
     int i, vrsn;
-    char *bp;
+    unsigned char *bp;
     struct record rcs, *rc;
 
     rc = &rcs;
@@ -1936,6 +1941,8 @@ pINI (void)
 	    fmt2peer (RC_ERR, "pINI protocol screw-up");
 	    done (1);		/* NOTREACHED */
     }
+
+    return 1;  /* dead code to satisfy the compiler */
 }
 
 
@@ -2067,11 +2074,12 @@ pQRY2 (void)
     for (msgnum = mp->curmsg; msgnum <= mp->hghmsg; msgnum++)
 	if (does_exist (mp, msgnum))
 	    i++;
-    if (i-- > 0)
+    if (i-- > 0) {
 	if (topcur)
 	    k = i >= k ? 1 : k - i;
 	else
 	    k -= i > j ? j : i;
+    }
 
     i = j = 0;
     n = 1;
@@ -2134,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);
@@ -2292,6 +2300,8 @@ ttyR (struct Cmd *cmdp)
 	    fmt2peer (RC_ERR, "pTTY protocol screw-up");
 	    done (1);		/* NOTREACHED */
     }
+
+    return 1;  /* dead code to satisfy compiler */
 }