X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a0ce292fc2a76560ad823b09c4f30788b4a17344..ab2c72d2f25e801aebf4cae0e0b8128b288ac5c5:/uip/repl.c

diff --git a/uip/repl.c b/uip/repl.c
index adfe58d7..79a4522c 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -7,8 +7,9 @@
 
 #include <h/mh.h>
 #include <h/mime.h>
+#include "h/done.h"
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define REPL_SWITCHES \
     X("group", 0, GROUPSW) \
@@ -239,7 +240,7 @@ main (int argc, char **argv)
 		    if (fcc)
 			fcc = add (", ", fcc);
 		    fcc = add (cp, fcc);
-                    mh_xfree(dp);
+                    free(dp);
 		    continue;
 
 		case FILESW: 
@@ -252,7 +253,7 @@ main (int argc, char **argv)
 		case FILTSW:
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-		    filter = getcpy (etcpath (cp));
+		    filter = mh_xstrdup(etcpath(cp));
 		    mime = 0;
 		    continue;
 		case FORMSW: 
@@ -261,7 +262,7 @@ main (int argc, char **argv)
 		    continue;
 
 		case FRMTSW: 
-		    filter = getcpy (etcpath (mhlreply));
+		    filter = mh_xstrdup(etcpath(mhlreply));
 		    mime = 0;
 		    continue;
 		case NFRMTSW: 
@@ -336,13 +337,11 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    if (msg)
 		adios (NULL, "only one message at a time!");
-	    else
-		msg = cp;
+            msg = cp;
 	}
     }