vector.c: Move interface to own file.

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 52aedc86ba5b41f0a7ebdcb8ecdd8154577384c5..12b5ee2de4cd33b667bf78713024775b3fb28363 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -1,46 +1,21 @@
-
-/*
- * msgchk.c -- check for mail
+/* msgchk.c -- check for mail

  *
  *

- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.

  */
 
  */
 

-#include <h/mh.h>
-#include <zotnet/mts/mts.h>
-#include <h/tws.h>
+#include "h/mh.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/utils.h"

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

-#ifdef POP
-# include <h/popsbr.h>
-#endif
-
-#ifdef HESIOD
-# include <hesiod.h>
-#endif
-
-#ifndef        POP
-# define POPminc(a) (a)
-#else
-# define POPminc(a)  0
-#endif
-
-#ifndef        RPOP
-# define RPOPminc(a) (a)
-#else
-# define RPOPminc(a)  0
-#endif
-
-#ifndef        APOP
-# define APOPminc(a) (a)
-#else
-# define APOPminc(a)  0
-#endif
-
-#ifndef        KPOP
-# define KPOPminc(a) (a)
-#else
-# define KPOPminc(a)  0
-#endif
+#include "h/popsbr.h"

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


@@ -48,41 +23,40 @@
 # define SASLminc(a)  0
 #endif
 
 # define SASLminc(a)  0
 #endif
 

-static struct swit switches[] = {
-#define        DATESW                   0
-    { "date", 0 },
-#define        NDATESW                  1
-    { "nodate", 0 },
-#define        NOTESW                   2
-    { "notify type", 0 },
-#define        NNOTESW                  3
-    { "nonotify type", 0 },
-#define        HOSTSW                   4
-    { "host hostname", POPminc (-4) },
-#define        USERSW                   5
-    { "user username", POPminc (-4) },
-#define        APOPSW                   6
-    { "apop", APOPminc (-4) },
-#define        NAPOPSW                  7
-    { "noapop", APOPminc (-6) },
-#define        RPOPSW                   8
-    { "rpop", RPOPminc (-4) },
-#define        NRPOPSW                  9
-    { "norpop", RPOPminc (-6) },
-#define VERSIONSW               10
-    { "version", 0 },
-#define        HELPSW                  11
-    { "help", 0 },
-#define SNOOPSW                 12
-    { "snoop", -5 },
-#define KPOPSW                  13
-    { "kpop", KPOPminc (-4) },
-#define SASLSW                  14
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW             15
-    { "saslmech", SASLminc(-5) },
-    { NULL, 0 }
-};
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else
+# define TLSminc(a)  0
+#endif
+
+#define MSGCHK_SWITCHES \
+    X("date", 0, DATESW) \
+    X("nodate", 0, NDATESW) \
+    X("notify type", 0, NOTESW) \
+    X("nonotify type", 0, NNOTESW) \
+    X("host hostname", 0, HOSTSW) \
+    X("user username", 0, USERSW) \
+    X("port name/number", 0, PORTSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
+    X("notls", TLSminc(-5), NOTLSSW) \
+    X("certverify", TLSminc(-10), CERTVERSW) \
+    X("nocertverify", TLSminc(-12), NOCERTVERSW) \
+    X("proxy command", 0, PROXYSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MSGCHK);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MSGCHK, switches);
+#undef X

 
 /*
  * Maximum numbers of users we can check (plus
 
 /*
  * Maximum numbers of users we can check (plus


@@ -90,70 +64,43 @@ static struct swit switches[] = {
  */
 #define MAXVEC  51
 
  */
 #define MAXVEC  51
 

-#define        NT_NONE 0x0

 #define        NT_MAIL 0x1
 #define        NT_NMAI 0x2
 #define        NT_ALL  (NT_MAIL | NT_NMAI)
 
 #define        NT_MAIL 0x1
 #define        NT_NMAI 0x2
 #define        NT_ALL  (NT_MAIL | NT_NMAI)
 

-#define        NONEOK  0x0
-#define        UUCPOLD 0x1
-#define        UUCPNEW 0x2
-#define        UUCPOK  (UUCPOLD | UUCPNEW)
-#define        MMDFOLD 0x4
-#define        MMDFNEW 0x8
-#define        MMDFOK  (MMDFOLD | MMDFNEW)
-

 
 /*
  * static prototypes
  */
 
 /*
  * static prototypes
  */

-static int donote (char *, int);
+static int donote (char *, int) PURE;

 static int checkmail (char *, char *, int, int, int);
 static int checkmail (char *, char *, int, int, int);

-
-#ifdef POP
-static int remotemail (char *, char *, int, int, int, int, int, int, char *);
-#endif
+static int remotemail (char *, char *, char *, char *, int, int, int, int,
+                      char *, int, const char *);

 
 
 int
 main (int argc, char **argv)
 {
 
 
 int
 main (int argc, char **argv)
 {

-    int datesw = 1, notifysw = NT_ALL;
-    int rpop, status = 0;
-    int kpop = 0, sasl = 0;
-    int snoop = 0, vecp = 0;
-    uid_t uid;
-    char *cp, *host = NULL, *user, buf[BUFSIZ], *saslmech = NULL; 
+    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];
     struct passwd *pw;
 
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 

-#ifdef HESIOD
-    struct hes_postoffice *po;
-    char *tmphost;
-#endif
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
-    uid = getuid ();
-    user = getusername();
+    mts_init ();

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-#ifdef POP
-    if ((cp = getenv ("MHPOPDEBUG")) && *cp)
-       snoop++;
-#endif
-
-    rpop = 0;
-

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -161,105 +108,110 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
                        invo_name);
                    print_help (buf, switches, 1);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case DATESW:
 
                case DATESW:

-                   datesw++;
+                   datesw = true;

                    continue;
                case NDATESW:
                    continue;
                case NDATESW:

-                   datesw = 0;
+                   datesw = false;

                    continue;
 
                case NOTESW:
                    if (!(cp = *argp++) || *cp == '-')
                    continue;
 
                case NOTESW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    notifysw |= donote (cp, 1);
                    continue;
                case NNOTESW:
                    if (!(cp = *argp++) || *cp == '-')
                    notifysw |= donote (cp, 1);
                    continue;
                case NNOTESW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    notifysw &= ~donote (cp, 0);
                    continue;
 
                case HOSTSW: 
                    if (!(host = *argp++) || *host == '-')
                    notifysw &= ~donote (cp, 0);
                    continue;
 
                case HOSTSW: 
                    if (!(host = *argp++) || *host == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
                    continue;

+
+               case PORTSW:
+                   if (!(port = *argp++) || *port == '-')
+                       die("missing argument to %s", argp[-2]);
+               continue;
+

                case USERSW: 
                    if (!(cp = *argp++) || *cp == '-')
                case USERSW: 
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    if (vecp >= MAXVEC-1)
                    if (vecp >= MAXVEC-1)

-                       adios (NULL, "you can only check %d users at a time", MAXVEC-1);
-                   else
-                       vec[vecp++] = cp;
+                       die("you can only check %d users at a time", MAXVEC-1);
+                    user = vec[vecp++] = cp;

                    continue;
 
                    continue;
 

-               case APOPSW: 
-                   rpop = -1;
+               case SNOOPSW:
+                   snoop = true;

                    continue;
                    continue;

-               case NAPOPSW:
-                   rpop = 0;
+
+               case SASLSW:
+                   sasl = true;
+                   continue;
+               
+               case NOSASLSW:
+                   sasl = false;

                    continue;
 
                    continue;
 

-               case RPOPSW: 
-                   rpop = 1;
+               case SASLMECHSW:
+                   if (!(saslmech = *argp++) || *saslmech == '-')
+                       die("missing argument to %s", argp[-2]);

                    continue;
                    continue;

-               case NRPOPSW: 
-                   rpop = 0;
+
+               case INITTLSSW:
+                   tls = true;

                    continue;
 
                    continue;
 

-               case KPOPSW:
-                   kpop = 1;
+               case NOTLSSW:
+                   tls = false;

                    continue;
 
                    continue;
 

-               case SNOOPSW:
-                   snoop++;
+               case CERTVERSW:
+                   noverify = false;

                    continue;
 
                    continue;
 

-               case SASLSW:
-                   sasl++;
+               case NOCERTVERSW:
+                   noverify = true;

                    continue;
                    continue;

-               
-               case SASLMECHSW:
-                   if (!(saslmech = *argp++) || *saslmech == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+
+               case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+                   if (!(auth_svc = *argp++) || *auth_svc == '-')
+                       die("missing argument to %s", argp[-2]);
+#else
+                   die("not built with OAuth support");
+#endif
+                   continue;
+
+               case PROXYSW:
+                   if (!(proxy = *argp++) || *proxy == '-')
+                       die("missing argument to %s", argp[-2]);

                    continue;
            }
        }
        if (vecp >= MAXVEC-1)
                    continue;
            }
        }
        if (vecp >= MAXVEC-1)

-           adios (NULL, "you can only check %d users at a time", MAXVEC-1);
-       else
-           vec[vecp++] = cp;
+           die("you can only check %d users at a time", MAXVEC-1);
+        vec[vecp++] = cp;

     }
 
     }
 

-#ifdef POP

     /*
      * If -host is not specified by user
      */
     if (!host || !*host) {
     /*
      * If -host is not specified by user
      */
     if (!host || !*host) {

-# ifdef HESIOD
-       /*
-        * Scheme is:
-        *        use MAILHOST environment variable if present,
-        *  else try Hesiod.
-        *  If that fails, use the default (if any)
-        *  provided by mts.conf in mts_init()
-        */
-       if ((tmphost = getenv("MAILHOST")) != NULL)
-           pophost = tmphost;
-       else if ((po = hes_getmailhost(vecp ? vec[0] : user)) != NULL &&
-               strcmp(po->po_type, "POP") == 0)
-           pophost = po->po_host;
-# endif /* HESIOD */

        /*
         * If "pophost" is specified in mts.conf,
         * use it as default value.
        /*
         * If "pophost" is specified in mts.conf,
         * use it as default value.


@@ -269,66 +221,67 @@ main (int argc, char **argv)
     }
     if (!host || !*host)
        host = NULL;
     }
     if (!host || !*host)
        host = NULL;

-    if (!host || rpop <= 0)
-       setuid (uid);
-#endif /* POP */

 
     if (vecp != 0)
        vec[vecp] = NULL;
 
 
     if (vecp != 0)
        vec[vecp] = NULL;
 

-#ifdef POP

     if (host) {
     if (host) {

-       if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
-           kpop = 1;
-       }
+       int tlsflag = 0;
+
+       if (tls)
+           tlsflag |= P_INITTLS;
+
+       if (noverify)
+           tlsflag |= P_NOVERIFY;
+

        if (vecp == 0) {
        if (vecp == 0) {

-           status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop,
-                                sasl, saslmech);
+           status = remotemail (host, port, user, proxy, notifysw, 1,
+                                snoop, sasl, saslmech, tlsflag, auth_svc);

        } else {
            for (vecp = 0; vec[vecp]; vecp++)
        } else {
            for (vecp = 0; vec[vecp]; vecp++)

-               status += remotemail (host, vec[vecp], rpop, kpop, notifysw, 0,
-                                     snoop, sasl, saslmech);
+               status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,
+                                     snoop, sasl, saslmech, tlsflag, auth_svc);

        }
     } else {
        }
     } else {

-#endif /* POP */
-
-    if (vecp == 0) {
-       char *home;
+       if (user == NULL) user = getusername ();
+       if (vecp == 0) {
+           char *home;

 
 

-       home = (uid = geteuid()) ? home = getenv ("HOME") : NULL;
-       if (home == NULL) {
-           pw = getpwnam (user);
-           if (pw == NULL)
-               adios (NULL, "unable to get information about user");
-           if (home == NULL)
+           /* Not sure this check makes sense... */
+           if (!geteuid() || NULL == (home = getenv("HOME"))) {
+               pw = getpwnam (user);
+               if (pw == NULL)
+                   die("unable to get information about user");

                home = pw->pw_dir;
                home = pw->pw_dir;

+           }
+           status = checkmail (user, home, datesw, notifysw, 1);
+       } else {
+           for (vecp = 0; vec[vecp]; vecp++) {
+               if ((pw = getpwnam (vec[vecp])))
+                   status += checkmail (pw->pw_name, pw->pw_dir, datesw, notifysw, 0);
+               else
+                   inform("no such user as %s", vec[vecp]);
+           }

        }
        }

-       status = checkmail (user, home, datesw, notifysw, 1);
-    } else {
-       for (vecp = 0; vec[vecp]; vecp++) {
-           if ((pw = getpwnam (vec[vecp])))
-               status += checkmail (pw->pw_name, pw->pw_dir, datesw, notifysw, 0);
-           else
-               advise (NULL, "no such user as %s", vec[vecp]);
-       }
-    }
-#ifdef POP

     }          /* host == NULL */
     }          /* host == NULL */

-#endif

 
 

-    return done (status);
+    done (status);
+    return 1;

 }
 
 
 }
 
 

-static struct swit ntswitches[] = {
-#define        NALLSW     0
-    { "all", 0 },
-#define        NMAISW     1
-    { "mail", 0 },
-#define        NNMAISW    2
-    { "nomail", 0 },
-    { NULL, 0 }
-};
+#define NOTE_SWITCHES \
+    X("all", 0, NALLSW) \
+    X("mail", 0, NMAISW) \
+    X("nomail", 0, NNMAISW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(NOTE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(NOTE, ntswitches);
+#undef X

 
 
 static int
 
 
 static int


@@ -339,7 +292,7 @@ donote (char *cp, int ntflag)
            ambigsw (cp, ntswitches);
            done (1);
        case UNKWNSW: 
            ambigsw (cp, ntswitches);
            done (1);
        case UNKWNSW: 

-           adios (NULL, "-%snotify %s unknown", ntflag ? "" : "no", cp);
+           die("-%snotify %s unknown", ntflag ? "" : "no", cp);

 
        case NALLSW: 
            return NT_ALL;
 
        case NALLSW: 
            return NT_ALL;


@@ -356,100 +309,95 @@ donote (char *cp, int ntflag)
 static int
 checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 {
 static int
 checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 {

-    int mf, status;

     char buffer[BUFSIZ];
     char buffer[BUFSIZ];

+    snprintf(buffer, sizeof buffer, "%s/%s", *mmdfldir ? mmdfldir : home,
+        *mmdflfil ? mmdflfil : user);
+

     struct stat st;
     struct stat st;

+    bool statok = stat(buffer, &st) != -1;
+    bool empty = !statok || st.st_size == 0;

 
 

-    snprintf (buffer, sizeof(buffer), "%s/%s", mmdfldir[0] ? mmdfldir : home, mmdflfil[0] ? mmdflfil : user);
-    if (datesw) {
-       st.st_size = 0;
-       st.st_atime = st.st_mtime = 0;
+    if ((empty && !(notifysw & NT_NMAI)) ||
+        (!empty && !(notifysw & NT_MAIL))) {
+        return empty;

     }
     }

-    mf = (stat (buffer, &st) == NOTOK || st.st_size == 0) ? NONEOK
-       : st.st_atime <= st.st_mtime ? MMDFNEW : MMDFOLD;

 
 

-    if ((mf & UUCPOK) || (mf & MMDFOK)) {
-       if (notifysw & NT_MAIL) {
-           printf (personal ? "You have " : "%s has ", user);
-           if (mf & UUCPOK)
-               printf ("%s old-style bell", mf & UUCPOLD ? "old" : "new");
-           if ((mf & UUCPOK) && (mf & MMDFOK))
-               printf (" and ");
-           if (mf & MMDFOK)
-               printf ("%s%s", mf & MMDFOLD ? "old" : "new",
-                       mf & UUCPOK ? " Internet" : "");
-           printf (" mail waiting");
-       } else {
-           notifysw = 0;
-       }
-       status = 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;
+    if (empty) {
+        if (personal) {
+            fputs("You don't have any mail waiting", stdout);
+        } else {
+            printf("%s doesn't have any mail waiting", user);
+        }
+    } else {
+        char *kind = st.st_mtime < st.st_atime ? "old" : "new";
+        if (personal) {
+            printf("You have %s mail waiting", kind);
+        } else {
+            printf("%s has %s mail waiting", user, kind);
+        }

     }
 
     }
 

-    if (notifysw)
-       if (datesw && st.st_atime)
-           printf ("; last read on %s", dtime (&st.st_atime, 1));
-    if (notifysw)
-       printf ("\n");
+    if (datesw && statok && st.st_atime)
+        printf("; last read on %s", dtime(&st.st_atime, 1));
+    putchar('\n');

 
 

-    return status;
+    return empty;

 }
 
 
 }
 
 

-#ifdef POP

 extern char response[];
 
 static int
 extern char response[];
 
 static int

-remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop, int sasl, char *saslmech)
+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 nmsgs, nbytes, status;
-    char *pass = NULL;
+    int nmsgs, nbytes;
+    bool status;

 
 

-    if (user == NULL)
-       user = getusername ();
-    if (kpop || sasl || (rpop > 0))
-       pass = getusername ();
-    else
-       ruserpass (host, &user, &pass);
+    if (auth_svc == NULL) {
+       if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
+           die("must specify -authservice with -saslmech xoauth2");
+       }
+    } else {
+       if (user == NULL) {
+           die("must specify -user with -saslmech xoauth2");
+       }
+    }

 
     /* open the POP connection */
 
     /* open the POP connection */

-    if (pop_init (host, user, pass, snoop, kpop ? 1 : rpop, kpop,
-                 sasl, saslmech) == NOTOK
-           || pop_stat (&nmsgs, &nbytes) == NOTOK      /* check for messages  */
-           || pop_quit () == NOTOK) {                  /* quit POP connection */
-       advise (NULL, "%s", response);
+    if (pop_init (host, port, user, proxy, snoop, sasl, saslmech, tls,
+                 auth_svc) == NOTOK
+           || pop_stat (&nmsgs, &nbytes) == NOTOK     /* check for messages  */
+           || pop_quit () == NOTOK) {                 /* quit POP connection */
+       inform("%s", response);

        return 1;
     }
 
     if (nmsgs) {
        if (notifysw & NT_MAIL) {
        return 1;
     }
 
     if (nmsgs) {
        if (notifysw & NT_MAIL) {

-           printf (personal ? "You have " : "%s has ", user);
+           if (personal)
+               fputs("You have ", stdout);
+           else
+               printf ("%s has ", user);
+

            printf ("%d message%s (%d bytes)",
            printf ("%d message%s (%d bytes)",

-                   nmsgs, nmsgs != 1 ? "s" : "", nbytes);
+                   nmsgs, PLURALS(nmsgs), nbytes);

        }
        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);
 
     return status;
 }
     }
     if (notifysw)
        printf (" on %s\n", host);
 
     return status;
 }

-#endif /* POP */