X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ad84a60e867db7e3f5e9357b4a16e619e1cacb43..c8caafcb4a39516eaec330f9ea229ea52e5fe46b:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 7e00a812..a3cc4ec6 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -1,6 +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
  *
@@ -118,7 +116,7 @@ main (int argc, char **argv)
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
-    all = HasSuffixC(argv[0], 's');
+    all = has_suffix_c(argv[0], 's');
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -306,7 +304,7 @@ main (int argc, char **argv)
 
     /* Listing the folder stack */
     if (listsw) {
-	printf ("%s", argfolder ? argfolder : getfolder (1));
+	fputs(argfolder ? argfolder : getfolder (1), stdout);
 	if ((cp = context_find (stack))) {
 	    dp = mh_xstrdup(cp);
 	    for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
@@ -335,7 +333,7 @@ main (int argc, char **argv)
 	 */
 	if (!argfolder) {
 	    if (msg)
-		admonish (NULL, "no folder given for message %s", 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));
 	    crawl_folders (".", get_folder_info_callback, NULL);
@@ -407,7 +405,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 	 * create message structure and get folder info
 	 */
 	if (!(mp = folder_read (fold, fpack))) {
-	    admonish (NULL, "unable to read folder %s", fold);
+	    inform("unable to read folder %s, continuing...", fold);
 	    *crawl_children = FALSE;
 	    return 0;
 	}
@@ -546,7 +544,7 @@ print_folders (void)
     if (all || fshort || ftotal < 1) {
 	for (i = 0; i < total_folders; i++) {
 	    if (fshort) {
-		printf ("%s\n", fi[i].name);
+		puts(fi[i].name);
 		continue;
 	    }
 
@@ -582,7 +580,7 @@ print_folders (void)
 
 	    if (fi[i].others)
 		printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, "");
-	    printf (".\n");
+	    puts(".");
 	}
     }
 
@@ -612,7 +610,7 @@ sfold (struct msgs *mp, char *msg)
 	return 0;
 
     if (mp->numsel > 1) {
-	admonish (NULL, "only one message at a time!");
+	inform("only one message at a time!, continuing...");
 	return 0;
     }
     seq_setprev (mp);		/* set the previous-sequence     */