projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring back the LINUX-IO check from the last commit
[mmh]
/
uip
/
scan.c
diff --git
a/uip/scan.c
b/uip/scan.c
index
5cdd5b9
..
0f755ca
100644
(file)
--- a/
uip/scan.c
+++ b/
uip/scan.c
@@
-12,6
+12,9
@@
#include <h/tws.h>
#include <h/utils.h>
#include <errno.h>
#include <h/tws.h>
#include <h/utils.h>
#include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define FORMSW 0
static struct swit switches[] = {
#define FORMSW 0
@@
-19,9
+22,9
@@
static struct swit switches[] = {
#define WIDTHSW 1
{ "width columns", 0 },
#define FILESW 2
#define WIDTHSW 1
{ "width columns", 0 },
#define FILESW 2
- { "file file", 4 },
+ { "file file", 0 },
#define VERSIONSW 3
#define VERSIONSW 3
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
@@
-41,9
+44,7
@@
main(int argc, char **argv)
struct msgs *mp;
FILE *in;
struct msgs *mp;
FILE *in;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-60,34
+61,34
@@
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", cp);
+ adios(EX_USAGE, NULL, "-%s unknown", 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);
- 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 FORMSW:
if (!(form = *argp++) || *form == '-')
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
argp[-2]);
continue;
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
width = atoi(cp);
continue;
case FILESW:
if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
argp[-2]);
width = atoi(cp);
continue;
case FILESW:
if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
if (strcmp(file = cp, "-")!=0)
file = getcpy(expanddir(cp));
argp[-2]);
if (strcmp(file = cp, "-")!=0)
file = getcpy(expanddir(cp));
@@
-96,7
+97,7
@@
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
folder = getcpy(expandfol(cp));
} else
else
folder = getcpy(expandfol(cp));
} else
@@
-113,16
+114,16
@@
main(int argc, char **argv)
*/
if (file) {
if (msgs.size)
*/
if (file) {
if (msgs.size)
- adios(NULL, "\"msgs\" not allowed with -file");
+ adios(EX_USAGE, NULL, "\"msgs\" not allowed with -file");
if (folder)
if (folder)
- adios(NULL, "\"+folder\" not allowed with -file");
+ adios(EX_USAGE, NULL, "\"+folder\" not allowed with -file");
/* check if "file" is really stdin */
if (strcmp(file, "-") == 0) {
in = stdin;
file = "stdin";
} else if (!(in = fopen(file, "r"))) {
/* check if "file" is really stdin */
if (strcmp(file, "-") == 0) {
in = stdin;
file = "stdin";
} else if (!(in = fopen(file, "r"))) {
- adios(file, "unable to open");
+ adios(EX_IOERR, file, "unable to open");
}
thisisanmbox(in);
}
thisisanmbox(in);
@@
-132,7
+133,7
@@
main(int argc, char **argv)
break;
}
fclose(in);
break;
}
fclose(in);
- done(0);
+ exit(EX_OK);
}
/*
}
/*
@@
-146,20
+147,20
@@
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);
/* 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 all the message ranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
/* parse all the message ranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
- done(1);
+ exit(EX_USAGE);
seq_setprev(mp); /* set the Previous-Sequence */
context_replace(curfolder, folder); /* update current folder */
seq_setprev(mp); /* set the Previous-Sequence */
context_replace(curfolder, folder); /* update current folder */
@@
-212,7
+213,7
@@
main(int argc, char **argv)
break;
default:
break;
default:
- adios(NULL, "scan() botch(%d)", state);
+ adios(EX_SOFTWARE, NULL, "scan() botch(%d)", state);
case SCNEOF:
advise(NULL, "message %d: empty", msgnum);
case SCNEOF:
advise(NULL, "message %d: empty", msgnum);
@@
-224,6
+225,5
@@
main(int argc, char **argv)
folder_free(mp); /* free folder/message structure */
folder_free(mp); /* free folder/message structure */
- done(0);
- return 1;
+ return 0;
}
}