projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send use m_getfld2
[mmh]
/
uip
/
rmm.c
diff --git
a/uip/rmm.c
b/uip/rmm.c
index
9401d2b
..
7258327
100644
(file)
--- a/
uip/rmm.c
+++ b/
uip/rmm.c
@@
-8,6
+8,9
@@
#include <h/mh.h>
#include <h/utils.h>
#include <h/mh.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define UNLINKSW 0
static struct swit switches[] = {
#define UNLINKSW 0
@@
-21,6
+24,7
@@
static struct swit switches[] = {
{ NULL, 0 }
};
{ NULL, 0 }
};
+char *version=VERSION;
int
main(int argc, char **argv)
int
main(int argc, char **argv)
@@
-31,7
+35,6
@@
main(int argc, char **argv)
char **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
char **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
- pid_t pid;
setlocale(LC_ALL, "");
invo_name = mhbasename(argv[0]);
setlocale(LC_ALL, "");
invo_name = mhbasename(argv[0]);
@@
-47,17
+50,17
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- exit(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 [+folder] [msgs] [switches]", invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
print_help(buf, switches, 1);
- exit(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- exit(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case UNLINKSW:
unlink_msgs++;
case UNLINKSW:
unlink_msgs++;
@@
-69,9
+72,9
@@
main(int argc, char **argv)
}
if (*cp == '+' || *cp == '@') {
if (folder) {
}
if (*cp == '+' || *cp == '@') {
if (folder) {
- adios(NULL, "only one folder at a time!");
+ adios(EX_USAGE, NULL, "only one folder at a time!");
} else {
} else {
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
}
} else {
app_msgarg(&msgs, cp);
}
} else {
app_msgarg(&msgs, cp);
@@
-87,15
+90,15
@@
main(int argc, char **argv)
maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK) {
maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK) {
- adios(maildir, "unable to change directory to");
+ adios(EX_OSERR, maildir, "unable to change directory to");
}
/* read folder and create message structure */
if (!(mp = folder_read(folder))) {
}
/* read 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);
}
if (mp->nummsg == 0) {
}
if (mp->nummsg == 0) {
- adios(NULL, "no messages in %s", folder);
+ adios(EX_DATAERR, NULL, "no messages in %s", folder);
}
/*
** parse all the message ranges/sequences and set SELECTED
}
/*
** parse all the message ranges/sequences and set SELECTED
@@
-104,8
+107,7
@@
main(int argc, char **argv)
*/
for (msgnum = 0; msgnum < msgs.size; msgnum++) {
if (!m_convert(mp, msgs.msgs[msgnum])) {
*/
for (msgnum = 0; msgnum < msgs.size; msgnum++) {
if (!m_convert(mp, msgs.msgs[msgnum])) {
- /* sysexits EX_USAGE */
- exit(1);
+ exit(EX_USAGE);
}
}
}
}
@@
-115,7
+117,6
@@
main(int argc, char **argv)
if (unlink_msgs) {
/* "remove" the SELECTED messages */
folder_delmsgs(mp, 1);
if (unlink_msgs) {
/* "remove" the SELECTED messages */
folder_delmsgs(mp, 1);
- seq_setprev(mp);
seq_save(mp);
folder_free(mp);
return 0;
seq_save(mp);
folder_free(mp);
return 0;
@@
-127,10
+128,10
@@
main(int argc, char **argv)
fflush(stdout);
if (msgs.size+6 > MAXARGS) {
fflush(stdout);
if (msgs.size+6 > MAXARGS) {
- adios(NULL, "more than %d messages for refile exec",
+ adios(EX_SOFTWARE, NULL, "more than %d messages for refile exec",
MAXARGS - 6);
}
MAXARGS - 6);
}
- vec = (char **)mh_xmalloc((size_t)(msgs.size + 6) * sizeof(*vec));
+ vec = mh_xcalloc(msgs.size + 6, sizeof(*vec));
vec[vecp++] = "refile";
vec[vecp++] = "-src";
vec[vecp++] = concat("+", folder, NULL);
vec[vecp++] = "refile";
vec[vecp++] = "-src";
vec[vecp++] = concat("+", folder, NULL);
@@
-141,20
+142,5
@@
main(int argc, char **argv)
}
vec[vecp] = NULL;
}
vec[vecp] = NULL;
- fflush(stdout);
- switch (pid = fork()) {
- case -1:
- adios("fork", "unable to");
-
- case 0:
- execvp(*vec, vec);
- fprintf(stderr, "unable to exec ");
- perror(*vec);
- _exit(-1);
-
- default:
- pidwait(pid, -1);
- }
-
- return 0;
+ return execprog(*vec, vec);
}
}