projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary casts
[mmh]
/
uip
/
flist.c
diff --git
a/uip/flist.c
b/uip/flist.c
index
2a002a5
..
f7e5ba3
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
@@
-118,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 */
@@
-139,8
+143,7
@@
main(int argc, char **argv)
/* allocate the initial space to record the folder names */
numfolders = 0;
maxfolders = MAXFOLDERS;
/* allocate the initial space to record the folder names */
numfolders = 0;
maxfolders = MAXFOLDERS;
- foldersToDo = (char **) mh_xmalloc((size_t)
- (maxfolders * sizeof(*foldersToDo)));
+ foldersToDo = mh_xcalloc(maxfolders, sizeof(*foldersToDo));
/* no sequences yet */
numsequences = 0;
/* no sequences yet */
numsequences = 0;
@@
-151,26
+154,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;
@@
-216,7
+220,7
@@
main(int argc, char **argv)
*/
if (numfolders >= maxfolders) {
maxfolders += MAXFOLDERS;
*/
if (numfolders >= maxfolders) {
maxfolders += MAXFOLDERS;
- foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
+ foldersToDo = mh_xrealloc(foldersToDo, maxfolders * sizeof(*foldersToDo));
}
if (*cp == '+' || *cp == '@') {
foldersToDo[numfolders++] = getcpy(expandfol(cp));
}
if (*cp == '+' || *cp == '@') {
foldersToDo[numfolders++] = getcpy(expandfol(cp));
@@
-241,7
+245,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 */
@@
-250,7
+254,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;
}
@@
-262,8
+266,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;
}
/*
}
/*
@@
-291,7
+294,7
@@
GetFolderOrder(void)
AllocFolders(&orders, &nOrdersAlloced, nOrders + 1);
o = &orders[nOrders++];
o->priority = priority++;
AllocFolders(&orders, &nOrdersAlloced, nOrders + 1);
o = &orders[nOrders++];
o->priority = priority++;
- o->name = (char *) mh_xmalloc(p - s + 1);
+ o->name = mh_xcalloc(p - s + 1, sizeof(char));
strncpy(o->name, s, p - s);
o->name[p - s] = 0;
} else
strncpy(o->name, s, p - s);
o->name[p - s] = 0;
} else
@@
-312,7
+315,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 */
@@
-398,7
+401,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
@@
-620,12
+623,10
@@
AllocFolders(struct Folder **f, int *nfa, int n)
return;
if (*f == NULL) {
*nfa = 10;
return;
if (*f == NULL) {
*nfa = 10;
- *f = (struct Folder *) mh_xmalloc(
- *nfa * (sizeof(struct Folder)));
+ *f = mh_xcalloc(*nfa, sizeof(struct Folder));
} else {
*nfa *= 2;
} else {
*nfa *= 2;
- *f = (struct Folder *) mh_xrealloc(
- *f, *nfa * (sizeof(struct Folder)));
+ *f = mh_xrealloc(*f, *nfa * sizeof(struct Folder));
}
}
}
}
@@
-673,7
+674,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);