projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
[mmh]
/
uip
/
mhparse.c
diff --git
a/uip/mhparse.c
b/uip/mhparse.c
index
bca7942
..
1b49efd
100644
(file)
--- a/
uip/mhparse.c
+++ b/
uip/mhparse.c
@@
-2,8
+2,6
@@
/*
* mhparse.c -- routines to parse the contents of MIME messages
*
/*
* mhparse.c -- routines to parse the contents of MIME messages
*
- * $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.
* 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.
@@
-22,10
+20,6
@@
#include <h/mhparse.h>
#include <h/utils.h>
#include <h/mhparse.h>
#include <h/utils.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
extern int debugsw;
extern int debugsw;
@@
-1048,6
+1042,8
@@
invalid:
static int
InitGeneric (CT ct)
{
static int
InitGeneric (CT ct)
{
+ NMH_UNUSED (ct);
+
return OK; /* not much to do here */
}
return OK; /* not much to do here */
}
@@
-2491,10
+2487,8
@@
openFTP (CT ct, char **file)
if ((ftp = context_find (nmhaccessftp)) && !*ftp)
ftp = NULL;
if ((ftp = context_find (nmhaccessftp)) && !*ftp)
ftp = NULL;
-#ifndef BUILTIN_FTP
if (!ftp)
return NOTOK;
if (!ftp)
return NOTOK;
-#endif
switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
case NOTOK:
switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
case NOTOK:
@@
-2593,9
+2587,6
@@
openFTP (CT ct, char **file)
return NOTOK;
}
return NOTOK;
}
-#ifdef BUILTIN_FTP
- if (ftp)
-#endif
{
int child_id, i, vecp;
char *vec[9];
{
int child_id, i, vecp;
char *vec[9];
@@
-2631,9
+2622,6
@@
openFTP (CT ct, char **file)
default:
if (pidXwait (child_id, NULL)) {
default:
if (pidXwait (child_id, NULL)) {
-#ifdef BUILTIN_FTP
-losing_ftp:
-#endif
username = password = NULL;
ce->ce_unlink = 1;
return NOTOK;
username = password = NULL;
ce->ce_unlink = 1;
return NOTOK;
@@
-2641,14
+2629,6
@@
losing_ftp:
break;
}
}
break;
}
}
-#ifdef BUILTIN_FTP
- else
- if (ftp_get (e->eb_site, user, pass, e->eb_dir, e->eb_name,
- ce->ce_file,
- e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii"), 0)
- == NOTOK)
- goto losing_ftp;
-#endif
if (cachefile[0]) {
if (caching)
if (cachefile[0]) {
if (caching)