(mh_expand_name): Correctly handle full and relative pathname specifications.

@@ -67,7 +67,7 @@ mh_read_formfile (char *name, char **pformat)
   char *ptr;
   char *ptr;
   size_t off = 0;
   size_t off = 0;
   char *format_str;
   char *format_str;
-  
+
   if (stat (name, &st))
   if (stat (name, &st))
     {
     {
       mh_error (_("can't stat format file %s: %s"), name, strerror (errno));
       mh_error (_("can't stat format file %s: %s"), name, strerror (errno));
@@ -342,15 +342,31 @@ mh_expand_name (const char *base, const char *name, int is_folder)
   tmp = mu_tilde_expansion (name, "/", NULL);
   tmp = mu_tilde_expansion (name, "/", NULL);
   if (tmp[0] == '+')
   if (tmp[0] == '+')
     name = tmp + 1;
     name = tmp + 1;
+  else if (strncmp (tmp, "../", 3) == 0 || strncmp (tmp, "./", 2) == 0)
+    {
+      char *cwd = mu_getcwd ();
+      asprintf (&name, "%s/%s", cwd, tmp);
+      free (cwd);
+      free (tmp);
+      tmp = NULL;
+    }
   else
   else
     name = tmp;
     name = tmp;
-
+  
   if (!base)
   if (!base)
     base = mu_path_folder_dir;
     base = mu_path_folder_dir;
   if (is_folder)
   if (is_folder)
-    asprintf (&p, "mh:%s/%s", base, name);
-  else
+    {
+      if (name[0] == '/')
+	asprintf (&p, "mh:%s", name);
+      else
+	asprintf (&p, "mh:%s/%s", base, name);
+    }
+  else if (name[0] != '/')
     asprintf (&p, "%s/%s", base, name);
     asprintf (&p, "%s/%s", base, name);
+  else
+    return name;
+  
   free (tmp);
   free (tmp);
   return p;
   return p;
 }
 }