sbr/mts.c: Delete mmdlm2; use same-valued mmdlm1 instead.

[nmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index c03c7b406269611a834aeccca705a2497cb090f0..77b2d0d9fd57099a57c220d1eefff2553fbdcdce 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -1,6 +1,4 @@
-
-/*
- * forw.c -- forward a message, or group of messages.
+/* forw.c -- forward a message, or group of messages.

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -11,6 +9,7 @@
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>

+#include "../sbr/m_maildir.h"

 
 
 #define        IFORMAT "digest-issue-%s"
 
 
 #define        IFORMAT "digest-issue-%s"


@@ -41,7 +40,7 @@
     X("nodashstuffing", 0, NBITSTUFFSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("nodashstuffing", 0, NBITSTUFFSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \

-    X("file file", 4, FILESW)                 /* interface from msh */ \
+    X("file file", 4, FILESW) \

     X("build", 5, BILDSW)                     /* interface from mhe */ \
     X("from address", 0, FROMSW) \
     X("to address", 0, TOSW) \
     X("build", 5, BILDSW)                     /* interface from mhe */ \
     X("from address", 0, FROMSW) \
     X("to address", 0, TOSW) \


@@ -248,10 +247,10 @@ main (int argc, char **argv)
                    continue;
 
                case BITSTUFFSW: 
                    continue;
 
                case BITSTUFFSW: 

-                   dashstuff = 1;      /* trinary logic */
+                   dashstuff = 1;      /* ternary logic */

                    continue;
                case NBITSTUFFSW: 
                    continue;
                case NBITSTUFFSW: 

-                   dashstuff = -1;     /* trinary logic */
+                   dashstuff = -1;     /* ternary logic */

                    continue;
 
                case FROMSW:
                    continue;
 
                case FROMSW:


@@ -333,7 +332,7 @@ try_it_again:
                        i = YESW;
                    break;
                default: 
                        i = YESW;
                    break;
                default: 

-                   advise (NULL, "say what?");
+                   inform("say what?");

                    break;
            }
        }
                    break;
            }
        }


@@ -590,7 +589,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 
                if (msgnum == mp->lowsel) {
                    snprintf (bp, buflen, " Forwarded Message%s",
 
                if (msgnum == mp->lowsel) {
                    snprintf (bp, buflen, " Forwarded Message%s",

-                       mp->numsel > 1 ? "s" : "");
+                       PLURALS(mp->numsel));

                } else {
                    snprintf (bp, buflen, " Message %d", msgcnt);
                }
                } else {
                    snprintf (bp, buflen, " Message %d", msgcnt);
                }


@@ -627,7 +626,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
        strncpy (buffer, delim4, sizeof(buffer));
     } else {
        snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n",
        strncpy (buffer, delim4, sizeof(buffer));
     } else {
        snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n",

-               mp->numsel > 1 ? "s" : "");
+               PLURALS(mp->numsel));

     }
     if (write (out, buffer, strlen (buffer)) < 0) {
        advise (drft, "write");
     }
     if (write (out, buffer, strlen (buffer)) < 0) {
        advise (drft, "write");


@@ -659,7 +658,7 @@ copy_mime_draft (int out)
     char buffer[BUFSIZ];
 
     snprintf (buffer, sizeof(buffer), "#forw [forwarded message%s] +%s",
     char buffer[BUFSIZ];
 
     snprintf (buffer, sizeof(buffer), "#forw [forwarded message%s] +%s",

-       mp->numsel == 1 ? "" : "s", mp->foldpath);
+       PLURALS(mp->numsel), mp->foldpath);

     if (write (out, buffer, strlen (buffer)) < 0) {
        advise (drft, "write");
     }
     if (write (out, buffer, strlen (buffer)) < 0) {
        advise (drft, "write");
     }