read_switch.c: Move interface declaration to own file.

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index a553300f51ca9a49143010a0b69da2d1d7173d32..4998353d5617a74e3eac4b33be518900573160ec 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -5,14 +5,19 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/mts.h>
-#include <h/tws.h>
+#include "h/mh.h"
+#include "sbr/smatch.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/mts.h"
+#include "h/tws.h"

 #include "h/done.h"
 #include "h/done.h"

-#include <h/utils.h>
+#include "h/utils.h"

 #include <pwd.h>
 
 #include <pwd.h>
 

-#include <h/popsbr.h>
+#include "h/popsbr.h"

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)


@@ -78,9 +83,14 @@ static int remotemail (char *, char *, char *, char *, int, int, int, int,
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int datesw = 1, notifysw = NT_ALL;
-    int status = 0, sasl = 0, tls = 0, noverify = 0;
-    int snoop = 0, vecp = 0;
+    bool datesw = true;
+    int notifysw = NT_ALL;
+    int status = 0;
+    bool sasl = false;
+    bool tls = false;
+    bool noverify = false;
+    bool snoop = false;
+    int vecp = 0;

     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;
     char **argp, **arguments, *vec[MAXVEC];
     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;
     char **argp, **arguments, *vec[MAXVEC];


@@ -112,10 +122,10 @@ main (int argc, char **argv)
                    done (0);
 
                case DATESW:
                    done (0);
 
                case DATESW:

-                   datesw++;
+                   datesw = true;

                    continue;
                case NDATESW:
                    continue;
                case NDATESW:

-                   datesw = 0;
+                   datesw = false;

                    continue;
 
                case NOTESW:
                    continue;
 
                case NOTESW:


@@ -148,15 +158,15 @@ main (int argc, char **argv)
                    continue;
 
                case SNOOPSW:
                    continue;
 
                case SNOOPSW:

-                   snoop++;
+                   snoop = true;

                    continue;
 
                case SASLSW:
                    continue;
 
                case SASLSW:

-                   sasl++;
+                   sasl = true;

                    continue;
                
                case NOSASLSW:
                    continue;
                
                case NOSASLSW:

-                   sasl = 0;
+                   sasl = false;

                    continue;
 
                case SASLMECHSW:
                    continue;
 
                case SASLMECHSW:


@@ -165,19 +175,19 @@ main (int argc, char **argv)
                    continue;
 
                case INITTLSSW:
                    continue;
 
                case INITTLSSW:

-                   tls++;
+                   tls = true;

                    continue;
 
                case NOTLSSW:
                    continue;
 
                case NOTLSSW:

-                   tls = 0;
+                   tls = false;

                    continue;
 
                case CERTVERSW:
                    continue;
 
                case CERTVERSW:

-                   noverify = 0;
+                   noverify = false;

                    continue;
 
                case NOCERTVERSW:
                    continue;
 
                case NOCERTVERSW:

-                   noverify++;
+                   noverify = true;

                    continue;
 
                case AUTHSERVICESW:
                    continue;
 
                case AUTHSERVICESW:


@@ -344,7 +354,8 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
            int personal, int snoop, int sasl, char *saslmech, int tls,
            const char *auth_svc)
 {
            int personal, int snoop, int sasl, char *saslmech, int tls,
            const char *auth_svc)
 {

-    int nmsgs, nbytes, status;
+    int nmsgs, nbytes;
+    bool status;

 
     if (auth_svc == NULL) {
        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
 
     if (auth_svc == NULL) {
        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {


@@ -378,14 +389,14 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
        else
            notifysw = 0;
 
        else
            notifysw = 0;
 

-       status = 0;
+       status = false;

     } else {
        if (notifysw & NT_NMAI)
            printf (personal ? "You don't %s%s" : "%s doesn't %s",
                    personal ? "" : user, "have any mail waiting");
        else
            notifysw = 0;
     } else {
        if (notifysw & NT_NMAI)
            printf (personal ? "You don't %s%s" : "%s doesn't %s",
                    personal ? "" : user, "have any mail waiting");
        else
            notifysw = 0;

-       status = 1;
+       status = true;

     }
     if (notifysw)
        printf (" on %s\n", host);
     }
     if (notifysw)
        printf (" on %s\n", host);