projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked LINK, now named `altmsglink', similar to BACKUP_PREFIX.
[mmh]
/
uip
/
whatnowsbr.c
diff --git
a/uip/whatnowsbr.c
b/uip/whatnowsbr.c
index
6541b42
..
f5f78d7
100644
(file)
--- a/
uip/whatnowsbr.c
+++ b/
uip/whatnowsbr.c
@@
-246,7
+246,7
@@
WhatNow (int argc, char **argv)
snprintf (prompt, sizeof(prompt), myprompt, invo_name);
for (;;) {
if (!(argp = getans (prompt, aleqs))) {
snprintf (prompt, sizeof(prompt), myprompt, invo_name);
for (;;) {
if (!(argp = getans (prompt, aleqs))) {
- unlink (LINK);
+ unlink (altmsglink);
done (1);
}
switch (smatch (*argp, aleqs)) {
done (1);
}
switch (smatch (*argp, aleqs)) {
@@
-667,9
+667,9
@@
editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
else
snprintf (altpath, sizeof(altpath), "%s/%s", mp->foldpath, altmsg);
if (cwd == NULL)
else
snprintf (altpath, sizeof(altpath), "%s/%s", mp->foldpath, altmsg);
if (cwd == NULL)
- strncpy (linkpath, LINK, sizeof(linkpath));
+ strncpy (linkpath, altmsglink, sizeof(linkpath));
else
else
- snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
+ snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, altmsglink);
}
if (altmsg) {
}
if (altmsg) {
@@
-977,18
+977,6
@@
check_draft (char *msgnam)
}
}
-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
-#else /* CYRUS_SASL */
-# define SASLminc(a) 0
-#endif /* CYRUS_SASL */
-
-#ifndef TLS_SUPPORT
-# define TLSminc(a) (a)
-#else /* TLS_SUPPORT */
-# define TLSminc(a) 0
-#endif /* TLS_SUPPORT */
-
static struct swit sendswitches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
static struct swit sendswitches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
@@
-1062,20
+1050,12
@@
static struct swit sendswitches[] = {
{ "draftmessage msg", -6 },
#define SNDRFSW 35
{ "nodraftfolder", -3 },
{ "draftmessage msg", -6 },
#define SNDRFSW 35
{ "nodraftfolder", -3 },
-#define SASLSW 36
- { "sasl", SASLminc(-4) },
-#define SASLMECHSW 37
- { "saslmech", SASLminc(-5) },
-#define USERSW 38
- { "user", SASLminc(-4) },
#define SNDATTACHSW 39
{ "attach file", 6 },
#define SNDATTACHFORMAT 40
{ "attachformat", 7 },
#define PORTSW 41
{ "port server-port-name/number", 4 },
#define SNDATTACHSW 39
{ "attach file", 6 },
#define SNDATTACHFORMAT 40
{ "attachformat", 7 },
#define PORTSW 41
{ "port server-port-name/number", 4 },
-#define TLSSW 42
- { "tls", TLSminc(-3) },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-1229,8
+1209,6
@@
sendit (char *sp, char **arg, char *file, int pushed)
case SSNDSW:
case SOMLSW:
case SNOOPSW:
case SSNDSW:
case SOMLSW:
case SNOOPSW:
- case SASLSW:
- case TLSSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-1239,8
+1217,6
@@
sendit (char *sp, char **arg, char *file, int pushed)
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 == '-') {
case PORTSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-') {