projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gitignore: More specific ignore patterns
[mmh]
/
uip
/
refile.c
diff --git
a/uip/refile.c
b/uip/refile.c
index
2fe25b4
..
01f205b
100644
(file)
--- a/
uip/refile.c
+++ b/
uip/refile.c
@@
-11,18
+11,21
@@
#include <h/utils.h>
#include <fcntl.h>
#include <errno.h>
#include <h/utils.h>
#include <fcntl.h>
#include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define LINKSW 0
{ "link", 0 },
#define NLINKSW 1
static struct swit switches[] = {
#define LINKSW 0
{ "link", 0 },
#define NLINKSW 1
- { "nolink", 0 },
+ { "nolink", 2 },
#define SRCSW 2
{ "src +folder", 0 },
#define FILESW 3
{ "file file", 0 },
#define VERSIONSW 4
#define SRCSW 2
{ "src +folder", 0 },
#define FILESW 3
{ "file file", 0 },
#define VERSIONSW 4
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 5
{ "help", 0 },
{ NULL, 0 }
#define HELPSW 5
{ "help", 0 },
{ NULL, 0 }
@@
-57,9
+60,7
@@
main(int argc, char **argv)
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
context_read();
invo_name = mhbasename(argv[0]);
context_read();
@@
-75,17
+76,17
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
case UNKWNSW:
- adios(NULL, "-%s unknown\n", cp);
+ adios(EX_USAGE, NULL, "-%s unknown\n", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case LINKSW:
linkf++;
case LINKSW:
linkf++;
@@
-96,18
+97,18
@@
main(int argc, char **argv)
case SRCSW:
if (folder)
case SRCSW:
if (folder)
- adios(NULL, "only one source folder at a time!");
+ adios(EX_USAGE, NULL, "only one source folder at a time!");
if (!(cp = *argp++) || *cp == '-')
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
folder = getcpy(expandfol(cp));
continue;
case FILESW:
if (filep > NFOLDERS)
argp[-2]);
folder = getcpy(expandfol(cp));
continue;
case FILESW:
if (filep > NFOLDERS)
- adios(NULL, "only %d files allowed!",
+ adios(EX_USAGE, NULL, "only %d files allowed!",
NFOLDERS);
if (!(cp = *argp++) || *cp == '-')
NFOLDERS);
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
files[filep++] = getcpy(expanddir(cp));
continue;
argp[-2]);
files[filep++] = getcpy(expanddir(cp));
continue;
@@
-115,7
+116,7
@@
main(int argc, char **argv)
}
if (*cp == '+' || *cp == '@') {
if (foldp > NFOLDERS)
}
if (*cp == '+' || *cp == '@') {
if (foldp > NFOLDERS)
- adios(NULL, "only %d folders allowed!",
+ adios(EX_USAGE, NULL, "only %d folders allowed!",
NFOLDERS);
folders[foldp++].f_name = getcpy(expandfol(cp));
} else
NFOLDERS);
folders[foldp++].f_name = getcpy(expandfol(cp));
} else
@@
-123,18
+124,18
@@
main(int argc, char **argv)
}
if (foldp == 0)
}
if (foldp == 0)
- adios(NULL, "no folder specified");
+ adios(EX_USAGE, NULL, "no folder specified");
/*
** We are refiling a file to the folders
*/
if (filep > 0) {
if (folder || msgs.size)
/*
** We are refiling a file to the folders
*/
if (filep > 0) {
if (folder || msgs.size)
- adios(NULL, "use -file or some messages, not both");
+ adios(EX_USAGE, NULL, "use -file or msgs, not both");
opnfolds(folders, foldp);
for (i = 0; i < filep; i++)
if (m_file(files[i], folders, foldp, 0))
opnfolds(folders, foldp);
for (i = 0; i < filep; i++)
if (m_file(files[i], folders, foldp, 0))
- done(1);
+ exit(EX_IOERR);
/* If -nolink, then unlink files */
if (!linkf) {
int i;
/* If -nolink, then unlink files */
if (!linkf) {
int i;
@@
-146,7
+147,7
@@
main(int argc, char **argv)
admonish(files[i], "unable to unlink");
}
}
admonish(files[i], "unable to unlink");
}
}
- done(0);
+ exit(EX_OK);
}
if (!msgs.size)
}
if (!msgs.size)
@@
-156,20
+157,20
@@
main(int argc, char **argv)
strncpy(maildir, toabsdir(folder), sizeof(maildir));
if (chdir(maildir) == NOTOK)
strncpy(maildir, toabsdir(folder), sizeof(maildir));
if (chdir(maildir) == NOTOK)
- adios(maildir, "unable to change directory to");
+ adios(EX_OSERR, maildir, "unable to change directory to");
/* read source folder and create message structure */
if (!(mp = folder_read(folder)))
/* read source folder and create message structure */
if (!(mp = folder_read(folder)))
- adios(NULL, "unable to read folder %s", folder);
+ adios(EX_IOERR, 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(EX_DATAERR, NULL, "no messages in %s", folder);
/* parse the message range/sequence/name and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
/* parse the message range/sequence/name and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
- done(1);
+ exit(EX_SOFTWARE);
seq_setprev(mp); /* set the previous-sequence */
/* create folder structures for each destination folder */
seq_setprev(mp); /* set the previous-sequence */
/* create folder structures for each destination folder */
@@
-185,7
+186,7
@@
main(int argc, char **argv)
if (is_selected(mp, msgnum)) {
cp = getcpy(m_name(msgnum));
if (m_file(cp, folders, foldp, !linkf))
if (is_selected(mp, msgnum)) {
cp = getcpy(m_name(msgnum));
if (m_file(cp, folders, foldp, !linkf))
- done(1);
+ exit(EX_IOERR);
free(cp);
}
}
free(cp);
}
}
@@
-210,8
+211,7
@@
main(int argc, char **argv)
context_replace(curfolder, folder);
context_save();
folder_free(mp);
context_replace(curfolder, folder);
context_save();
folder_free(mp);
- done(0);
- return 1;
+ return 0;
}
}
@@
-230,12
+230,12
@@
opnfolds(struct st_fold *folders, int nfolders)
chdir(toabsdir("+"));
strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
chdir(toabsdir("+"));
strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
- create_folder(nmaildir, 0, done);
+ create_folder(nmaildir, 0, exit);
if (chdir(nmaildir) == NOTOK)
if (chdir(nmaildir) == NOTOK)
- adios(nmaildir, "unable to change directory to");
+ adios(EX_OSERR, nmaildir, "unable to change directory to");
if (!(mp = folder_read(fp->f_name)))
if (!(mp = folder_read(fp->f_name)))
- adios(NULL, "unable to read folder %s", fp->f_name);
+ adios(EX_IOERR, NULL, "unable to read folder %s", fp->f_name);
mp->curmsg = 0;
fp->f_mp = mp;
mp->curmsg = 0;
fp->f_mp = mp;