X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0a032eea07f6d77ac6ea4d5a39c9491c34358058..665dfc96f45c47ecfae79f1baa2c29dabe5a2ded:/uip/folder.c?ds=sidebyside

diff --git a/uip/folder.c b/uip/folder.c
index 15c6941f..23aea0b7 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -1,5 +1,4 @@
-/*
- * folder(s).c -- set/list the current message and/or folder
+/* folder.c -- set/list the current message and/or folder
  *             -- push/pop a folder onto/from the folder stack
  *             -- list the folder stack
  *
@@ -336,7 +335,8 @@ main (int argc, char **argv)
 	    if (msg)
 		inform("no folder given for message %s, continuing...", msg);
 	    readonly_folders (); /* do any readonly folders */
-	    strncpy (folder, (cp = context_find (pfolder)) ? cp : "", sizeof(folder));
+	    cp = context_find(pfolder);
+	    strncpy (folder, FENDNULL(cp), sizeof(folder));
 	    crawl_folders (".", get_folder_info_callback, NULL);
 	} else {
 	    strncpy (folder, argfolder, sizeof(folder));
@@ -600,7 +600,7 @@ print_folders (void)
 }
 
 /*
- * Set the current message and sychronize sequences
+ * Set the current message and synchronize sequences
  */
 
 static int