Invert ternary condition to remove one negative.

[nmh] / uip / dist.c

diff --git a/uip/dist.c b/uip/dist.c
index 09c501a8b7e6a0b3920ada06fd6e5f6a9d349c3f..b0728bddcebc2831849b0d9772286617cdc12d60 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -1,6 +1,4 @@
-
-/*
- * dist.c -- re-distribute a message
+/* dist.c -- re-distribute a message

  *
  * 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


@@ -9,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

+#include "sbr/m_maildir.h"

 #include <fcntl.h>
 
 #define DIST_SWITCHES \
 #include <fcntl.h>
 
 #define DIST_SWITCHES \


@@ -208,17 +207,15 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

        } else {
            if (msg)
                adios (NULL, "only one message at a time!");
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");

-           else
-               msg = cp;
+            msg = cp;

        }
     }
 
        }
     }
 

-    cwd = getcpy (pwd ());
+    cwd = mh_xstrdup(pwd ());

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));


@@ -251,7 +248,7 @@ try_it_again:
                        i = YESW;
                    break;
                default: 
                        i = YESW;
                    break;
                default: 

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

                    break;
            }
        }
                    break;
            }
        }


@@ -292,7 +289,7 @@ try_it_again:
            adios (NULL, "only one message at a time!");
     }
 
            adios (NULL, "only one message at a time!");
     }
 

-    msgnam = file ? file : getcpy (m_name (mp->lowsel));
+    msgnam = file ? file : mh_xstrdup(m_name (mp->lowsel));

 
     dat[0] = mp ? mp->lowsel : 0;
     dat[1] = 0;
 
     dat[0] = mp ? mp->lowsel : 0;
     dat[1] = 0;