X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=73ad5f298c74eefbb11ebe668932dbcb7820eadb;hp=c0c8b5f63c4c4443cb34354158cc9f369080c90f;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a

diff --git a/uip/flist.c b/uip/flist.c
index c0c8b5f..73ad5f2 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -16,6 +16,12 @@
 
 #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
@@ -54,6 +60,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 struct Folder {
 	char *name;  /* name of folder */
 	int priority;
@@ -137,8 +145,7 @@ main(int argc, char **argv)
 	/* 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;
@@ -149,27 +156,27 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				/* sysexits.h EX_USAGE */
-				exit(1);
+				exit(EX_USAGE);
 			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);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+
 			case VERSIONSW:
 				print_version(invo_name);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			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)
-					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;
 
@@ -215,10 +222,10 @@ main(int argc, char **argv)
 			*/
 			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));
+				foldersToDo[numfolders++] = mh_xstrdup(expandfol(cp));
 			} else
 				foldersToDo[numfolders++] = cp;
 		}
@@ -240,16 +247,16 @@ main(int argc, char **argv)
 
 		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 */
 		}
-		dp = getcpy(cp);
+		dp = mh_xstrdup(cp);
 		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;
 			}
@@ -261,7 +268,7 @@ main(int argc, char **argv)
 	qsort(folders, nFolders, sizeof(struct Folder),
 			(qsort_comp) CompareFolders);
 	PrintFolders();
-	return 0;
+	return EX_OK;
 }
 
 /*
@@ -289,7 +296,7 @@ GetFolderOrder(void)
 			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
@@ -310,7 +317,7 @@ ScanFolders(void)
 	 * 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 */
@@ -396,7 +403,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 	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
@@ -459,7 +466,7 @@ AddFolder(char *name, int force)
 		/* Oops, error occurred.  Record it and continue. */
 		AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
 		f = &folders[nFolders++];
-		f->name = getcpy(name);
+		f->name = mh_xstrdup(name);
 		f->error = 1;
 		f->priority = AssignPriority(f->name);
 		return 0;
@@ -496,7 +503,7 @@ AddFolder(char *name, int force)
 		/* save general folder information */
 		AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
 		f = &folders[nFolders++];
-		f->name = getcpy(name);
+		f->name = mh_xstrdup(name);
 		f->nMsgs = mp->nummsg;
 		f->error = 0;
 		f->priority = AssignPriority(f->name);
@@ -618,12 +625,10 @@ AllocFolders(struct Folder **f, int *nfa, int n)
 		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;
-		*f = (struct Folder *) mh_xrealloc(
-				*f, *nfa * (sizeof(struct Folder)));
+		*f = mh_xrealloc(*f, *nfa * sizeof(struct Folder));
 	}
 }
 
@@ -671,7 +676,7 @@ do_readonly_folders(void)
 {
 	int atrlen;
 	char atrcur[BUFSIZ];
-	register struct node *np;
+	struct node *np;
 
 	snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
 	atrlen = strlen(atrcur);