projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a typo.
[mmh]
/
uip
/
msh.c
diff --git
a/uip/msh.c
b/uip/msh.c
index
6755a8c
..
257fc42
100644
(file)
--- a/
uip/msh.c
+++ b/
uip/msh.c
@@
-3,6
+3,10
@@
* msh.c -- The nmh shell
*
* $Id$
* 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 <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>
#ifdef HAVE_TERMIOS_H
# include <termios.h>
@@
-67,7
+72,7
@@
static struct swit switches[] = {
#define VERSIONSW 13
{ "version", 0 },
#define HELPSW 14
#define VERSIONSW 13
{ "version", 0 },
#define HELPSW 14
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-408,7
+413,7
@@
main (int argc, char **argv)
m_reset ();
m_reset ();
- done (0);
+ return done (0);
}
}
@@
-754,7
+759,7
@@
setup (char *file)
if (!(mp = (struct msgs *) calloc ((size_t) 1, sizeof(*mp))))
padios (NULL, "unable to allocate folder storage");
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;
padios (NULL, "unable to allocate message status storage");
mp->hghmsg = msgp;
@@
-937,9
+942,7
@@
m_gMsgs (int n)
return;
nmsgs = nMsgs + n + MAXFOLDER / 2;
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;
memset((char *) (Msgs + nMsgs + 2), 0, (size_t) ((nmsgs - nMsgs) * sizeof *Msgs));
nMsgs = nmsgs;
@@
-1222,7
+1225,7
@@
readid (int msgnum)
case FLD:
case FLDEOF:
case FLDPLUS:
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);
bp = getcpy (buf);
while (state == FLDPLUS) {
state = m_getfld (state, name, buf, sizeof(buf), zp);
@@
-1549,7
+1552,7
@@
parse (char *buffer, struct Cmd *cmdp)
cmdp->direction = STDIO;
cmdp->stream = NULL;
cmdp->direction = STDIO;
cmdp->stream = NULL;
- for (cp = buffer; c = *cp; cp++) {
+ for (cp = buffer; (c = *cp); cp++) {
if (!isspace (c))
break;
}
if (!isspace (c))
break;
}
@@
-1615,7
+1618,7
@@
parse (char *buffer, struct Cmd *cmdp)
cp++;
}
cmdp->redirect = pp + 1;/* sigh */
cp++;
}
cmdp->redirect = pp + 1;/* sigh */
- for (; c = *cp; cp++)
+ for (; (c = *cp); cp++)
if (!isspace (c))
break;
if (c == 0) {
if (!isspace (c))
break;
if (c == 0) {
@@
-1936,6
+1939,8
@@
pINI (void)
fmt2peer (RC_ERR, "pINI protocol screw-up");
done (1); /* NOTREACHED */
}
fmt2peer (RC_ERR, "pINI protocol screw-up");
done (1); /* NOTREACHED */
}
+
+ return 1; /* dead code to satisfy the compiler */
}
}
@@
-2067,11
+2072,12
@@
pQRY2 (void)
for (msgnum = mp->curmsg; msgnum <= mp->hghmsg; msgnum++)
if (does_exist (mp, msgnum))
i++;
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;
if (topcur)
k = i >= k ? 1 : k - i;
else
k -= i > j ? j : i;
+ }
i = j = 0;
n = 1;
i = j = 0;
n = 1;
@@
-2292,6
+2298,8
@@
ttyR (struct Cmd *cmdp)
fmt2peer (RC_ERR, "pTTY protocol screw-up");
done (1); /* NOTREACHED */
}
fmt2peer (RC_ERR, "pTTY protocol screw-up");
done (1); /* NOTREACHED */
}
+
+ return 1; /* dead code to satisfy compiler */
}
}