X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=ab5d55f861c55b5bb1ec51e0a2acdd071651bde4;hp=b07c32d275a3e78b0dc8985acdfd7739eb61c416;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=c3b491e413335224388481939948dd6af4179851

diff --git a/uip/refile.c b/uip/refile.c
index b07c32d..ab5d55f 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -11,6 +11,9 @@
 #include <h/utils.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define LINKSW  0
@@ -73,17 +76,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown\n", cp);
+				adios(EX_USAGE, NULL, "-%s unknown\n", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case LINKSW:
 				linkf++;
@@ -94,18 +97,18 @@ main(int argc, char **argv)
 
 			case SRCSW:
 				if (folder)
-					adios(NULL, "only one source folder at a time!");
+					adios(EX_USAGE, NULL, "only one source folder at a time!");
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				folder = getcpy(expandfol(cp));
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
-					adios(NULL, "only %d files allowed!",
+					adios(EX_USAGE, NULL, "only %d files allowed!",
 							NFOLDERS);
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				files[filep++] = getcpy(expanddir(cp));
 				continue;
@@ -113,7 +116,7 @@ main(int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (foldp > NFOLDERS)
-				adios(NULL, "only %d folders allowed!",
+				adios(EX_USAGE, NULL, "only %d folders allowed!",
 						NFOLDERS);
 			folders[foldp++].f_name = getcpy(expandfol(cp));
 		} else
@@ -121,18 +124,18 @@ main(int argc, char **argv)
 	}
 
 	if (foldp == 0)
-		adios(NULL, "no folder specified");
+		adios(EX_USAGE, NULL, "no folder specified");
 
 	/*
 	** We are refiling a file to the folders
 	*/
 	if (filep > 0) {
 		if (folder || msgs.size)
-			adios(NULL, "use -file or msgs, not both");
+			adios(EX_USAGE, NULL, "use -file or msgs, not both");
 		opnfolds(folders, foldp);
 		for (i = 0; i < filep; i++)
 			if (m_file(files[i], folders, foldp, 0))
-				done(1);
+				exit(EX_IOERR);
 		/* If -nolink, then unlink files */
 		if (!linkf) {
 			int i;
@@ -144,7 +147,7 @@ main(int argc, char **argv)
 					admonish(files[i], "unable to unlink");
 			}
 		}
-		done(0);
+		exit(EX_OK);
 	}
 
 	if (!msgs.size)
@@ -154,20 +157,20 @@ main(int argc, char **argv)
 	strncpy(maildir, toabsdir(folder), sizeof(maildir));
 
 	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
+		adios(EX_OSERR, maildir, "unable to change directory to");
 
 	/* read source 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)
-		adios(NULL, "no messages in %s", folder);
+		adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
 	/* parse the message range/sequence/name and set SELECTED */
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
 		if (!m_convert(mp, msgs.msgs[msgnum]))
-			done(1);
+			exit(EX_SOFTWARE);
 	seq_setprev(mp);  /* set the previous-sequence */
 
 	/* create folder structures for each destination folder */
@@ -183,8 +186,8 @@ main(int argc, char **argv)
 		if (is_selected(mp, msgnum)) {
 			cp = getcpy(m_name(msgnum));
 			if (m_file(cp, folders, foldp, !linkf))
-				done(1);
-			free(cp);
+				exit(EX_IOERR);
+			mh_free0(&cp);
 		}
 	}
 
@@ -208,8 +211,7 @@ main(int argc, char **argv)
 	context_replace(curfolder, folder);
 	context_save();
 	folder_free(mp);
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -221,19 +223,19 @@ static void
 opnfolds(struct st_fold *folders, int nfolders)
 {
 	char nmaildir[BUFSIZ];
-	register struct st_fold *fp, *ep;
-	register struct msgs *mp;
+	struct st_fold *fp, *ep;
+	struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
 		chdir(toabsdir("+"));
 		strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
 
-		create_folder(nmaildir, 0, done);
+		create_folder(nmaildir, 0, exit);
 
 		if (chdir(nmaildir) == NOTOK)
-			adios(nmaildir, "unable to change directory to");
+			adios(EX_OSERR, nmaildir, "unable to change directory to");
 		if (!(mp = folder_read(fp->f_name)))
-			adios(NULL, "unable to read folder %s", fp->f_name);
+			adios(EX_IOERR, NULL, "unable to read folder %s", fp->f_name);
 		mp->curmsg = 0;
 
 		fp->f_mp = mp;
@@ -250,8 +252,8 @@ opnfolds(struct st_fold *folders, int nfolders)
 static void
 clsfolds(struct st_fold *folders, int nfolders)
 {
-	register struct st_fold *fp, *ep;
-	register struct msgs *mp;
+	struct st_fold *fp, *ep;
+	struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
 		mp = fp->f_mp;