X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=a79e8be8128f195742e40e703a587adc9cfff4c3;hp=b1c2aa98a8782206e5e531558cddfe6c8940fd1f;hb=240013872c392fe644bd4f79382d9f5314b4ea60;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/refile.c b/uip/refile.c
index b1c2aa9..a79e8be 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -50,14 +50,14 @@ struct st_fold {
 /*
 ** static prototypes
 */
-static void opnfolds (struct st_fold *, int);
-static void clsfolds (struct st_fold *, int);
-static void remove_files (int, char **);
-static int m_file (char *, struct st_fold *, int, int, int);
+static void opnfolds(struct st_fold *, int);
+static void clsfolds(struct st_fold *, int);
+static void remove_files(int, char **);
+static int m_file(char *, struct st_fold *, int, int, int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int linkf = 0, preserve = 0, filep = 0;
 	int foldp = 0, unlink_msgs = 0;
@@ -73,12 +73,12 @@ main (int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
 
-	arguments = getarguments (invo_name, argc, argv, 1);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	/*
@@ -86,20 +86,20 @@ main (int argc, char **argv)
 	*/
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
+			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
-				ambigsw (cp, switches);
-				done (1);
+				ambigsw(cp, switches);
+				done(1);
 			case UNKWNSW:
-				adios (NULL, "-%s unknown\n", cp);
+				adios(NULL, "-%s unknown\n", cp);
 
 			case HELPSW:
-				snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name);
-				print_help (buf, switches, 1);
-				done (1);
+				snprintf(buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name);
+				print_help(buf, switches, 1);
+				done(1);
 			case VERSIONSW:
 				print_version(invo_name);
-				done (1);
+				done(1);
 
 			case LINKSW:
 				linkf++;
@@ -124,27 +124,28 @@ main (int argc, char **argv)
 
 			case SRCSW:
 				if (folder)
-					adios (NULL, "only one source folder at a time!");
+					adios(NULL, "only one source folder at a time!");
 				if (!(cp = *argp++) || *cp == '-')
-					adios (NULL, "missing argument to %s", argp[-2]);
-				folder = path (*cp == '+' || *cp == '@' ?
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				folder = path(*cp == '+' || *cp == '@' ?
 						cp + 1 : cp,
 						*cp != '@' ?
 						TFOLDER : TSUBCWF);
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
-					adios (NULL, "only %d files allowed!",
+					adios(NULL, "only %d files allowed!",
 							NFOLDERS);
 				if (!(cp = *argp++) || *cp == '-')
-					adios (NULL, "missing argument to %s",
+					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				files[filep++] = path (cp, TFILE);
+				files[filep++] = path(cp, TFILE);
 				continue;
 
 			case RPROCSW:
 				if (!(rmmproc = *argp++) || *rmmproc == '-')
-					adios (NULL, "missing argument to %s",
+					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 			case NRPRCSW:
@@ -154,21 +155,21 @@ main (int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (foldp > NFOLDERS)
-				adios (NULL, "only %d folders allowed!",
+				adios(NULL, "only %d folders allowed!",
 						NFOLDERS);
 			folders[foldp++].f_name =
-				pluspath (cp);
+				pluspath(cp);
 		} else
 				app_msgarg(&msgs, cp);
 	}
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 	if (foldp == 0)
-		adios (NULL, "no folder specified");
+		adios(NULL, "no folder specified");
 
 #ifdef WHATNOW
-	if (!msgs.size && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp)
+	if (!msgs.size && !foldp && !filep && (cp = getenv("mhdraft")) && *cp)
 		files[filep++] = cp;
 #endif /* WHATNOW */
 
@@ -177,42 +178,42 @@ main (int argc, char **argv)
 	*/
 	if (filep > 0) {
 		if (folder || msgs.size)
-			adios (NULL, "use -file or some messages, not both");
-		opnfolds (folders, foldp);
+			adios(NULL, "use -file or some messages, not both");
+		opnfolds(folders, foldp);
 		for (i = 0; i < filep; i++)
-			if (m_file (files[i], folders, foldp, preserve, 0))
-				done (1);
+			if (m_file(files[i], folders, foldp, preserve, 0))
+				done(1);
 		/* If -nolink, then "remove" files */
 		if (!linkf)
-			remove_files (filep, filevec);
-		done (0);
+			remove_files(filep, filevec);
+		done(0);
 	}
 
 	if (!msgs.size)
 		app_msgarg(&msgs, "cur");
 	if (!folder)
-		folder = getfolder (1);
-	strncpy (maildir, m_maildir (folder), sizeof(maildir));
+		folder = getfolder(1);
+	strncpy(maildir, m_maildir(folder), sizeof(maildir));
 
-	if (chdir (maildir) == NOTOK)
-		adios (maildir, "unable to change directory to");
+	if (chdir(maildir) == NOTOK)
+		adios(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);
+	if (!(mp = folder_read(folder)))
+		adios(NULL, "unable to read folder %s", folder);
 
 	/* check for empty folder */
 	if (mp->nummsg == 0)
-		adios (NULL, "no messages in %s", folder);
+		adios(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);
-	seq_setprev (mp);  /* set the previous-sequence */
+		if (!m_convert(mp, msgs.msgs[msgnum]))
+			done(1);
+	seq_setprev(mp);  /* set the previous-sequence */
 
 	/* create folder structures for each destination folder */
-	opnfolds (folders, foldp);
+	opnfolds(folders, foldp);
 
 	/* Link all the selected messages into destination folders.
 	**
@@ -221,11 +222,11 @@ main (int argc, char **argv)
 	** messages that are moved to another folder.
 	*/
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected (mp, msgnum)) {
-			cp = getcpy (m_name (msgnum));
-			if (m_file (cp, folders, foldp, preserve, !linkf))
-				done (1);
-			free (cp);
+		if (is_selected(mp, msgnum)) {
+			cp = getcpy(m_name(msgnum));
+			if (m_file(cp, folders, foldp, preserve, !linkf))
+				done(1);
+			free(cp);
 		}
 	}
 
@@ -236,9 +237,9 @@ main (int argc, char **argv)
 	** directory.  This should be moved to folder_delmsgs().
 	*/
 	if (rmmproc) {
-		context_replace (pfolder, folder);
-		context_save ();
-		fflush (stdout);
+		context_replace(pfolder, folder);
+		context_save();
+		fflush(stdout);
 	}
 
 	/*
@@ -248,20 +249,20 @@ main (int argc, char **argv)
 	** because the message has already been handled above.
 	*/
 	if (!linkf) {
-		folder_delmsgs (mp, unlink_msgs, 1);
+		folder_delmsgs(mp, unlink_msgs, 1);
 	}
 
-	clsfolds (folders, foldp);
+	clsfolds(folders, foldp);
 
-	if (mp->hghsel != mp->curmsg
-		&& (mp->numsel != mp->nummsg || linkf))
-		seq_setcur (mp, mp->hghsel);
-	seq_save (mp);  /* synchronize message sequences */
+	if (mp->hghsel != mp->curmsg &&
+				(mp->numsel != mp->nummsg || linkf))
+		seq_setcur(mp, mp->hghsel);
+	seq_save(mp);  /* synchronize message sequences */
 
-	context_replace (pfolder, folder);  /* update current folder   */
-	context_save ();  /* save the context file   */
-	folder_free (mp);  /* free folder structure   */
-	done (0);
+	context_replace(pfolder, folder);  /* update current folder   */
+	context_save();  /* save the context file   */
+	folder_free(mp);  /* free folder structure   */
+	done(0);
 	return 1;
 }
 
@@ -272,27 +273,27 @@ main (int argc, char **argv)
 */
 
 static void
-opnfolds (struct st_fold *folders, int nfolders)
+opnfolds(struct st_fold *folders, int nfolders)
 {
 	char nmaildir[BUFSIZ];
 	register struct st_fold *fp, *ep;
 	register struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-		chdir (m_maildir (""));
-		strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
+		chdir(m_maildir(""));
+		strncpy(nmaildir, m_maildir(fp->f_name), sizeof(nmaildir));
 
-	create_folder (nmaildir, 0, done);
+		create_folder(nmaildir, 0, done);
 
-		if (chdir (nmaildir) == NOTOK)
-			adios (nmaildir, "unable to change directory to");
-		if (!(mp = folder_read (fp->f_name)))
-			adios (NULL, "unable to read folder %s", fp->f_name);
+		if (chdir(nmaildir) == NOTOK)
+			adios(nmaildir, "unable to change directory to");
+		if (!(mp = folder_read(fp->f_name)))
+			adios(NULL, "unable to read folder %s", fp->f_name);
 		mp->curmsg = 0;
 
 		fp->f_mp = mp;
 
-		chdir (maildir);
+		chdir(maildir);
 	}
 }
 
@@ -303,15 +304,15 @@ opnfolds (struct st_fold *folders, int nfolders)
 */
 
 static void
-clsfolds (struct st_fold *folders, int nfolders)
+clsfolds(struct st_fold *folders, int nfolders)
 {
 	register struct st_fold *fp, *ep;
 	register struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
 		mp = fp->f_mp;
-		seq_setprev (mp);
-		seq_save (mp);
+		seq_setprev(mp);
+		seq_save(mp);
 	}
 }
 
@@ -323,7 +324,7 @@ clsfolds (struct st_fold *folders, int nfolders)
 */
 
 static void
-remove_files (int filep, char **files)
+remove_files(int filep, char **files)
 {
 	int i;
 	char **vec;
@@ -333,17 +334,17 @@ remove_files (int filep, char **files)
 		vec = files++;  /* vec[0] = filevec[0] */
 		files[filep] = NULL;  /* NULL terminate list */
 
-		fflush (stdout);
-		vec[0] = r1bindex (rmmproc, '/');
-		execvp (rmmproc, vec);
-		adios (rmmproc, "unable to exec");
+		fflush(stdout);
+		vec[0] = mhbasename(rmmproc);
+		execvp(rmmproc, vec);
+		adios(rmmproc, "unable to exec");
 	}
 
 	/* Else just unlink the files */
 	files++;  /* advance past filevec[0] */
 	for (i = 0; i < filep; i++) {
-		if (unlink (files[i]) == NOTOK)
-			admonish (files[i], "unable to unlink");
+		if (unlink(files[i]) == NOTOK)
+			admonish(files[i], "unable to unlink");
 	}
 }
 
@@ -354,14 +355,14 @@ remove_files (int filep, char **files)
 */
 
 static int
-m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve,
+m_file(char *msgfile, struct st_fold *folders, int nfolders, int preserve,
 		int refile)
 {
 	int msgnum;
 	struct st_fold *fp, *ep;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-		if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0,
+		if ((msgnum = folder_addmsg(&fp->f_mp, msgfile, 1, 0,
 				preserve, nfolders == 1 && refile, maildir))
 				== -1)
 			return 1;