[Pkg-wmaker-commits] [wmbiff] 02/09: Added APOP support, patch from NAKAYAMA Takao <hoehoe at wakaba.jp>. Fixed some bits of the manpage (Jordi) Bumped version to 0.3.2.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 02:59:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_3_2
in repository wmbiff.
commit de8943467de7c8394156c2c9b599cfce0cf83e58
Author: oskuro <oskuro>
Date: Mon Sep 24 11:58:39 2001 +0000
Added APOP support, patch from NAKAYAMA Takao <hoehoe at wakaba.jp>.
Fixed some bits of the manpage (Jordi)
Bumped version to 0.3.2.
---
ChangeLog | 90 +++++++++--------
NEWS | 6 ++
README | 5 +-
wmbiff/ApopClient.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++++
wmbiff/Client.h | 10 +-
wmbiff/Makefile | 6 +-
wmbiff/sample.wmbiffrc | 12 ++-
wmbiff/wmbiff.1 | 17 ++--
wmbiff/wmbiff.c | 6 +-
wmbiff/wmbiffrc.5 | 10 +-
10 files changed, 353 insertions(+), 64 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a97cfd8..61b5f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,25 +5,30 @@ The latest changelog entry is in a different format, because it's inserted by
CVS on commit.
$Log: ChangeLog,v $
- Revision 1.10 2001/06/24 18:17:58 oskuro
- Released wmbiff 0.3.1.
+ Revision 1.11 2001/09/24 11:58:39 oskuro
+ Added APOP support, patch from NAKAYAMA Takao <hoehoe at wakaba.jp>.
+ Fixed some bits of the manpage (Jordi)
+ Bumped version to 0.3.2.
+2001-06-24 Sunday 18:17 UTC -- Jordi Mallach <jordi at sindominio.net>
+
+ * ChangeLog, NEWS: Released wmbiff 0.3.1.
+
2001-06-24 Sunday 18:08 UTC -- Jordi Mallach <jordi at sindominio.net>
- * ChangeLog, README (utags: wmbiff_0_3_1): Removed duplicate entry
- for Vladimir Popov in README.
+ * ChangeLog, README: Removed duplicate entry for Vladimir Popov in
+ README.
2001-06-23 Saturday 00:09 UTC -- Jordi Mallach <jordi at sindominio.net>
- * wmbiff/Imap4Client.c (tags: wmbiff_0_3_1): Imap fix from Rob Funk
+ * wmbiff/Imap4Client.c: Imap fix from Rob Funk
2001-06-23 Saturday 00:07 UTC -- Jordi Mallach <jordi at sindominio.net>
- * ChangeLog, NEWS (tags: wmbiff_0_3_1), maint/changelog.sed (tags:
- wmbiff_0_3_1), maint/prerelease.sh (tags: wmbiff_0_3_1): Renamed
- CHANGES to ChangeLog and RELEASE-NOTES to NEWS, modified release
- scripts accordingly. Added Mark to the sed file.
+ * ChangeLog, NEWS, maint/changelog.sed, maint/prerelease.sh:
+ Renamed CHANGES to ChangeLog and RELEASE-NOTES to NEWS, modified
+ release scripts accordingly. Added Mark to the sed file.
2001-06-22 Friday 23:55 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -38,30 +43,25 @@ CVS on commit.
2001-06-19 Tuesday 03:38 UTC -- Dwayne C. Litzenberger <dlitz at dlitz.net>
* CHANGES, ChangeLog, README, RELEASE-NOTES, maint/changelog.sed,
- maint/prerelease.sh, wmbiff/Client.h (tags: wmbiff_0_3_1),
- wmbiff/Imap4Client.c, wmbiff/LicqClient.c (tags: wmbiff_0_3_1),
- wmbiff/Makefile (tags: wmbiff_0_3_1), wmbiff/Pop3Client.c (tags:
- wmbiff_0_3_1), wmbiff/charutil.c (tags: wmbiff_0_3_1),
- wmbiff/charutil.h (tags: wmbiff_0_3_1), wmbiff/maildirClient.c
- (tags: wmbiff_0_3_1), wmbiff/mboxClient.c (tags: wmbiff_0_3_1),
- wmbiff/sample.wmbiffrc (tags: wmbiff_0_3_1), wmbiff/socket.c (tags:
- wmbiff_0_3_1), wmbiff/wmbiff.1 (tags: wmbiff_0_3_1),
- wmbiff/wmbiff.c (tags: wmbiff_0_3_1), wmbiff/wmbiffrc.5 (tags:
- wmbiff_0_3_1): * Another big patch that mucks with everything. I
- probably deserve to be flamed for this practice. Feel free...
- :-) * Added maint/prerelease.sh script. Run it before making any
- releases. * Added maint/changelog.sed. Add your SourceForge
- userid here. * Moved ChangeLog to RELEASE-NOTES (see below). *
- Added a new file, CHANGES (created by maint/prerelease.sh) that
- tabulates all the CVS changes. * Added "distclean" to
- wmbiff/Makefile. * Added CVS Id$ to all the files in wmbiff/ . *
- I reformatted ths changelog, again. I hope this is the last time I
- need to do this. The CVS logs should be used for all changes,
- and this file should by updated for user-visible changes only,
- from now on. (Dwayne C. Litzenberger) * Updated the README to
- reflect that Gennady Belyakov died right after releasing wmBiff
- 0.2. May your soul rest in peace, Gennady. (Dwayne C.
- Litzenberger)
+ maint/prerelease.sh, wmbiff/Client.h, wmbiff/Imap4Client.c,
+ wmbiff/LicqClient.c, wmbiff/Makefile, wmbiff/Pop3Client.c,
+ wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/maildirClient.c,
+ wmbiff/mboxClient.c, wmbiff/sample.wmbiffrc, wmbiff/socket.c,
+ wmbiff/wmbiff.1, wmbiff/wmbiff.c, wmbiff/wmbiffrc.5: * Another big
+ patch that mucks with everything. I probably deserve to be
+ flamed for this practice. Feel free... :-) * Added
+ maint/prerelease.sh script. Run it before making any releases. *
+ Added maint/changelog.sed. Add your SourceForge userid here. *
+ Moved ChangeLog to RELEASE-NOTES (see below). * Added a new file,
+ CHANGES (created by maint/prerelease.sh) that tabulates all the
+ CVS changes. * Added "distclean" to wmbiff/Makefile. * Added CVS
+ Id$ to all the files in wmbiff/ . * I reformatted ths changelog,
+ again. I hope this is the last time I need to do this. The CVS
+ logs should be used for all changes, and this file should by
+ updated for user-visible changes only, from now on. (Dwayne C.
+ Litzenberger) * Updated the README to reflect that Gennady
+ Belyakov died right after releasing wmBiff 0.2. May your soul
+ rest in peace, Gennady. (Dwayne C. Litzenberger)
2001-06-16 Saturday 01:02 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -87,8 +87,8 @@ CVS on commit.
2001-05-11 Friday 14:49 UTC -- Jordi Mallach <jordi at sindominio.net>
- * wmbiff/: .cvsignore (tags: wmbiff_0_3_1), Makefile: Uncommitted
- stuff to deal with the removal of the xmp link
+ * wmbiff/: .cvsignore, Makefile: Uncommitted stuff to deal with the
+ removal of the xmp link
2001-05-04 Friday 11:01 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -108,15 +108,13 @@ CVS on commit.
2001-05-01 Tuesday 16:11 UTC -- Jordi Mallach <jordi at sindominio.net>
- * README.licq (tags: wmbiff_0_3_1), ChangeLog, README,
- wmgeneral/list.c (tags: wmbiff_0_3_1), wmgeneral/list.h (tags:
- wmbiff_0_3_1), wmgeneral/misc.c (tags: wmbiff_0_3_1),
- wmgeneral/misc.h (tags: wmbiff_0_3_1), wmgeneral/wmgeneral.h (tags:
- wmbiff_0_3_1), wmbiff/socket.c, wmgeneral/wmgeneral.c (tags:
- wmbiff_0_3_1), wmbiff/Imap4Client.c, wmbiff/Makefile,
- wmbiff/mboxClient.c, wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1,
- wmbiff/wmbiff.c, wmbiff/wmbiff-master-led.xpm (tags: wmbiff_0_3_1),
- wmbiff/.cvsignore, wmbiff/Client.h, wmbiff/LicqClient.c,
- wmbiff/Pop3Client.c, wmbiff/maildirClient.c, wmbiff/wmbiffrc.5
- (utags: start): Initial import to SourceForge, version 0.2q1+Debian
+ * README.licq, ChangeLog, README, wmgeneral/list.c,
+ wmgeneral/list.h, wmgeneral/misc.c, wmgeneral/misc.h,
+ wmgeneral/wmgeneral.h, wmbiff/socket.c, wmgeneral/wmgeneral.c,
+ wmbiff/Imap4Client.c, wmbiff/Makefile, wmbiff/mboxClient.c,
+ wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
+ wmbiff/wmbiff-master-led.xpm, wmbiff/.cvsignore, wmbiff/Client.h,
+ wmbiff/LicqClient.c, wmbiff/Pop3Client.c, wmbiff/maildirClient.c,
+ wmbiff/wmbiffrc.5: Initial import to SourceForge, version
+ 0.2q1+Debian
diff --git a/NEWS b/NEWS
index d636b49..3f8554a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
Release Notes
~~~~~~~~~~~~~
+Release 0.3.2 - Mon, 24 Sep 2001 13:41:16 +0200
+
+ * Added APOP support from NAKAYAMA Takao.
+ * Updates and fixes to documentation. (Jordi)
+
+
Release 0.3.1 - Sun, 24 Jun 2001 20:15:41 +0200
* Replaced /var/spool/mail with /var/mail, which is what the FHS mandates.
diff --git a/README b/README
index 324d6c8..fac6100 100644
--- a/README
+++ b/README
@@ -11,8 +11,8 @@
Yellow digits display number of unread messages, with blinking on new
mail arrival, if any.
- At this moment unix-style (mbox), maildir POP3 and IMAP mailboxes are
- supported. wmBiff also understands Licq's history files.
+ At this moment unix-style (mbox), maildir POP3, APOP and IMAP mailboxes
+ are supported. wmBiff also understands Licq's history files.
wmBiff supports up to 5 mailboxes (but you can start 2 or more
wmbiff's with differrent configs).
@@ -78,6 +78,7 @@ position. All other positions will be empty.
Dwayne C. Litzenberger (dlitz at dlitz.net)
Mark Hurley (debian4tux at telocity.com)
Rob Funk (rfunk at funkinet.net)
+ NAKAYAMA Takao (hoehoe at wakaba.jp)
_________________________________________________________________
diff --git a/wmbiff/ApopClient.c b/wmbiff/ApopClient.c
new file mode 100644
index 0000000..c86b7b4
--- /dev/null
+++ b/wmbiff/ApopClient.c
@@ -0,0 +1,255 @@
+/* Author : NAKAYAMA Takao ( hoehoe at wakaba.jp )
+ *
+ * Apop Email checker.
+ *
+ * Last Updated : Mon Sep 3 21:47:25 JST 2001
+ *
+ */
+
+#include "Client.h"
+#include <sys/types.h>
+#include <md5.h>
+
+#define PCU (pc->u).pop
+
+FILE *apopLogin(Pop3 pc)
+{
+ int fd;
+ FILE *fp;
+ char buf[BUF_SIZE];
+ char md5con[128], md5key[128], md5tmp[128];
+ char chksum[64];
+
+ if ((fd = sock_connect(PCU.serverName, PCU.serverPort)) == -1) {
+ fprintf(stderr, "Not Connected To Server '%s:%d'\n",
+ PCU.serverName, PCU.serverPort);
+ return NULL;
+ }
+
+ fp = fdopen(fd, "r+");
+ fgets(buf, BUF_SIZE, fp);
+
+
+ /* cut md5 keyword from pop server */
+
+ bzero(md5key, 128);
+ bzero(md5tmp, 128);
+ bzero(md5con, 128);
+ strncpy(md5tmp, strchr(buf, '<'), 128);
+ strncpy(md5key, md5tmp,
+ strlen(md5tmp) - strlen(strchr(md5tmp, '>')) + 1);
+
+#ifdef DEBUG_APOP
+ fprintf(stderr, "md5key=%s\n", md5key);
+#endif
+
+ /* calculate MD5-chkcksum for APOP */
+ strncpy(md5con, md5key, strlen(md5key));
+ strncat(md5con, PCU.password, strlen(PCU.password));
+ MD5Data(md5con, strlen(md5con), chksum);
+
+#ifdef DEBUG_APOP
+ fprintf(stderr, "md5con=%s\n", md5con);
+ fprintf(stderr, "chksum=%s\n", chksum);
+ fflush(stderr);
+#endif
+
+ fflush(fp);
+ fprintf(fp, "APOP %s %s\r\n", PCU.userName, chksum);
+ fflush(fp);
+ fgets(buf, BUF_SIZE, fp);
+ if (buf[0] != '+') {
+ fprintf(stderr, "Invalid checksum '%s@%s:%d'\n",
+ PCU.userName, PCU.serverName, PCU.serverPort);
+#ifdef DEBUG_APOP
+ fprintf(stderr, "%s\n", buf);
+#endif
+ fprintf(fp, "QUIT\r\n");
+ fclose(fp);
+ return NULL;
+ };
+
+ fflush(fp);
+
+ return fp;
+}
+
+int apopCheckMail(Pop3 pc)
+{
+ FILE *f;
+ int read;
+ char buf[BUF_SIZE];
+
+ f = pc->open(pc);
+ if (f == NULL)
+ return -1;
+
+ fflush(f);
+ fprintf(f, "STAT\r\n");
+ fflush(f);
+ fgets(buf, 256, f);
+ if (buf[0] != '+') {
+ fprintf(stderr, "Error Receiving Stats '%s@%s:%d'\n",
+ PCU.userName, PCU.serverName, PCU.serverPort);
+ return -1;
+ } else {
+ sscanf(buf, "+OK %d", &(pc->TotalMsgs));
+ }
+
+ /* - Updated - Mark Hurley - debian4tux at telocity.com
+ * In compliance with RFC 1725
+ * which removed the LAST command, any servers
+ * which follow this spec will return:
+ * -ERR unimplimented
+ * We will leave it here for those servers which haven't
+ * caught up with the spec.
+ */
+ fflush(f);
+ fprintf(f, "LAST\r\n");
+ fflush(f);
+ fgets(buf, 256, f);
+ if (buf[0] != '+') {
+ /* it is not an error to receive this according to RFC 1725 */
+ /* no error should be returned */
+ pc->UnreadMsgs = pc->TotalMsgs;
+ } else {
+ sscanf(buf, "+OK %d", &read);
+ pc->UnreadMsgs = pc->TotalMsgs - read;
+ }
+
+ fprintf(f, "QUIT\r\n");
+ fclose(f);
+
+ return 0;
+}
+
+int apopCreate(Pop3 pc, char *str)
+{
+ /* APOP format: apop:user:password at server[:port] */
+ /* new APOP format: apop:user password server [port] */
+ /* If 'str' line is badly formatted, wmbiff won't display the mailbox. */
+
+ /* old config file style... */
+ if (parse_old_apop_path(pc, str) != 0)
+
+ /* new config file style... */
+ if (parse_new_apop_path(pc, str) != 0) {
+
+ /* The line is badly formatted,
+ * we're not creating the mailbox line */
+ pc->label[0] = 0;
+ fprintf(stderr, "config line with bad format '%s'.\n", str);
+ return -1;
+ }
+
+ return 0;
+}
+
+/* parse the apop config line
+ * one simple function with a delimiter won't work,
+ * because of the '@' before server in old style!
+ */
+int parse_old_apop_path(Pop3 pc, char *str)
+{
+ char *tmp;
+ char *p;
+
+#ifdef DEBUG_APOP
+ printf("apop: str = '%s'\n", str);
+#endif
+
+ strcpy(PCU.password, "");
+ strcpy(PCU.userName, "");
+ strcpy(PCU.serverName, "");
+ PCU.serverPort = 110;
+
+ tmp = strdup(str);
+
+ p = strtok(tmp, ":"); /* cut off 'apop:' */
+
+ if ((p = strtok(NULL, ":"))) { /* p -> username */
+ strcpy(PCU.userName, p);
+ if ((p = strtok(NULL, "@"))) { /* p -> password */
+ strcpy(PCU.password, p);
+ if ((p = strtok(NULL, ":"))) { /* p -> server */
+ strcpy(PCU.serverName, p);
+ strcpy(pc->path, ""); /* p -> mailbox */
+ if ((p = strtok(NULL, ":"))) { /* p -> port */
+ PCU.serverPort = atoi(p);
+ }
+ free(tmp);
+
+#ifdef DEBUG_APOP
+ printf("apop: userName= '%s'\n", PCU.userName);
+ printf("apop: password= '%s'\n", PCU.password);
+ printf("apop: serverName= '%s'\n", PCU.serverName);
+ printf("apop: serverPort= '%d'\n", PCU.serverPort);
+#endif
+ pc->open = apopLogin;
+ pc->checkMail = apopCheckMail;
+ pc->TotalMsgs = 0;
+ pc->UnreadMsgs = 0;
+ pc->OldMsgs = -1;
+ pc->OldUnreadMsgs = -1;
+ return 0;
+ }
+ }
+ }
+
+ return 1;
+}
+
+/* delimiter is a "space" */
+int parse_new_apop_path(Pop3 pc, char *str)
+{
+ char *tmp;
+ char *p;
+ char *delim = " ";
+
+#ifdef DEBUG_APOP
+ printf("apop: str = '%s'\n", str);
+#endif
+
+ strcpy(PCU.password, "");
+ strcpy(PCU.userName, "");
+ strcpy(PCU.serverName, "");
+ PCU.serverPort = 110;
+
+ tmp = strdup(str);
+
+ p = strtok(tmp, ":"); /* cut off 'apop:' */
+
+ if ((p = strtok(NULL, delim))) { /* p -> username */
+ strcpy(PCU.userName, p);
+ if ((p = strtok(NULL, delim))) { /* p -> password */
+ strcpy(PCU.password, p);
+ if ((p = strtok(NULL, delim))) { /* p -> server */
+ strcpy(PCU.serverName, p);
+ strcpy(pc->path, ""); /* p -> mailbox */
+ if ((p = strtok(NULL, delim))) { /* p -> port */
+ PCU.serverPort = atoi(p);
+ }
+ free(tmp);
+
+#ifdef DEBUG_APOP
+ printf("apop: userName= '%s'\n", PCU.userName);
+ printf("apop: password= '%s'\n", PCU.password);
+ printf("apop: serverName= '%s'\n", PCU.serverName);
+ printf("apop: serverPort= '%d'\n", PCU.serverPort);
+#endif
+ pc->open = apopLogin;
+ pc->checkMail = apopCheckMail;
+ pc->TotalMsgs = 0;
+ pc->UnreadMsgs = 0;
+ pc->OldMsgs = -1;
+ pc->OldUnreadMsgs = -1;
+ return 0;
+ }
+ }
+ }
+
+ return 1;
+}
+
+
+/* vim:set ts=4: */
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index 277ce7a..a9ffa4a 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,11 +1,12 @@
-/* $Id: Client.h,v 1.2 2001/06/19 03:38:58 dwonis Exp $ */
+/* $Id: Client.h,v 1.3 2001/09/24 11:58:39 oskuro Exp $ */
/* Author : Scott Holden ( scotth at thezone.net )
Modified : Yong-iL Joh ( tolkien at mizi.com )
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
+ Modified : NAKAYAMA Takao ( hoehoe at wakaba.jp )
*
- * Email Checker Pop3/Imap4/Licq/mbox/maildir
+ * Email Checker Pop3/APOP/Imap4/Licq/mbox/maildir
*
- * Last Updated : Mar 20, 05:32:35 CET 2001
+ * Last Updated : Mon Sep 3 21:48:26 JST 2001
*
*/
@@ -64,12 +65,15 @@ typedef struct _mbox_t {
#define BUF_SIZE 1024
int sock_connect(char *hostname, int port);
+int apopCreate(Pop3 pc, char *str);
int pop3Create(Pop3 pc, char *str);
int imap4Create(Pop3 pc, char *str);
int licqCreate(Pop3 pc, char *str);
int mboxCreate(Pop3 pc, char *str);
int maildirCreate(Pop3 pc, char *str);
FILE *openMailbox(Pop3 pc);
+int parse_old_apop_path(Pop3 pc, char *str);
+int parse_new_apop_path(Pop3 pc, char *str);
int parse_old_pop3_path(Pop3 pc, char *str);
int parse_new_pop3_path(Pop3 pc, char *str);
diff --git a/wmbiff/Makefile b/wmbiff/Makefile
index 65fb7c7..bd533d8 100644
--- a/wmbiff/Makefile
+++ b/wmbiff/Makefile
@@ -1,5 +1,5 @@
-# $Id: Makefile,v 1.7 2001/06/19 03:38:58 dwonis Exp $
-WMBIFF_VERSION="0.3.1"
+# $Id: Makefile,v 1.8 2001/09/24 11:58:39 oskuro Exp $
+WMBIFF_VERSION="0.3.2"
DESTDIR=
prefix=/usr/local
bindir=${prefix}/bin
@@ -17,7 +17,7 @@ EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
# -DDEBUG_MBOX -DDEBUG_MAILDIR -DDEBUG -DDEBUG_MAIL_COUNT
OBJS = wmbiff.o socket.o \
- Pop3Client.o Imap4Client.o LicqClient.o mboxClient.o \
+ ApopClient.o Pop3Client.o Imap4Client.o LicqClient.o mboxClient.o \
maildirClient.o \
../wmgeneral/wmgeneral.o \
../wmgeneral/misc.o \
diff --git a/wmbiff/sample.wmbiffrc b/wmbiff/sample.wmbiffrc
index a875ed3..06898fb 100644
--- a/wmbiff/sample.wmbiffrc
+++ b/wmbiff/sample.wmbiffrc
@@ -1,4 +1,4 @@
-# $Id: sample.wmbiffrc,v 1.3 2001/06/19 03:38:58 dwonis Exp $
+# $Id: sample.wmbiffrc,v 1.4 2001/09/24 11:58:39 oskuro Exp $
#
# Global interval -- seconds between check mailboxes
interval=60
@@ -68,3 +68,13 @@ label.4=IMAP4
path.4=imap:user:password at server
interval.4=300 # 5 minutes
+# More examples
+
+#label.4=APOP
+## apop format: apop:user:password at server[:port]
+#path.4=apop:user:password at server
+#notify.4=my_play /home/gb/sounds/new_mail_has_arrived.wav
+#action.4=rxvt -name mutt -e mutt -f /home/gb/mail/30_nftp-list
+#interval.4=300 # 5 minutes
+#fetchinterval.4=-1
+#fetchcmd.4=fetchmail
diff --git a/wmbiff/wmbiff.1 b/wmbiff/wmbiff.1
index b3d0f2a..8315f91 100644
--- a/wmbiff/wmbiff.1
+++ b/wmbiff/wmbiff.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiff.1,v 1.2 2001/06/19 03:38:58 dwonis Exp $
+.\" $Id: wmbiff.1,v 1.3 2001/09/24 11:58:39 oskuro Exp $
.\"
.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2001 by
.\" Jordi Mallach <jordi at debian.org>
@@ -20,9 +20,9 @@ WMBiff \- A dockable Mailbox Monitor
WMbiff displays the status of up to five mailboxes. It gives information
about new mail, if any, or total number of messages. It also has mail
retrieval capabilies, and can be configured to do this automatically. At the
-moment, UNIX-style, POP3 and IMAP4 mailboxes are supported. WMbiff also
-supports Licq history files, displaying the number of new messages in your
-running Licq session, as if they were mail.
+moment, UNIX-style, maildir, POP3, APOP and IMAP4 mailboxes are supported.
+WMbiff also supports Licq history files, displaying the number of new
+messages in your running Licq session, as if they were mail.
The mailboxes are displayed in 5 different lines, each one with its own
description of up to five chars. If no mail is present in a given mailbox,
@@ -54,8 +54,8 @@ Initial window position.
Use specified config file.
.SH BUGS
-Please send any bug reports or suggestions to Gennady Belyakov
-<gb at ccat.elect.ru>.
+Please send any bug reports or suggestions to the WMBiff Development
+Mailing List <wmbiff-devel at lists.sourceforge.net>.
.br
.SH FILES
@@ -66,6 +66,11 @@ peruser wmbiff configuration file.
.SH AUTHOR
This manual page was written by Jordi Mallach <jordi at sindominio.net>,
originally for the Debian GNU/Linux system (but may be used by others).
+.br
+WMBiff was first maintained by Gennady Belyakov. Since January 2001 it is
+maintained group of people that have added lots of new features to the
+original program. Please see the README document for a list of all the people
+involved.
.SH SEE ALSO
.PD 0
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 8b154da..871d385 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,4 @@
-/* $Id: wmbiff.c,v 1.4 2001/06/19 03:38:58 dwonis Exp $ */
+/* $Id: wmbiff.c,v 1.5 2001/09/24 11:58:39 oskuro Exp $ */
#define USE_POLL
@@ -464,7 +464,9 @@ int ReadLine(FILE * fp, char *setting, char *value, int *index)
void parse_mbox_path(int item)
{
- if (!strncasecmp(mbox[item].path, "pop3:", 5)) { /* pop3 account */
+ if (!strncasecmp(mbox[item].path, "apop:", 5)) { /* apop account */
+ apopCreate((&mbox[item]), mbox[item].path);
+ } else if (!strncasecmp(mbox[item].path, "pop3:", 5)) { /* pop3 account */
pop3Create((&mbox[item]), mbox[item].path);
} else if (!strncasecmp(mbox[item].path, "licq:", 5)) { /* licq history file */
licqCreate((&mbox[item]), mbox[item].path);
diff --git a/wmbiff/wmbiffrc.5 b/wmbiff/wmbiffrc.5
index e65eba4..4664256 100644
--- a/wmbiff/wmbiffrc.5
+++ b/wmbiff/wmbiffrc.5
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiffrc.5,v 1.2 2001/06/19 03:38:58 dwonis Exp $
+.\" $Id: wmbiffrc.5,v 1.3 2001/09/24 11:58:39 oskuro Exp $
.\"
.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2001 by
.\" Jordi Mallach <jordi at debian.org>
@@ -66,9 +66,17 @@ to 110). If your passwd contained special character, eg. '@' or ':',
use another path format.
.RS
pop3:user:password at server[:port]
+.br
pop3:user password server[ port] (another format)
.RE
.TP
+.I apop
+This type makes wmbiff read mail from APOP servers, using the specified
+username, password, host and an optional port number.
+.RS
+apop:user:password at server[:port]
+.RE
+.TP
.I imap
These are IMAP4 boxes. As with pop3, wmbiff will read a imap4 mbox using
the given values and will display info about the remote mail. This type
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list