Renamed -version switch to -Version to remove the conflict with -verbose.
[mmh] / uip / msgchk.c
index 0bec675..dfbdd69 100644 (file)
@@ -1,13 +1,12 @@
 /*
- * msgchk.c -- check for mail
- *
- * 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.
- */
+** msgchk.c -- check for mail
+**
+** 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 <h/mts.h>
 #include <h/tws.h>
 #include <pwd.h>
 
@@ -20,46 +19,42 @@ static struct swit switches[] = {
        { "notify type", 0 },
 #define NNOTESW  3
        { "nonotify type", 0 },
-#define VERSIONSW  7
-       { "version", 0 },
-#define HELPSW  8
+#define VERSIONSW  4
+       { "Version", 0 },
+#define HELPSW  5
        { "help", 0 },
+       { NULL, 0 },
 };
 
 /*
- * Maximum numbers of users we can check (plus
- * one for the NULL vector at the end).
- */
+** Maximum numbers of users we can check (plus
+** one for the NULL vector at the end).
+*/
 #define MAXVEC  51
 
-#define NT_NONE  0x0
 #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)
+#define MAILOLD  0x4
+#define MAILNEW  0x8
+#define MAILOK   (MAILOLD | MAILNEW)
 
 
 /*
- * static prototypes
- */
-static int donote (char *, int);
-static int checkmail (char *, char *, int, int, int);
+** static prototypes
+*/
+static int donote(char *, int);
+static int checkmail(char *, int, int, int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
        int datesw = 1, notifysw = NT_ALL;
        int status = 0;
        int vecp = 0;
-       uid_t uid;
        char buf[BUFSIZ];
        char *user, *cp;
        char **argp, **arguments, *vec[MAXVEC];
@@ -68,85 +63,74 @@ main (int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex (argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
 
-       mts_init (invo_name);
-       uid = getuid ();
        user = getusername();
 
-       arguments = getarguments (invo_name, argc, argv, 1);
+       arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
        while ((cp = *argp++)) {
                if (*cp == '-') {
-                       switch (smatch (++cp, switches)) {
-                               case AMBIGSW:
-                                       ambigsw (cp, switches);
-                                       done (1);
-                               case UNKWNSW:
-                                       adios (NULL, "-%s unknown", cp);
-
-                               case HELPSW:
-                                       snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
-                                               invo_name);
-                                       print_help (buf, switches, 1);
-                                       done (1);
-                               case VERSIONSW:
-                                       print_version(invo_name);
-                                       done (1);
-
-                               case DATESW:
-                                       datesw++;
-                                       continue;
-                               case NDATESW:
-                                       datesw = 0;
-                                       continue;
-
-                               case NOTESW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios (NULL, "missing argument to %s", argp[-2]);
-                                       notifysw |= donote (cp, 1);
-                                       continue;
-                               case NNOTESW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios (NULL, "missing argument to %s", argp[-2]);
-                                       notifysw &= ~donote (cp, 0);
-                                       continue;
+                       switch (smatch(++cp, switches)) {
+                       case AMBIGSW:
+                               ambigsw(cp, switches);
+                               done(1);
+                       case UNKWNSW:
+                               adios(NULL, "-%s unknown", cp);
+
+                       case HELPSW:
+                               snprintf(buf, sizeof(buf), "%s [switches] [users ...]", invo_name);
+                               print_help(buf, switches, 1);
+                               done(1);
+                       case VERSIONSW:
+                               print_version(invo_name);
+                               done(1);
+
+                       case DATESW:
+                               datesw++;
+                               continue;
+                       case NDATESW:
+                               datesw = 0;
+                               continue;
+
+                       case NOTESW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               notifysw |= donote(cp, 1);
+                               continue;
+                       case NNOTESW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               notifysw &= ~donote(cp, 0);
+                               continue;
                        }
                }
                if (vecp >= MAXVEC-1)
-                       adios (NULL, "you can only check %d users at a time", MAXVEC-1);
+                       adios(NULL, "you can only check %d users at a time",
+                                       MAXVEC-1);
                else
                        vec[vecp++] = cp;
        }
 
-       if (vecp != 0)
-               vec[vecp] = NULL;
-
-       if (vecp == 0) {
-               char *home;
-
-               /* Not sure this check makes sense... */
-               if (!geteuid() || NULL == (home = getenv("HOME"))) {
-                       pw = getpwnam (user);
-                       if (pw == NULL)
-                               adios (NULL, "unable to get information about user");
-                       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
-                               advise (NULL, "no such user as %s", vec[vecp]);
-               }
+       if (!vecp) {
+               done(checkmail(user, datesw, notifysw, 1));
+               return 1;
        }
 
-       done (status);
+       vec[vecp] = NULL;
+       for (vecp = 0; vec[vecp]; vecp++) {
+               if ((pw = getpwnam(vec[vecp])))
+                       status += checkmail(pw->pw_name, datesw, notifysw, 0);
+               else
+                       advise(NULL, "no such user as %s", vec[vecp]);
+       }
+       done(status);
        return 1;
 }
 
@@ -163,73 +147,95 @@ static struct swit ntswitches[] = {
 
 
 static int
-donote (char *cp, int ntflag)
+donote(char *cp, int ntflag)
 {
-       switch (smatch (cp, ntswitches)) {
-               case AMBIGSW:
-                       ambigsw (cp, ntswitches);
-                       done (1);
-               case UNKWNSW:
-                       adios (NULL, "-%snotify %s unknown", ntflag ? "" : "no", cp);
-
-               case NALLSW:
-                       return NT_ALL;
-               case NMAISW:
-                       return NT_MAIL;
-               case NNMAISW:
-                       return NT_NMAI;
+       switch (smatch(cp, ntswitches)) {
+       case AMBIGSW:
+               ambigsw(cp, ntswitches);
+               done(1);
+       case UNKWNSW:
+               adios(NULL, "-%snotify %s unknown", ntflag ? "" : "no", cp);
+
+       case NALLSW:
+               return NT_ALL;
+       case NMAISW:
+               return NT_MAIL;
+       case NNMAISW:
+               return NT_NMAI;
        }
 
-       return 0; /* Before 1999-07-15, garbage was returned if control got here. */
+       /* Before 1999-07-15, garbage was returned if control got here. */
+       return 0;
 }
 
 
 static int
-checkmail (char *user, char *home, int datesw, int notifysw, int personal)
+checkmail(char *user, int datesw, int notifysw, int personal)
 {
        int mf, status;
        char buffer[BUFSIZ];
        struct stat st;
-
-       snprintf (buffer, sizeof(buffer), "%s/%s", mmdfldir[0] ? mmdfldir : home, mmdflfil[0] ? mmdflfil : user);
+       char *maildrop;
+
+       if (personal) {
+               /*
+               ** Evaluate the env var and profile only if the check is
+               ** for the calling user.
+               */
+               if ((maildrop = getenv("MAILDROP")) && *maildrop) {
+                       snprintf(buffer, sizeof buffer, "%s",
+                                       toabsdir(maildrop));
+               } else if ((maildrop=context_find("maildrop")) && *maildrop) {
+                       snprintf(buffer, sizeof buffer, "%s",
+                                       toabsdir(maildrop));
+               } else {
+                       snprintf(buffer, sizeof buffer, "%s/%s",
+                                       mailspool, user);
+               }
+       } else {
+               snprintf(buffer, sizeof(buffer), "%s/%s", mailspool, user);
+       }
        if (datesw) {
                st.st_size = 0;
                st.st_atime = st.st_mtime = 0;
        }
-       mf = (stat (buffer, &st) == NOTOK || st.st_size == 0) ? NONEOK
-               : st.st_atime <= st.st_mtime ? MMDFNEW : MMDFOLD;
+       mf = (stat(buffer, &st) == NOTOK || st.st_size == 0) ? NONEOK
+               : st.st_atime <= st.st_mtime ? MAILNEW : MAILOLD;
 
-       if ((mf & UUCPOK) || (mf & MMDFOK)) {
+       if (mf & MAILOK) {
                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");
+                       if (personal) {
+                               printf("You have ");
+                       } else {
+                               printf("%s has ", user);
+                       }
+                       if (mf & MAILOK)
+                               printf(mf & MAILOLD ? "old" : "new");
+                       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
+       } else {
+               if (notifysw & NT_NMAI) {
+                       if (personal) {
+                               printf("You don't have any mail waiting");
+                       } else {
+                               printf("%s doesn't have any mail waiting",
+                                               user);
+                       }
+               } else {
                        notifysw = 0;
-
+               }
                status = 1;
        }
 
-       if (notifysw)
-               if (datesw && st.st_atime)
-                       printf ("; last read on %s", dtime (&st.st_atime, 1));
-       if (notifysw)
-               printf ("\n");
+       if (notifysw) {
+               if (datesw && st.st_atime) {
+                       printf("; last read on %s", dtime(&st.st_atime));
+               }
+               printf("\n");
+       }
 
        return status;
 }