projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* test/runtest: cat test-temp-dir only once. Destroy and create
[mmh]
/
uip
/
mshcmds.c
diff --git
a/uip/mshcmds.c
b/uip/mshcmds.c
index
b8c7d92
..
147a261
100644
(file)
--- a/
uip/mshcmds.c
+++ b/
uip/mshcmds.c
@@
-3,6
+3,10
@@
* mshcmds.c -- command handlers in msh
*
* $Id$
* mshcmds.c -- command handlers in msh
*
* $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.
*/
#include <h/mh.h>
*/
#include <h/mh.h>
@@
-11,14
+15,14
@@
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/tws.h>
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/tws.h>
-#include <mts/generic/mts.h>
+#include <h/mts.h>
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
#include <h/msh.h>
#include <h/picksbr.h>
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
#include <h/msh.h>
#include <h/picksbr.h>
+#include <h/utils.h>
-extern int errno;
static char delim3[] = "-------"; /* from burst.c */
static char delim3[] = "-------"; /* from burst.c */
@@
-589,7
+593,7
@@
filehak (char **args)
if (cwd == NULL)
cwd = getcpy (pwd ());
chdir (m_maildir (""));
if (cwd == NULL)
cwd = getcpy (pwd ());
chdir (m_maildir (""));
- cp = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ cp = pluspath (cp);
if (access (m_maildir (cp), F_OK) == NOTOK)
result = OK;
free (cp);
if (access (m_maildir (cp), F_OK) == NOTOK)
result = OK;
free (cp);
@@
-699,7
+703,7
@@
foldcmd (char **args)
return;
}
else
return;
}
else
- folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF)
+ folder = fmsh ? pluspath (cp)
: cp + 1;
}
else
: cp + 1;
}
else
@@
-2157,8
+2161,7
@@
scancmd (char **args)
if (*dp == '\\' || *dp == '"' || *dp == '\n')
i++;
i++;
if (*dp == '\\' || *dp == '"' || *dp == '\n')
i++;
i++;
- if ((ep = malloc ((unsigned) i)) == NULL)
- adios (NULL, "out of memory");
+ ep = mh_xmalloc ((unsigned) i);
for (dp = nfs, fp = ep; *dp; dp++) {
if (*dp == '\n') {
*fp++ = '\\', *fp++ = 'n';
for (dp = nfs, fp = ep; *dp; dp++) {
if (*dp == '\n') {
*fp++ = '\\', *fp++ = 'n';
@@
-2307,10
+2310,10
@@
showcmd (char **args)
char *cp, *proc = showproc, buf[BUFSIZ];
char *msgs[MAXARGS], *vec[MAXARGS];
char *cp, *proc = showproc, buf[BUFSIZ];
char *msgs[MAXARGS], *vec[MAXARGS];
- if (!strcasecmp (cmd_name, "next"))
+ if (!mh_strcasecmp (cmd_name, "next"))
mode = 1;
else
mode = 1;
else
- if (!strcasecmp (cmd_name, "prev"))
+ if (!mh_strcasecmp (cmd_name, "prev"))
mode = -1;
while ((cp = *args++)) {
if (*cp == '-')
mode = -1;
while ((cp = *args++)) {
if (*cp == '-')
@@
-2544,7
+2547,8
@@
static int
is_nontext (int msgnum)
{
int result, state;
is_nontext (int msgnum)
{
int result, state;
- char *bp, *cp, *dp;
+ unsigned char *bp, *dp;
+ char *cp;
char buf[BUFSIZ], name[NAMESZ];
FILE *fp;
char buf[BUFSIZ], name[NAMESZ];
FILE *fp;
@@
-2562,7
+2566,7
@@
is_nontext (int msgnum)
/*
* Check Content-Type field
*/
/*
* Check Content-Type field
*/
- if (!strcasecmp (name, TYPE_FIELD)) {
+ if (!mh_strcasecmp (name, TYPE_FIELD)) {
int passno;
char c;
int passno;
char c;
@@
-2617,7
+2621,7
@@
invalid:
if (!*bp)
goto invalid;
if (passno > 1) {
if (!*bp)
goto invalid;
if (passno > 1) {
- if ((result = (strcasecmp (bp, "plain") != 0)))
+ if ((result = (mh_strcasecmp (bp, "plain") != 0)))
goto out;
*dp = c;
for (dp++; isspace (*dp); dp++)
goto out;
*dp = c;
for (dp++; isspace (*dp); dp++)
@@
-2649,7
+2653,7
@@
invalid:
/* Check the character set */
result = !check_charset (dp, strlen (dp));
} else {
/* Check the character set */
result = !check_charset (dp, strlen (dp));
} else {
- if (!(result = (strcasecmp (bp, "text") != 0))) {
+ if (!(result = (mh_strcasecmp (bp, "text") != 0))) {
*dp = c;
bp = dp;
passno = 2;
*dp = c;
bp = dp;
passno = 2;
@@
-2668,7
+2672,7
@@
out:
/*
* Check Content-Transfer-Encoding field
*/
/*
* Check Content-Transfer-Encoding field
*/
- if (!strcasecmp (name, ENCODING_FIELD)) {
+ if (!mh_strcasecmp (name, ENCODING_FIELD)) {
cp = add (buf, NULL);
while (state == FLDPLUS) {
state = m_getfld (state, name, buf, sizeof buf, fp);
cp = add (buf, NULL);
while (state == FLDPLUS) {
state = m_getfld (state, name, buf, sizeof buf, fp);
@@
-2679,9
+2683,9
@@
out:
for (dp = bp; istoken (*dp); dp++)
continue;
*dp = '\0';
for (dp = bp; istoken (*dp); dp++)
continue;
*dp = '\0';
- result = (strcasecmp (bp, "7bit")
- && strcasecmp (bp, "8bit")
- && strcasecmp (bp, "binary"));
+ result = (mh_strcasecmp (bp, "7bit")
+ && mh_strcasecmp (bp, "8bit")
+ && mh_strcasecmp (bp, "binary"));
free (cp);
if (result) {
free (cp);
if (result) {
@@
-2865,7
+2869,7
@@
get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
case FLD:
case FLDEOF:
case FLDPLUS:
case FLD:
case FLDEOF:
case FLDPLUS:
- if (!strcasecmp (name, datesw)) {
+ if (!mh_strcasecmp (name, datesw)) {
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);
@@
-2882,7
+2886,7
@@
get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
break; /* all done! */
gotdate++;
}
break; /* all done! */
gotdate++;
}
- else if (subjsw && !strcasecmp(name, subjsw)) {
+ else if (subjsw && !mh_strcasecmp(name, subjsw)) {
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);
@@
-2957,12
+2961,13
@@
subsort (struct Msg *a, struct Msg *b)
static char *
sosmash (char *subj, char *s)
{
static char *
sosmash (char *subj, char *s)
{
- register char *cp, *dp, c;
+ register char *cp, *dp;
+ register unsigned char c;
if (s) {
cp = s;
dp = s; /* dst pointer */
if (s) {
cp = s;
dp = s; /* dst pointer */
- if (!strcasecmp (subj, "subject"))
+ if (!mh_strcasecmp (subj, "subject"))
while ((c = *cp)) {
if (! isspace(c)) {
if(uprf(cp, "re:"))
while ((c = *cp)) {
if (! isspace(c)) {
if(uprf(cp, "re:"))
@@
-3005,7
+3010,6
@@
process (int msgnum, char *proc, int vecp, char **vec)
strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
if ((out = fopen (tmpfil, "w")) == NULL) {
int olderr;
strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
if ((out = fopen (tmpfil, "w")) == NULL) {
int olderr;
- extern int errno;
char newfil[80];
olderr = errno;
char newfil[80];
olderr = errno;