projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed mhn, as it was already replaced by mhlist/mhshow/mhstore.
[mmh]
/
uip
/
send.c
diff --git
a/uip/send.c
b/uip/send.c
index
7849472
..
c8b77f7
100644
(file)
--- a/
uip/send.c
+++ b/
uip/send.c
@@
-2,8
+2,6
@@
/*
* send.c -- send a composed message
*
/*
* send.c -- send a composed message
*
- * $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.
@@
-15,12
+13,6
@@
#include <signal.h>
#include <signal.h>
-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
-#else /* CYRUS_SASL */
-# define SASLminc(a) 0
-#endif /* CYRUS_SASL */
-
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
@@
-93,19
+85,15
@@
static struct swit switches[] = {
#define CLIESW 34
{ "client host", -6 },
#define SERVSW 35
#define CLIESW 34
{ "client host", -6 },
#define SERVSW 35
- { "server host", -6 },
+ { "server host", 6 },
#define SNOOPSW 36
#define SNOOPSW 36
- { "snoop", -5 },
-#define SASLSW 37
- { "sasl", SASLminc(-4) },
-#define SASLMECHSW 38
- { "saslmech", SASLminc(-5) },
-#define USERSW 39
- { "user", SASLminc(-4) },
+ { "snoop", 5 },
#define ATTACHSW 40
{ "attach", 6 },
#define ATTACHFORMATSW 41
{ "attachformat", 7 },
#define ATTACHSW 40
{ "attach", 6 },
#define ATTACHFORMATSW 41
{ "attachformat", 7 },
+#define PORTSW 42
+ { "port server-port-name/number" , 4 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-262,7
+250,6
@@
main (int argc, char **argv)
case SENDSW:
case SOMLSW:
case SNOOPSW:
case SENDSW:
case SOMLSW:
case SNOOPSW:
- case SASLSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-271,8
+258,7
@@
main (int argc, char **argv)
case WIDTHSW:
case CLIESW:
case SERVSW:
case WIDTHSW:
case CLIESW:
case SERVSW:
- case SASLMECHSW:
- case USERSW:
+ case PORTSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
@@
-420,7
+406,7
@@
go_to_it:
&& (distsw = atoi (cp))
&& altmsg) {
vec[vecp++] = "-dist";
&& (distsw = atoi (cp))
&& altmsg) {
vec[vecp++] = "-dist";
- distfile = getcpy (m_scratch (altmsg, invo_name));
+ distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE
@@
-429,7
+415,7
@@
go_to_it:
)
adios (distfile, "unable to link %s to", altmsg);
free (distfile);
)
adios (distfile, "unable to link %s to", altmsg);
free (distfile);
- distfile = getcpy (m_tmpfil (invo_name));
+ distfile = getcpy (m_mktemp2(NULL, invo_name, NULL, NULL));
{
int in, out;
struct stat st;
{
int in, out;
struct stat st;
@@
-473,5
+459,6
@@
go_to_it:
}
context_save (); /* save the context file */
}
context_save (); /* save the context file */
- return done (status);
+ done (status);
+ return 1;
}
}