projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop register storage class
[mmh]
/
uip
/
folder.c
diff --git
a/uip/folder.c
b/uip/folder.c
index
92ee496
..
3ca0e7d
100644
(file)
--- a/
uip/folder.c
+++ b/
uip/folder.c
@@
-12,6
+12,9
@@
#include <h/crawl_folders.h>
#include <h/utils.h>
#include <errno.h>
#include <h/crawl_folders.h>
#include <h/utils.h>
#include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define ALLSW 0
static struct swit switches[] = {
#define ALLSW 0
@@
-136,18
+139,17
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- /*sysexits.h EX_USAGE*/
- exit(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] [msg] [switches]", invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msg] [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 ALLSW:
all = 1;
case ALLSW:
all = 1;
@@
-227,12
+229,12
@@
main(int argc, char **argv)
}
if (*cp == '+' || *cp == '@') {
if (argfolder)
}
if (*cp == '+' || *cp == '@') {
if (argfolder)
- adios(NULL, "only one folder at a time!");
+ adios(EX_USAGE, NULL, "only one folder at a time!");
else
argfolder = getcpy(expandfol(cp));
} else {
if (msg)
else
argfolder = getcpy(expandfol(cp));
} else {
if (msg)
- adios(NULL, "only one (current) message at a time!");
+ adios(EX_USAGE, NULL, "only one (current) message at a time!");
else
msg = cp;
}
else
msg = cp;
}
@@
-257,7
+259,7
@@
main(int argc, char **argv)
ap = brkstring(dp, " ", "\n");
argfolder = getcpy(*ap++);
} else {
ap = brkstring(dp, " ", "\n");
argfolder = getcpy(*ap++);
} else {
- adios(NULL, "no other folder");
+ adios(EX_USAGE, NULL, "no other folder");
}
for (cp = getcpy(getcurfol()); *ap; ap++)
cp = add(*ap, add(" ", cp));
}
for (cp = getcpy(getcurfol()); *ap; ap++)
cp = add(*ap, add(" ", cp));
@@
-274,13
+276,13
@@
main(int argc, char **argv)
/* Popping a folder off of the folder stack */
if (popsw) {
if (argfolder)
/* Popping a folder off of the folder stack */
if (popsw) {
if (argfolder)
- adios(NULL, "sorry, no folders allowed with -pop");
+ adios(EX_USAGE, NULL, "sorry, no folders allowed with -pop");
if ((cp = context_find(stack))) {
dp = getcpy(cp);
ap = brkstring(dp, " ", "\n");
argfolder = getcpy(*ap++);
} else {
if ((cp = context_find(stack))) {
dp = getcpy(cp);
ap = brkstring(dp, " ", "\n");
argfolder = getcpy(*ap++);
} else {
- adios(NULL, "folder stack empty");
+ adios(EX_DATAERR, NULL, "folder stack empty");
}
if (*ap) {
/* if there's anything left in the stack */
}
if (*ap) {
/* if there's anything left in the stack */
@@
-297,7
+299,7
@@
main(int argc, char **argv)
if (pushsw || popsw) {
cp = toabsdir(argfolder);
if (access(cp, F_OK) == NOTOK)
if (pushsw || popsw) {
cp = toabsdir(argfolder);
if (access(cp, F_OK) == NOTOK)
- adios(cp, "unable to find folder");
+ adios(EX_DATAERR, cp, "unable to find folder");
/* update current folder */
context_replace(curfolder, argfolder);
context_save(); /* save the context file */
/* update current folder */
context_replace(curfolder, argfolder);
context_save(); /* save the context file */
@@
-316,7
+318,7
@@
main(int argc, char **argv)
printf("\n");
if (!printsw) {
printf("\n");
if (!printsw) {
- exit(0);
+ exit(EX_OK);
}
}
}
}
@@
-336,7
+338,7
@@
main(int argc, char **argv)
** crawl_folders
*/
if (chdir(nmhdir) == NOTOK)
** crawl_folders
*/
if (chdir(nmhdir) == NOTOK)
- adios(nmhdir, "unable to change directory to");
+ adios(EX_OSERR, nmhdir, "unable to change directory to");
if (!argfolder) {
if (msg)
admonish(NULL, "no folder given for message %s", msg);
if (!argfolder) {
if (msg)
admonish(NULL, "no folder given for message %s", msg);
@@
-367,7
+369,7
@@
main(int argc, char **argv)
** Check if folder exists. If not, then see if
** we should create it, or just exit.
*/
** Check if folder exists. If not, then see if
** we should create it, or just exit.
*/
- create_folder(toabsdir(folder), fcreat, done);
+ create_folder(toabsdir(folder), fcreat, exit);
if (get_folder_info(folder, msg) && argfolder) {
/* update current folder */
if (get_folder_info(folder, msg) && argfolder) {
/* update current folder */
@@
-381,7
+383,7
@@
main(int argc, char **argv)
print_folders();
context_save();
print_folders();
context_save();
- return 0;
+ return EX_OK;
}
static int
}
static int
@@
-424,7
+426,7
@@
get_folder_info_body(char *fold, char *msg, boolean *crawl_children)
if (fpack) {
if (folder_pack(&mp, fverb) == -1) {
if (fpack) {
if (folder_pack(&mp, fverb) == -1) {
- exit(0);
+ exit(EX_OK);
}
seq_save(mp); /* synchronize the sequences */
context_save(); /* save the context file */
}
seq_save(mp); /* synchronize the sequences */
context_save(); /* save the context file */
@@
-628,7
+630,7
@@
readonly_folders(void)
{
int atrlen;
char atrcur[BUFSIZ];
{
int atrlen;
char atrcur[BUFSIZ];
- register struct node *np;
+ struct node *np;
snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
atrlen = strlen(atrcur);
snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
atrlen = strlen(atrcur);