projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix burst so it actually complies with RFC 934. This means discarding
[mmh]
/
uip
/
mhparse.c
diff --git
a/uip/mhparse.c
b/uip/mhparse.c
index
14322ab
..
e9a4cee
100644
(file)
--- a/
uip/mhparse.c
+++ b/
uip/mhparse.c
@@
-12,7
+12,6
@@
#include <h/signals.h>
#include <h/md5.h>
#include <errno.h>
#include <h/signals.h>
#include <h/md5.h>
#include <errno.h>
-#include <setjmp.h>
#include <signal.h>
#include <h/mts.h>
#include <h/tws.h>
#include <signal.h>
#include <h/mts.h>
#include <h/tws.h>
@@
-86,16
+85,12
@@
struct k2v SubApplication[] = {
};
};
-/* ftpsbr.c */
-int ftp_get (char *, char *, char *, char *, char *, char *, int, int);
-
/* mhcachesbr.c */
int find_cache (CT, int, int *, char *, char *, int);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
/* mhcachesbr.c */
int find_cache (CT, int, int *, char *, char *, int);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-int make_intermediates (char *);
void content_error (char *, CT, char *, ...);
/* mhfree.c */
void content_error (char *, CT, char *, ...);
/* mhfree.c */
@@
-1042,6
+1037,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 */
}
@@
-2485,10
+2482,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:
@@
-2555,7
+2550,8
@@
openFTP (CT ct, char **file)
if (e->eb_flags) {
user = "anonymous";
if (e->eb_flags) {
user = "anonymous";
- snprintf (buffer, sizeof(buffer), "%s@%s", getusername (), LocalName ());
+ snprintf (buffer, sizeof(buffer), "%s@%s", getusername (),
+ LocalName (1));
pass = buffer;
} else {
ruserpass (e->eb_site, &username, &password);
pass = buffer;
} else {
ruserpass (e->eb_site, &username, &password);
@@
-2587,9
+2583,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];
@@
-2608,7
+2601,7
@@
openFTP (CT ct, char **file)
fflush (stdout);
fflush (stdout);
- for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+ for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
sleep (5);
switch (child_id) {
case NOTOK:
sleep (5);
switch (child_id) {
case NOTOK:
@@
-2625,9
+2618,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;
@@
-2635,14
+2625,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)
@@
-2761,7
+2743,7
@@
openMail (CT ct, char **file)
vec[vecp++] = e->eb_body;
vec[vecp] = NULL;
vec[vecp++] = e->eb_body;
vec[vecp] = NULL;
- for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+ for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
sleep (5);
switch (child_id) {
case NOTOK:
sleep (5);
switch (child_id) {
case NOTOK: