[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] nmh ChangeLog uip/Makefile.in uip/popi.c
|
From: |
Eric Gillespie |
|
Subject: |
[Nmh-commits] nmh ChangeLog uip/Makefile.in uip/popi.c |
|
Date: |
Thu, 14 Aug 2008 01:11:12 +0000 |
CVSROOT: /sources/nmh
Module name: nmh
Changes by: Eric Gillespie <epg> 08/08/14 01:11:12
Modified files:
. : ChangeLog
uip : Makefile.in
Removed files:
uip : popi.c
Log message:
* uip/Makefile.in, uip/popi.c: Remove popi.c, which has been
dead
since PatchSet 257 (2000/06/12 11:07:34 UTC).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.291&r2=1.292
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/Makefile.in?cvsroot=nmh&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/popi.c?cvsroot=nmh&r1=1.11&r2=0
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -b -r1.291 -r1.292
--- ChangeLog 14 Aug 2008 00:56:38 -0000 1.291
+++ ChangeLog 14 Aug 2008 01:11:12 -0000 1.292
@@ -1,5 +1,10 @@
2008-08-13 Eric Gillespie <address@hidden>
+ * uip/Makefile.in, uip/popi.c: Remove popi.c, which has been dead
+ since PatchSet 257 (2000/06/12 11:07:34 UTC).
+
+2008-08-13 Eric Gillespie <address@hidden>
+
* h/mhparse.h: Move interfaces also used by mhbuildsbr.c here
from mhparse.c.
Index: uip/Makefile.in
===================================================================
RCS file: /sources/nmh/nmh/uip/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- uip/Makefile.in 14 Aug 2008 00:56:38 -0000 1.23
+++ uip/Makefile.in 14 Aug 2008 01:11:12 -0000 1.24
@@ -1,7 +1,7 @@
#
# Makefile for uip subdirectory
#
-# $Id: Makefile.in,v 1.23 2008/08/14 00:56:38 epg Exp $
+# $Id: Makefile.in,v 1.24 2008/08/14 01:11:12 epg Exp $
#
SHELL = /bin/sh
@@ -83,7 +83,7 @@
mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \
mhlsbr.c mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c \
mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c \
- msgchk.c msh.c mshcmds.c packf.c pick.c picksbr.c popi.c popsbr.c \
+ msgchk.c msh.c mshcmds.c packf.c pick.c picksbr.c popsbr.c \
post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c \
refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c \
sendsbr.c show.c slocal.c sortm.c spost.c termsbr.c viamail.c \
Index: uip/popi.c
===================================================================
RCS file: uip/popi.c
diff -N uip/popi.c
--- uip/popi.c 27 Apr 2006 12:00:28 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,636 +0,0 @@
-
-/*
- * popi.c -- POP initiator for MPOP
- *
- * $Id: popi.c,v 1.11 2006/04/27 12:00:28 jjr Exp $
- *
- * 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/fmt_scan.h>
-#include <h/scansbr.h>
-#include <h/mts.h>
-#include <h/utils.h>
-#include <errno.h>
-
-#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 BPOP
-# define BPOPminc(a) (a)
-#else
-# define BPOPminc(a) 0
-#endif
-
-#ifndef SMTPMTS
-# define BULKminc(a) (a)
-#else
-# define BULKminc(a) 0
-#endif
-
-static struct swit switches[] = {
-#define APOPSW 0
- { "apop", APOPminc (-4) },
-#define NAPOPSW 1
- { "noapop", APOPminc (-6) },
-#define AUTOSW 2
- { "auto", BPOPminc(-4) },
-#define NAUTOSW 3
- { "noauto", BPOPminc(-6) },
-#define BULKSW 4
- { "bulk directory", BULKminc(-4) },
-#define FORMSW 5
- { "form formatfile", 0 },
-#define FMTSW 6
- { "format string", 5 },
-#define HOSTSW 7
- { "host host", 0 },
-#define PROGSW 8
- { "mshproc program", 0 },
-#define RPOPSW 9
- { "rpop", RPOPminc (-4) },
-#define NRPOPSW 10
- { "norpop", RPOPminc (-6) },
-#define USERSW 11
- { "user user", 0 },
-#define WIDTHSW 12
- { "width columns", 0 },
-#define VERSIONSW 13
- { "version", 0 },
-#define HELPSW 14
- { "help", 0 },
- { NULL, 0 }
-};
-
-static char *bulksw = NULL;
-static int snoop = 0;
-static int width = 0;
-static char mailname[BUFSIZ];
-static char *nfs = NULL;
-static struct msgs *mp;
-
-extern char response[];
-
-/*
- * prototypes
- */
-int sc_width (void); /* from termsbr.c */
-
-
-int
-main (int argc, char **argv)
-{
- int autosw = 1, noisy = 1, rpop;
- char *cp, *maildir, *folder = NULL, *form = NULL;
- char *format = NULL, *host = NULL, *user = NULL;
- char *pass = NULL, buf[BUFSIZ], **argp;
- char **arguments;
- struct stat st;
-
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
-
- mts_init (invo_name);
- arguments = getarguments (invo_name, argc, argv, 1);
- argp = arguments;
-
- if (pophost && *pophost)
- host = pophost;
- if ((cp = getenv ("MHPOPDEBUG")) && *cp)
- snoop++;
-
- rpop = getuid() && !geteuid();
-
- 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 [+folder] [switches]",
- invo_name);
- print_help (buf, switches, 1);
- done (1);
- case VERSIONSW:
- print_version(invo_name);
- done (1);
-
- case AUTOSW:
- autosw = 1;
- continue;
- case NAUTOSW:
- autosw = 0;
- continue;
-
- case BULKSW:
- if (!(bulksw = *argp++) || *bulksw == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case FORMSW:
- if (!(form = *argp++) || *form == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- format = NULL;
- continue;
- case FMTSW:
- if (!(format = *argp++) || *format == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- form = NULL;
- continue;
-
- case WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- width = atoi (cp);
- continue;
-
- case HOSTSW:
- if (!(host = *argp++) || *host == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case USERSW:
- if (!(user = *argp++) || *user == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case APOPSW:
- rpop = -1;
- continue;
- case RPOPSW:
- rpop = 1;
- continue;
- case NAPOPSW:
- case NRPOPSW:
- rpop = 0;
- continue;
-
- case PROGSW:
- if (!(mshproc = *argp++) || *mshproc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- }
- if (*cp == '+' || *cp == '@') {
- if (folder)
- adios (NULL, "only one folder at a time!");
- else
- folder = pluspath (cp);
- }
- else
- adios (NULL, "usage: %s [+folder] [switches]", invo_name);
- }
-
- if (!host)
- adios (NULL, "usage: %s -host \"host\"", invo_name);
-
-#ifdef SMTPMTS
- if (bulksw)
- do_bulk (host);
-#endif
-
- if (user == NULL)
- user = getusername ();
- if (rpop > 0)
- pass = getusername ();
- else {
- setuid (getuid ());
- ruserpass (host, &user, &pass);
- }
- snprintf (mailname, sizeof(mailname), "PO box for address@hidden", user,
host);
-
- if (pop_init (host, user, pass, NULL, snoop, rpop) == NOTOK)
- adios (NULL, "%s", response);
- if (rpop > 0)
- setuid (getuid ());
-
- /* get new format string */
- nfs = new_fs (form, format, FORMAT);
-
- if (!context_find ("path"))
- free (path ("./", TFOLDER));
- if (!folder)
- folder = getfolder (0);
- maildir = m_maildir (folder);
-
- create_folder(maildir, 0, done);
-
- if (chdir (maildir) == NOTOK)
- adios (maildir, "unable to change directory to");
-
- if (!(mp = folder_read (folder)))
- adios (NULL, "unable to read folder %s", folder);
-
-#ifdef BPOP
- if (autosw)
- msh ();
- else
-#endif
-
- popi();
- pop_quit();
-
- context_replace (pfolder, folder); /* update current folder */
- seq_setunseen (mp, 0); /* set the Unseen-Sequence */
- seq_save (mp);
- context_save (); /* save the context file */
- return done (0);
-}
-
-
-static struct swit popicmds[] = {
-#define DELECMD 0
- "dele", 0,
-#define LASTCMD 1
- "last", 0,
-#define LISTCMD 2
- "list", 0,
-#define NOOPCMD 3
- "noop", 0,
-#define QUITCMD 4
- "quit", 0,
-#define RETRCMD 5
- "retr", 0,
-#define RSETCMD 6
- "rset", 0,
-#define SCANCMD 7
- "scan", 0,
-#define STATCMD 8
- "stat", 0,
-#define TOPCMD 9
- "top", 0,
-#ifdef BPOP
-#define MSHCMD 10
- "msh", 0,
-#endif
-
- NULL, 0
-};
-
-
-static void
-popi (void)
-{
- int eof = 0;
-
- for (;;) {
- int i;
- register char *cp;
- char buffer[BUFSIZ];
-
- if (eof)
- return;
-
- printf ("(%s) ", invo_name);
- for (cp = buffer; (i = getchar ()) != '\n'; ) {
- if (i == EOF) {
- putchar ('\n');
- if (cp == buffer)
- return;
- eof = 1;
- break;
- }
-
- if (cp < buffer + sizeof buffer - 2)
- *cp++ = i;
- }
- *cp = '\0';
- if (buffer[0] == '\0')
- continue;
- if (buffer[0] == '?') {
- printf ("commands:\n");
- print_sw (ALL, popicmds, "");
- printf ("type CTRL-D or use \"quit\" to leave %s\n", invo_name);
- continue;
- }
-
- if (cp = strchr (buffer, ' '))
- *cp = '\0';
- switch (i = smatch (buffer, popicmds)) {
- case AMBIGSW:
- ambigsw (buffer, popicmds);
- continue;
- case UNKWNSW:
- printf ("%s unknown -- type \"?\" for help\n", buffer);
- continue;
-
- case QUITCMD:
- return;
-
- case STATCMD:
- case DELECMD:
- case NOOPCMD:
- case LASTCMD:
- case RSETCMD:
- case TOPCMD:
- if (cp)
- *cp = ' ';
- pop_command ("%s%s", popicmds[i].sw, cp ? cp : "");
- printf ("%s\n", response);
- break;
-
- case LISTCMD:
- if (cp)
- *cp = ' ';
- if (pop_command ("%s%s", popicmds[i].sw, cp ? cp : "")
- == OK) {
- printf ("%s\n", response);
- if (!cp)
- for (;;) {
- switch (pop_multiline ()) {
- case DONE:
- strcpy (response, ".");
- /* and fall... */
- case NOTOK:
- printf ("%s\n", response);
- break;
-
- case OK:
- printf ("%s\n", response);
- continue;
- }
- break;
- }
- }
- break;
-
- case RETRCMD:
- if (!cp) {
- advise (NULL, "missing argument to %s", buffer);
- break;
- }
- retr_action (NULL, OK);
- pop_retr (atoi (++cp), retr_action);
- retr_action (NULL, DONE);
- printf ("%s\n", response);
- break;
-
- case SCANCMD:
- {
- char *dp,
- *ep,
- *fp;
-
- if (width == 0)
- width = sc_width ();
-
- for (dp = nfs, i = 0; *dp; dp++, i++)
- if (*dp == '\\' || *dp == '"' || *dp == '\n')
- i++;
- i++;
- ep = mh_xmalloc ((unsigned) i);
- for (dp = nfs, fp = ep; *dp; dp++) {
- if (*dp == '\n') {
- *fp++ = '\\', *fp++ = 'n';
- continue;
- }
- if (*dp == '"' || *dp == '\\')
- *fp++ = '\\';
- *fp++ = *dp;
- }
- *fp = '\0';
-
- pop_command ("xtnd scan %d \"%s\"", width, ep);
- printf ("%s\n", response);
-
- free (ep);
- }
- break;
-
-#ifdef BPOP
- case MSHCMD:
- msh ();
- break;
-#endif
- }
- }
-}
-
-
-static int
-retr_action (char *rsp, int flag)
-{
- static FILE *fp;
-
- if (rsp == NULL) {
- static int msgnum;
- static char *cp;
-
- if (flag == OK) {
- if (!(mp = folder_realloc (mp, mp->lowoff, msgnum = mp->hghmsg +
1)))
- adios (NULL, "unable to allocate folder storage");
-
- cp = getcpy (m_name (mp->hghmsg + 1));
- if ((fp = fopen (cp, "w+")) == NULL)
- adios (cp, "unable to write");
- chmod (cp, m_gmprot ());
- }
- else {
- struct stat st;
-
- fflush (fp);
- if (fstat (fileno (fp), &st) != NOTOK && st.st_size > 0) {
- clear_msg_flags (mp, msgnum);
- set_exists (mp, msgnum);
- set_unseen (mp, msgnum);
- mp->msgflags |= SEQMOD;
-
- if (ferror (fp))
- advise (cp, "write error on");
- mp->hghmsg = msgnum;
- }
- else
- unlink (cp);
-
- fclose (fp), fp = NULL;
- free (cp), cp = NULL;
- }
-
- return;
- }
-
- fprintf (fp, "%s\n", rsp);
-}
-
-
-#ifdef BPOP
-static void
-msh (void)
-{
- int child_id, vecp;
- char buf1[BUFSIZ], buf2[BUFSIZ], *vec[9];
-
- if (pop_fd (buf1, sizeof(buf1), buf2, sizeof(buf2)) == NOTOK)
- adios (NULL, "%s", response);
-
- vecp = 0;
- vec[vecp++] = r1bindex (mshproc, '/');
-
- switch (child_id = fork ()) {
- case NOTOK:
- adios ("fork", "unable to");
-
- case OK:
- vec[vecp++] = "-popread";
- vec[vecp++] = buf1;
- vec[vecp++] = "-popwrite";
- vec[vecp++] = buf2;
- vec[vecp++] = "-idname";
- vec[vecp++] = mailname;
- vec[vecp++] = mailname;
- vec[vecp] = NULL;
- execvp (mshproc, vec);
- fprintf (stderr, "unable to exec ");
- perror (mshproc);
- _exit (-1);
-
- default:
- pidXwait (child_id, mshproc);
- break;
- }
-}
-#endif
-
-
-#ifdef SMTPMTS
-#include <h/mts.h>
-#include <mts/smtp/smtp.h>
-
-static int
-dselect (struct direct *d)
-{
- int i;
-
- if ((i = strlen (d->d_name)) < sizeof "smtp"
- || strncmp (d->d_name, "smtp", sizeof "smtp" - 1))
- return 0;
- return ((i -= (sizeof ".bulk" - 1)) > 0
- && !strcmp (d->d_name + i, ".bulk"));
-}
-
-
-static int
-dcompar (struct direct *d1, struct direct *d2)
-{
- struct stat s1, s2;
-
- if (stat ((*d1)->d_name, &s1) == NOTOK)
- return 1;
- if (stat ((*d2)->d_name, &s2) == NOTOK)
- return -1;
- return ((int) (s1.st_mtime - s2.st_mtime));
-}
-
-
-static void
-do_bulk (char *host)
-{
- register int i;
- int n, retval, sm;
- struct direct **namelist;
-
- if (chdir (bulksw) == NOTOK)
- adios (bulksw, "unable to change directory to");
-
- if ((n = scandir (".", &namelist, dselect, dcompar)) == NOTOK)
- adios (bulksw, "unable to scan directory");
-
- sm = NOTOK;
- for (i = 0; i < n; i++) {
- register struct direct *d = namelist[i];
-
- if (sm == NOTOK) {
- if (rp_isbad (retval = sm_init (NULL, host, 1, 1, snoop)))
- adios (NULL, "problem initializing server: %s",
- rp_string (retval));
- else
- sm = OK;
- }
-
- switch (retval = sm_bulk (d->d_name)) {
- default:
- if (rp_isbad (retval))
- adios (NULL, "problem delivering msg %s: %s",
- d->d_name, rp_string (retval));
- /* else fall... */
- case RP_OK:
- case RP_NO:
- case RP_NDEL:
- advise (NULL, "msg %s: %s", d->d_name, rp_string (retval));
- break;
- }
- }
-
- if (sm == OK) {
- register int j;
- int l,
- m;
- struct direct **newlist;
-
- while ((l = scandir (".", &newlist, dselect, dcompar)) > OK) {
- m = 0;
-
- for (j = 0; j < l; j++) {
- register struct direct *d = newlist[j];
-
- for (i = 0; i < n; i++)
- if (strcmp (d->d_name, namelist[i]->d_name) == 0)
- break;
- if (i >= n) {
- switch (retval = sm_bulk (d->d_name)) {
- default:
- if (rp_isbad (retval))
- adios (NULL, "problem delivering msg %s: %s",
- d->d_name, rp_string (retval));
- /* else fall... */
- case RP_OK:
- case RP_NO:
- case RP_NDEL:
- advise (NULL, "msg %s: %s", d->d_name,
- rp_string (retval));
- break;
- }
-
- m = 1;
- }
- }
-
- for (i = 0; i < n; i++)
- free ((char *) namelist[i]);
- free ((char *) namelist);
- namelist = newlist, n = l;
-
- if (!m)
- break;
- newlist = NULL;
- }
- }
-
- if (sm == OK && rp_isbad (retval = sm_end (OK)))
- adios (NULL, "problem finalizing server: %s", rp_string (retval));
-
- for (i = 0; i < n; i++)
- free ((char *) namelist[i]);
- free ((char *) namelist);
-
- free ((char *) namelist);
-
- done (0);
-}
-#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] nmh ChangeLog uip/Makefile.in uip/popi.c,
Eric Gillespie <=