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

diff --git a/uip/refile.c b/uip/refile.c
index ab5d55f..682f66a 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -31,6 +31,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 static char maildir[BUFSIZ];
 
 struct st_fold {
@@ -101,7 +103,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
@@ -110,7 +112,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				files[filep++] = getcpy(expanddir(cp));
+				files[filep++] = mh_xstrdup(expanddir(cp));
 				continue;
 			}
 		}
@@ -118,7 +120,7 @@ main(int argc, char **argv)
 			if (foldp > NFOLDERS)
 				adios(EX_USAGE, NULL, "only %d folders allowed!",
 						NFOLDERS);
-			folders[foldp++].f_name = getcpy(expandfol(cp));
+			folders[foldp++].f_name = mh_xstrdup(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -126,57 +128,73 @@ main(int argc, char **argv)
 	if (foldp == 0)
 		adios(EX_USAGE, NULL, "no folder specified");
 
-	/*
-	** We are refiling a file to the folders
-	*/
 	if (filep > 0) {
-		if (folder || msgs.size)
+		/*
+		** We are refiling one or more files (-file) to the folders
+		*/
+		if (msgs.size) {
 			adios(EX_USAGE, NULL, "use -file or msgs, not both");
+		}
+		if (folder) {
+			adios(EX_USAGE, NULL, "use -file or -src, not both");
+		}
 		opnfolds(folders, foldp);
-		for (i = 0; i < filep; i++)
-			if (m_file(files[i], folders, foldp, 0))
+		for (i = 0; i < filep; i++) {
+			if (m_file(files[i], folders, foldp, 0)) {
 				exit(EX_IOERR);
+			}
+		}
 		/* If -nolink, then unlink files */
 		if (!linkf) {
 			int i;
 			char **files = filevec;
 
-			/* just unlink the files */
 			for (i = 0; i < filep; i++) {
-				if (unlink(files[i]) == NOTOK)
+				if (unlink(files[i]) == NOTOK) {
 					admonish(files[i], "unable to unlink");
+				}
 			}
 		}
 		exit(EX_OK);
 	}
 
-	if (!msgs.size)
+	/*
+	** We are refiling messages to the folders
+	*/
+	if (!msgs.size) {
 		app_msgarg(&msgs, seq_cur);
-	if (!folder)
+	}
+	if (!folder) {
 		folder = getcurfol();
-	strncpy(maildir, toabsdir(folder), sizeof(maildir));
+	}
 
-	if (chdir(maildir) == NOTOK)
+	strncpy(maildir, toabsdir(folder), sizeof(maildir));
+	if (chdir(maildir) == NOTOK) {
 		adios(EX_OSERR, maildir, "unable to change directory to");
+	}
 
 	/* read source folder and create message structure */
-	if (!(mp = folder_read(folder)))
+	if (!(mp = folder_read(folder))) {
 		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
+	}
 
-	/* check for empty folder */
-	if (mp->nummsg == 0)
+	if (mp->nummsg == 0) {
 		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]))
+	for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+		if (!m_convert(mp, msgs.msgs[msgnum])) {
 			exit(EX_SOFTWARE);
-	seq_setprev(mp);  /* set the previous-sequence */
+		}
+	}
+	seq_setprev(mp);
 
 	/* create folder structures for each destination folder */
 	opnfolds(folders, foldp);
 
-	/* Link all the selected messages into destination folders.
+	/*
+	** Link all the selected messages into destination folders.
 	**
 	** This causes the add hook to be run for messages that are
 	** linked into another folder.  The refile hook is run for
@@ -184,9 +202,10 @@ main(int argc, char **argv)
 	*/
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {
-			cp = getcpy(m_name(msgnum));
-			if (m_file(cp, folders, foldp, !linkf))
+			cp = mh_xstrdup(m_name(msgnum));
+			if (m_file(cp, folders, foldp, !linkf)) {
 				exit(EX_IOERR);
+			}
 			mh_free0(&cp);
 		}
 	}
@@ -206,9 +225,8 @@ main(int argc, char **argv)
 	if (linkf) {
 		seq_setcur(mp, mp->hghsel);
 	}
-	seq_save(mp);  /* synchronize message sequences */
+	seq_save(mp);
 
-	context_replace(curfolder, folder);
 	context_save();
 	folder_free(mp);
 	return 0;
@@ -232,10 +250,12 @@ opnfolds(struct st_fold *folders, int nfolders)
 
 		create_folder(nmaildir, 0, exit);
 
-		if (chdir(nmaildir) == NOTOK)
+		if (chdir(nmaildir) == NOTOK) {
 			adios(EX_OSERR, nmaildir, "unable to change directory to");
-		if (!(mp = folder_read(fp->f_name)))
+		}
+		if (!(mp = folder_read(fp->f_name))) {
 			adios(EX_IOERR, NULL, "unable to read folder %s", fp->f_name);
+		}
 		mp->curmsg = 0;
 
 		fp->f_mp = mp;
@@ -274,9 +294,10 @@ m_file(char *msgfile, struct st_fold *folders, int nfolders, int refile)
 	struct st_fold *fp, *ep;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-		if ((msgnum = folder_addmsg(&fp->f_mp, msgfile, 1, 0,
-				0, nfolders == 1 && refile, maildir)) == -1)
+		if ((msgnum = folder_addmsg(&fp->f_mp, msgfile, 1, 0, 0,
+				nfolders == 1 && refile, maildir)) == -1) {
 			return 1;
+		}
 	}
 	return 0;
 }