Bugfixes

* mh/rmf.c (current_folder_path): Treat name as folder while expanding.
* mail/unset.c (mail_unset): Fix the behavior when no arguments were
given.

@@ -26,7 +26,7 @@ mail_unset (int argc, char **argv)
 {
 {
   if (argc < 2)
   if (argc < 2)
     {
     {
-      mailvar_print (0);
+      mailvar_print (1);
       return 0;
       return 0;
     }
     }
   else
   else

@@ -92,7 +92,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
 }
 }
 
 
 static char *
 static char *
-current_folder_path ()
+current_folder_path (void)
 {
 {
   mu_mailbox_t mbox = mh_open_folder (mh_current_folder (), MU_STREAM_RDWR);
   mu_mailbox_t mbox = mh_open_folder (mh_current_folder (), MU_STREAM_RDWR);
   mu_url_t url;
   mu_url_t url;
@@ -197,7 +197,7 @@ main (int argc, char **argv)
       name = cur_folder_path;
       name = cur_folder_path;
     }
     }
   else
   else
-    name = mh_expand_name (NULL, folder_name, NAME_ANY);
+    name = mh_expand_name (NULL, folder_name, NAME_FOLDER);
   if (recursive)
   if (recursive)
     status = recrmf (name);
     status = recrmf (name);
   else
   else