(split_shortcut): Properly handle "~/" filenames.

(tilde_expand): Return MU_ERR_NO_SUCH_USER if an invalid username
was specified.

@@ -33,6 +33,7 @@
 #include <mailutils/mailbox.h>
 #include <mailutils/mailbox.h>
 #include <mailutils/mutil.h>
 #include <mailutils/mutil.h>
 #include <mailutils/error.h>
 #include <mailutils/error.h>
+#include <mailutils/errno.h>
 
 
 const char *mu_path_maildir = MU_PATH_MAILDIR; 
 const char *mu_path_maildir = MU_PATH_MAILDIR; 
 
 
@@ -59,12 +60,17 @@ split_shortcut (const char *file, const char pfx[], char **user, char **rest)
       else
       else
         len = strlen (file) + 1;
         len = strlen (file) + 1;
 
 
+      if (len == 1)
+	*user = NULL;
+      else
+	{
 	  *user = calloc (1, len);
 	  *user = calloc (1, len);
 	  if (!*user)
 	  if (!*user)
 	    return ENOMEM;
 	    return ENOMEM;
 
 
 	  memcpy (*user, file, len);
 	  memcpy (*user, file, len);
 	  (*user)[len-1] = 0;
 	  (*user)[len-1] = 0;
+	}
       file += len-1;
       file += len-1;
       if (file[0] == '/')
       if (file[0] == '/')
         file++;
         file++;
@@ -189,10 +195,9 @@ tilde_expand (const char *file, char **buf)
   if ((status = split_shortcut (file, "~", &user, &path)))
   if ((status = split_shortcut (file, "~", &user, &path)))
     return status;
     return status;
 
 
-  if (!user)
-    return ENOENT;
   if (!path)
   if (!path)
     {
     {
+      if (user)
 	free (user);
 	free (user);
       return ENOENT;
       return ENOENT;
     }
     }
@@ -202,7 +207,7 @@ tilde_expand (const char *file, char **buf)
     {
     {
       free (user);
       free (user);
       free (path);
       free (path);
-      return ENOENT;
+      return MU_ERR_NO_SUCH_USER;
     }
     }
 
 
   free (user); /* not needed anymore */
   free (user); /* not needed anymore */