projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates README, INSTALL, and docs/MACHINES
[mmh]
/
uip
/
flist.c
diff --git
a/uip/flist.c
b/uip/flist.c
index
9302a8a
..
68acabb
100644
(file)
--- a/
uip/flist.c
+++ b/
uip/flist.c
@@
-16,6
+16,12
@@
#include <h/mh.h>
#include <h/utils.h>
#include <h/mh.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
/*
** We allocate space to record the names of folders
/*
** We allocate space to record the names of folders
@@
-30,30
+36,26
@@
static struct swit switches[] = {
#define ALLSW 1
{ "all", 0 },
#define NOALLSW 2
#define ALLSW 1
{ "all", 0 },
#define NOALLSW 2
- { "noall", 0 },
+ { "noall", 2 },
#define RECURSE 3
{ "recurse", 0 },
#define NORECURSE 4
#define RECURSE 3
{ "recurse", 0 },
#define NORECURSE 4
- { "norecurse", 0 },
+ { "norecurse", 2 },
#define SHOWZERO 5
{ "showzero", 0 },
#define NOSHOWZERO 6
#define SHOWZERO 5
{ "showzero", 0 },
#define NOSHOWZERO 6
- { "noshowzero", 0 },
+ { "noshowzero", 2 },
#define ALPHASW 7
{ "alpha", 0 },
#define NOALPHASW 8
#define ALPHASW 7
{ "alpha", 0 },
#define NOALPHASW 8
- { "noalpha", 0 },
+ { "noalpha", 2 },
#define FASTSW 9
{ "fast", 0 },
#define NOFASTSW 10
#define FASTSW 9
{ "fast", 0 },
#define NOFASTSW 10
- { "nofast", 0 },
-#define TOTALSW 11
- { "total", -5 },
-#define NOTOTALSW 12
- { "nototal", -7 },
-#define VERSIONSW 13
- { "version", 0 },
-#define HELPSW 14
+ { "nofast", 2 },
+#define VERSIONSW 11
+ { "Version", 0 },
+#define HELPSW 12
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-87,7
+89,7
@@
static int all = FALSE; /* scan all folders in top level? */
static int alphaOrder = FALSE; /* want alphabetical order only */
static int recurse = FALSE; /* show nested folders? */
static int showzero = TRUE; /* show folders even if no messages in seq? */
static int alphaOrder = FALSE; /* want alphabetical order only */
static int recurse = FALSE; /* show nested folders? */
static int showzero = TRUE; /* show folders even if no messages in seq? */
-static int Total = TRUE; /* display info on number of messages in
+static int fastsw = FALSE; /* display info on number of messages in
* sequence found, and total num messages */
static char curfol[BUFSIZ]; /* name of the current folder */
* sequence found, and total num messages */
static char curfol[BUFSIZ]; /* name of the current folder */
@@
-122,9
+124,7
@@
main(int argc, char **argv)
char **arguments;
char buf[BUFSIZ];
char **arguments;
char buf[BUFSIZ];
-#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 */
@@
-155,26
+155,27
@@
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 [+folder1 [+folder2 ...]][switches]", invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][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 SEQSW:
if (!(cp = *argp++) || *cp == '-')
case SEQSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
/* check if too many sequences specified */
if (numsequences >= NUMATTRS)
argp[-2]);
/* check if too many sequences specified */
if (numsequences >= NUMATTRS)
- adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
+ adios(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS);
sequencesToDo[numsequences++] = cp;
break;
sequencesToDo[numsequences++] = cp;
break;
@@
-199,14
+200,11
@@
main(int argc, char **argv)
alphaOrder = FALSE;
break;
alphaOrder = FALSE;
break;
- case NOFASTSW:
- case TOTALSW:
- Total = TRUE;
- break;
-
case FASTSW:
case FASTSW:
- case NOTOTALSW:
- Total = FALSE;
+ fastsw = TRUE;
+ break;
+ case NOFASTSW:
+ fastsw = FALSE;
break;
case RECURSE:
break;
case RECURSE:
@@
-248,7
+246,7
@@
main(int argc, char **argv)
if ((cp = context_find(usequence))) {
if (!*cp) {
if ((cp = context_find(usequence))) {
if (!*cp) {
- adios(NULL, "profile entry %s set, but empty, and no sequence given", usequence);
+ adios(EX_CONFIG, NULL, "profile entry %s set, but empty, and no sequence given", usequence);
}
} else {
cp = seq_unseen; /* use default */
}
} else {
cp = seq_unseen; /* use default */
@@
-257,7
+255,7
@@
main(int argc, char **argv)
ap = brkstring(dp, " ", "\n");
for (; ap && *ap; ap++) {
if (numsequences >= NUMATTRS) {
ap = brkstring(dp, " ", "\n");
for (; ap && *ap; ap++) {
if (numsequences >= NUMATTRS) {
- adios(NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
+ adios(EX_USAGE, NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
} else {
sequencesToDo[numsequences++] = *ap;
}
} else {
sequencesToDo[numsequences++] = *ap;
}
@@
-269,8
+267,7
@@
main(int argc, char **argv)
qsort(folders, nFolders, sizeof(struct Folder),
(qsort_comp) CompareFolders);
PrintFolders();
qsort(folders, nFolders, sizeof(struct Folder),
(qsort_comp) CompareFolders);
PrintFolders();
- done(0);
- return 1;
+ return EX_OK;
}
/*
}
/*
@@
-319,7
+316,7
@@
ScanFolders(void)
* change directory to base of nmh directory
*/
if (chdir(nmhdir) == NOTOK)
* change directory to base of nmh directory
*/
if (chdir(nmhdir) == NOTOK)
- adios(nmhdir, "unable to change directory to");
+ adios(EX_OSERR, nmhdir, "unable to change directory to");
if (numfolders > 0) {
/* Update context */
if (numfolders > 0) {
/* Update context */
@@
-405,7
+402,7
@@
BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
nlinks = s->st_nlink;
if (!(dir = opendir(dirName)))
nlinks = s->st_nlink;
if (!(dir = opendir(dirName)))
- adios(dirName, "can't open directory");
+ adios(EX_IOERR, dirName, "can't open directory");
/*
** A hack so that we don't see a
/*
** A hack so that we don't see a
@@
-534,7
+531,7
@@
PrintFolders(void)
unsigned int maxfolderlen = 0, maxseqlen = 0;
int maxnum = 0, maxseq = 0;
unsigned int maxfolderlen = 0, maxseqlen = 0;
int maxnum = 0, maxseq = 0;
- if (!Total) {
+ if (fastsw) {
for (i = 0; i < nFolders; i++)
printf("%s\n", folders[i].name);
return;
for (i = 0; i < nFolders; i++)
printf("%s\n", folders[i].name);
return;
@@
-680,7
+677,7
@@
do_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);