X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f34427874df972004ce8a285145f6fc738f08595..39a9d9d85d0f2289d8c1257251311b7cf959c700:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 85e0c53b..edc1545c 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -118,7 +118,7 @@ main (int argc, char **argv)
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
-    all = EndsWithC(argv[0], 's');
+    all = has_suffix_c(argv[0], 's');
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -306,14 +306,14 @@ 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++)
 		printf (" %s", *ap);
 	    free (dp);
 	}
-	printf ("\n");
+	putchar('\n');
 
 	if (!printsw)
 	    done (0);
@@ -335,7 +335,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 +407,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 +546,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 +582,7 @@ print_folders (void)
 
 	    if (fi[i].others)
 		printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, "");
-	    printf (".\n");
+	    puts(".");
 	}
     }
 
@@ -591,7 +591,7 @@ print_folders (void)
      */
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
 	if (all)
-	    printf ("\n");
+	    putchar('\n');
 	printf ("TOTAL = %d message%c in %d folder%s.\n",
 		total_msgs, total_msgs != 1 ? 's' : ' ',
 		total_folders, total_folders != 1 ? "s" : "");
@@ -612,7 +612,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     */