projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed ``Face'' support in mhl.
[mmh]
/
uip
/
dist.c
diff --git
a/uip/dist.c
b/uip/dist.c
index
86c564f
..
27be4a5
100644
(file)
--- a/
uip/dist.c
+++ b/
uip/dist.c
@@
-40,7
+40,7
@@
static struct swit switches[] = {
int
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
int anot = 0, inplace = 1, nedit = 0;
int nwhat = 0, in, out;
{
int anot = 0, inplace = 1, nedit = 0;
int nwhat = 0, in, out;
@@
-53,31
+53,30
@@
main (int argc, char **argv)
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex (argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
- arguments = getarguments (invo_name, argc, argv, 1);
+ arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
while ((cp = *argp++)) {
if (*cp == '-') {
argp = arguments;
while ((cp = *argp++)) {
if (*cp == '-') {
- switch (smatch (++cp, switches)) {
+ switch (smatch(++cp, switches)) {
case AMBIGSW:
case AMBIGSW:
- ambigsw (cp, switches);
- done (1);
+ ambigsw(cp, switches);
+ done(1);
case UNKWNSW:
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ adios(NULL, "-%s unknown", cp);
case HELPSW:
case HELPSW:
- snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
- invo_name);
- print_help (buf, switches, 1);
- done (1);
+ snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name);
+ print_help(buf, switches, 1);
+ done(1);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done(1);
case ANNOSW:
anot++;
case ANNOSW:
anot++;
@@
-88,7
+87,7
@@
main (int argc, char **argv)
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ adios(NULL, "missing argument to %s", argp[-2]);
nedit = 0;
continue;
case NEDITSW:
nedit = 0;
continue;
case NEDITSW:
@@
-97,7
+96,7
@@
main (int argc, char **argv)
case WHATSW:
if (!(whatnowproc = *argp++) || *whatnowproc == '-')
case WHATSW:
if (!(whatnowproc = *argp++) || *whatnowproc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ adios(NULL, "missing argument to %s", argp[-2]);
nwhat = 0;
continue;
case NWHATSW:
nwhat = 0;
continue;
case NWHATSW:
@@
-106,14
+105,14
@@
main (int argc, char **argv)
case FILESW:
if (file)
case FILESW:
if (file)
- adios (NULL, "only one file at a time!");
+ adios(NULL, "only one file at a time!");
if (!(cp = *argp++) || *cp == '-')
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- file = path (cp, TFILE);
+ adios(NULL, "missing argument to %s", argp[-2]);
+ file = getcpy(expanddir(cp));
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ adios(NULL, "missing argument to %s", argp[-2]);
continue;
case INPLSW:
continue;
case INPLSW:
@@
-126,34
+125,32
@@
main (int argc, char **argv)
}
if (*cp == '+' || *cp == '@') {
if (folder)
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios (NULL, "only one folder at a time!");
+ adios(NULL, "only one folder at a time!");
else
else
- folder = pluspath (cp);
+ folder = getcpy(expandfol(cp));
} else {
if (msg)
} else {
if (msg)
- adios (NULL, "only one message at a time!");
+ adios(NULL, "only one message at a time!");
else
msg = cp;
}
}
else
msg = cp;
}
}
- cwd = getcpy (pwd ());
+ cwd = getcpy(pwd());
- if (!context_find ("path"))
- free (path ("./", TFOLDER));
if (file && (msg || folder))
if (file && (msg || folder))
- adios (NULL, "can't mix files and folders/msgs");
+ adios(NULL, "can't mix files and folders/msgs");
in = open_form(&form, distcomps);
in = open_form(&form, distcomps);
- strncpy (drft, m_draft("new"), sizeof(drft));
+ strncpy(drft, m_draft("new"), sizeof(drft));
- if ((out = creat (drft, m_gmprot ())) == NOTOK)
- adios (drft, "unable to create");
+ if ((out = creat(drft, m_gmprot())) == NOTOK)
+ adios(drft, "unable to create");
- cpydata (in, out, form, drft);
- close (in);
- close (out);
+ cpydata(in, out, form, drft);
+ close(in);
+ close(out);
if (file) {
/*
if (file) {
/*
@@
-167,44
+164,44
@@
main (int argc, char **argv)
if (!msg)
msg = "cur";
if (!folder)
if (!msg)
msg = "cur";
if (!folder)
- folder = getfolder (1);
- maildir = m_maildir (folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
- if (chdir (maildir) == NOTOK)
- adios (maildir, "unable to change directory to");
+ if (chdir(maildir) == NOTOK)
+ adios(maildir, "unable to change directory to");
/* read folder and create message structure */
/* read folder and create message structure */
- if (!(mp = folder_read (folder)))
- adios (NULL, "unable to read folder %s", folder);
+ if (!(mp = folder_read(folder)))
+ adios(NULL, "unable to read folder %s", folder);
/* check for empty folder */
if (mp->nummsg == 0)
/* check for empty folder */
if (mp->nummsg == 0)
- adios (NULL, "no messages in %s", folder);
+ adios(NULL, "no messages in %s", folder);
/* parse the message range/sequence/name and set SELECTED */
/* parse the message range/sequence/name and set SELECTED */
- if (!m_convert (mp, msg))
- done (1);
- seq_setprev (mp); /* set the previous-sequence */
+ if (!m_convert(mp, msg))
+ done(1);
+ seq_setprev(mp); /* set the previous-sequence */
if (mp->numsel > 1)
if (mp->numsel > 1)
- adios (NULL, "only one message at a time!");
+ adios(NULL, "only one message at a time!");
}
}
- msgnam = file ? file : getcpy (m_name (mp->lowsel));
- if ((in = open (msgnam, O_RDONLY)) == NOTOK)
- adios (msgnam, "unable to open message");
+ msgnam = file ? file : getcpy(m_name(mp->lowsel));
+ if ((in = open(msgnam, O_RDONLY)) == NOTOK)
+ adios(msgnam, "unable to open message");
if (!file) {
if (!file) {
- context_replace (pfolder, folder); /* update current folder */
- seq_setcur (mp, mp->lowsel); /* update current message */
- seq_save (mp); /* synchronize sequences */
- context_save (); /* save the context file */
+ context_replace(curfolder, folder); /* update current folder */
+ seq_setcur(mp, mp->lowsel); /* update current message */
+ seq_save(mp); /* synchronize sequences */
+ context_save(); /* save the context file */
}
if (nwhat)
}
if (nwhat)
- done (0);
- what_now (ed, nedit, NOUSE, drft, msgnam, 1, mp,
- anot ? "Resent" : NULL, inplace, cwd);
- done (1);
+ done(0);
+ what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL,
+ inplace, cwd);
+ done(1);
return 1;
}
return 1;
}