[Pkg-wmaker-commits] [wmbiff] 44/77: remove vestigial pc->open()
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:01:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_4_0
in repository wmbiff.
commit 08e2e9e22371172e093e3de3d9b382328e7f753f
Author: bluehal <bluehal>
Date: Tue Apr 16 07:37:37 2002 +0000
remove vestigial pc->open()
---
ChangeLog | 32 ++++++++++++++++++++++++++++++--
TODO | 18 +++++++++++-------
wmbiff/Client.h | 22 +++++++++++++++-------
wmbiff/Imap4Client.c | 3 +--
wmbiff/LicqClient.c | 5 ++---
wmbiff/Pop3Client.c | 5 ++---
wmbiff/mboxClient.c | 5 ++---
wmbiff/passwordMgr.c | 1 -
wmbiff/wmbiff.c | 5 +++--
9 files changed, 66 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4df287a..5595506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,14 +6,42 @@ The latest changelog entry is in a different format, because it's inserted by
CVS on commit.
$Log: ChangeLog,v $
- Revision 1.26 2002/04/15 08:15:18 bluehal
- try to make the distcheck target work correctly. voodoo.
+ Revision 1.27 2002/04/16 07:37:37 bluehal
+ remove vestigial pc->open()
Revision 1.1 2002/04/07 05:08:23 bluehal
use automake / autoconf; after checkout run ./FromCVS.sh
+2002-04-15 Monday 22:58 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * Makefile.am: dist the FAQ
+
+2002-04-15 Monday 22:58 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * TODO: be descriptive in TODO
+
+2002-04-15 Monday 21:19 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmgeneral/: Makefile.am, list.c, list.h, misc.c, misc.h,
+ wmgeneral.c, wmgeneral.h: run make indent; also tolerate standard
+ geometry string (dumping the dimensions provided)
+
+2002-04-15 Monday 21:06 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/wmbiff.c: bugfix to sigchld_handler (argh)
+
+2002-04-15 Monday 08:15 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * ChangeLog, Makefile.am, TODO, configure.in, wmbiff/Makefile.am,
+ autoconf/Makefile.am: try to make the distcheck target work
+ correctly. voodoo.
+
+2002-04-15 Monday 08:14 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * FAQ: a little documentation
+
2002-04-15 Monday 02:21 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: treat all gicu messages as new (they're unread)
diff --git a/TODO b/TODO
index 116ea27..0fde376 100644
--- a/TODO
+++ b/TODO
@@ -6,9 +6,6 @@
Because interesting mailboxes can be defined by date.
* \ line continuations in configuration file.
Because shell commands can be quite long.
-* Remove (*open)() from mbox_t
- Because it's rarely used, and can be easily integrated
- with the command check.
* Generic constructors for mboxes.
There's a lot of common code across different Clients;
this is one piece that could use refactoring.
@@ -30,8 +27,15 @@
STATUS) and a bad response (a003 NO STATUS). As soon as
one of them is received, we're done.
-$Id: TODO,v 1.7 2002/04/15 22:58:05 bluehal Exp $
-;;; Local Variables: ***
-;;; mode: outline ***
-;;; End: ***
+* Unlikely to get done, unless someone volunteers:
+* Support pops
+ tlsComm.c should make it easy to provide TLS support
+ for POP. Unfortunately, this would only be useful for
+ someone who has such a server that doesn't support IMAPS.
+
+$Id: TODO,v 1.8 2002/04/16 07:37:37 bluehal Exp $
+
+Local Variables:
+mode: outline
+End:
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index aa22588..5bfc45e 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,4 +1,4 @@
-/* $Id: Client.h,v 1.15 2002/04/15 01:30:32 bluehal Exp $ */
+/* $Id: Client.h,v 1.16 2002/04/16 07:37:38 bluehal 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 )
@@ -36,8 +36,8 @@ typedef struct _mbox_t {
int UnreadMsgs; /* New (unread) messages in mailbox */
int OldMsgs;
int OldUnreadMsgs;
- char TextStatus[10]; /* if set to a string, toupper() and blit that string.
- * instead of a message count */
+ char TextStatus[10]; /* if set to a string, toupper() and blit
+ * that string. instead of a message count */
int blink_stat; /* blink digits flag-counter */
int debug; /* debugging status */
@@ -62,19 +62,20 @@ typedef struct _mbox_t {
int serverPort;
int localPort;
char authList[100];
- unsigned int dossl:1, /* use tls. */
- interactive_password:1; /* prompt the user if we can't login / password is empty */
+ unsigned int dossl:1; /* use tls. */
+ /* prompt the user if we can't login / password is empty */
+ unsigned int interactive_password:1;
} pop_imap;
} u;
- FILE *(*open) (Pop3);
int (*checkMail) (Pop3);
time_t prevtime;
time_t prevfetch_time;
int loopinterval; /* loop interval for this mailbox */
- const char *askpass; /* command to execute to get a password, if needed */
+ /* command to execute to get a password, if needed */
+ const char *askpass;
} mbox_t;
#define BUF_SIZE 1024
@@ -123,3 +124,10 @@ do { \
#endif /* gnuc */
#endif /* client.h */
/* vim:set ts=4: */
+/*
+ * Local Variables:
+ * tab-width: 4
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index 41f6a96..5e0fb86 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -263,7 +263,7 @@ int imap_checkmail(Pop3 pc)
if (scs == NULL) {
IMAP_DM(pc, DEBUG_INFO, "Need new connection to %s@%s\n",
PCU.userName, PCU.serverName);
- (void) pc->open(pc);
+ (void) imap_open(pc);
scs = state_for_pcu(pc);
}
if (scs == NULL) {
@@ -361,7 +361,6 @@ int imap4Create(Pop3 pc, const char *const str)
IMAP_DM(pc, DEBUG_INFO, "serverPort= '%d'\n", PCU.serverPort);
IMAP_DM(pc, DEBUG_INFO, "authList= '%s'\n", PCU.authList);
- pc->open = imap_open;
pc->checkMail = imap_checkmail;
pc->TotalMsgs = 0;
pc->UnreadMsgs = 0;
diff --git a/wmbiff/LicqClient.c b/wmbiff/LicqClient.c
index c6c57ce..25c834d 100644
--- a/wmbiff/LicqClient.c
+++ b/wmbiff/LicqClient.c
@@ -1,4 +1,4 @@
-/* $Id: LicqClient.c,v 1.6 2002/04/09 07:45:52 bluehal Exp $ */
+/* $Id: LicqClient.c,v 1.7 2002/04/16 07:37:38 bluehal Exp $ */
/* Author : Yong-iL Joh ( tolkien at mizi.com )
Modified: Jorge Garc�a ( Jorge.Garcia at uv.es )
*
@@ -46,7 +46,7 @@ int licqCheckHistory(Pop3 pc)
(unsigned long) PCM.size, (unsigned long) st.st_size);
ut.actime = st.st_atime;
ut.modtime = st.st_mtime;
- F = pc->open(pc);
+ F = openMailbox(pc);
/* count message */
while (fgets(buf, BUF_SIZE, F)) {
@@ -78,7 +78,6 @@ int licqCreate(Pop3 pc, char *str)
pc->UnreadMsgs = 0;
pc->OldMsgs = -1;
pc->OldUnreadMsgs = -1;
- pc->open = openMailbox;
pc->checkMail = licqCheckHistory;
strcpy(pc->path, str + 5); /* cut off ``licq:'' */
diff --git a/wmbiff/Pop3Client.c b/wmbiff/Pop3Client.c
index a0676a9..3e53eee 100644
--- a/wmbiff/Pop3Client.c
+++ b/wmbiff/Pop3Client.c
@@ -1,4 +1,4 @@
-/* $Id: Pop3Client.c,v 1.12 2002/04/11 07:24:15 bluehal Exp $ */
+/* $Id: Pop3Client.c,v 1.13 2002/04/16 07:37:38 bluehal 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 )
@@ -105,7 +105,7 @@ int pop3CheckMail(Pop3 pc)
int read;
char buf[BUF_SIZE];
- f = pc->open(pc);
+ f = pop3Login(pc);
if (f == NULL)
return -1;
@@ -203,7 +203,6 @@ int pop3Create(Pop3 pc, const char *str)
POP_DM(pc, DEBUG_INFO, "serverPort= '%d'\n", PCU.serverPort);
POP_DM(pc, DEBUG_INFO, "authList= '%s'\n", PCU.authList);
- pc->open = pop3Login;
pc->checkMail = pop3CheckMail;
pc->TotalMsgs = 0;
pc->UnreadMsgs = 0;
diff --git a/wmbiff/mboxClient.c b/wmbiff/mboxClient.c
index 224818c..b04a36e 100644
--- a/wmbiff/mboxClient.c
+++ b/wmbiff/mboxClient.c
@@ -1,4 +1,4 @@
-/* $Id: mboxClient.c,v 1.8 2002/04/09 07:45:52 bluehal Exp $ */
+/* $Id: mboxClient.c,v 1.9 2002/04/16 07:37:38 bluehal Exp $ */
/* Author: Yong-iL Joh <tolkien at mizi.com>
Modified: Jorge Garc�a <Jorge.Garcia at uv.es>
Rob Funk <rfunk at funknet.net>
@@ -65,7 +65,7 @@ int mboxCheckHistory(Pop3 pc)
(unsigned long) PCM.size, (unsigned long) st.st_size);
ut.actime = st.st_atime;
ut.modtime = st.st_mtime;
- F = pc->open(pc);
+ F = openMailbox(pc);
/* count message */
while (fgets(buf, BUF_SIZE, F)) {
@@ -118,7 +118,6 @@ int mboxCreate(Pop3 pc, char *str)
pc->UnreadMsgs = 0;
pc->OldMsgs = -1;
pc->OldUnreadMsgs = -1;
- pc->open = openMailbox;
pc->checkMail = mboxCheckHistory;
/* default boxes are mbox... cut mbox: if it exists */
diff --git a/wmbiff/passwordMgr.c b/wmbiff/passwordMgr.c
index 7c19314..3f0d15e 100644
--- a/wmbiff/passwordMgr.c
+++ b/wmbiff/passwordMgr.c
@@ -92,7 +92,6 @@ const char *passwordFor(const char *username,
/* else fall through, overwrite */
} else if (pc) {
/* if we've asked, but received nothing, disable this box */
- pc->open = NULL;
pc->checkMail = NULL;
return (NULL);
}
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index dc92d76..26de965 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,4 @@
-/* $Id: wmbiff.c,v 1.24 2002/04/15 21:06:29 bluehal Exp $ */
+/* $Id: wmbiff.c,v 1.25 2002/04/16 07:37:38 bluehal Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -614,7 +614,8 @@ void parse_mbox_path(int item)
} else if (!strncasecmp(mbox[item].path, "gicu:", 5)) { /* gnomeicu check */
char buf[255];
if (isdigit(mbox[item].path[5])) {
- sprintf(buf, "shell:::echo `gnomeicu-client -u%s msgcount` new",
+ sprintf(buf,
+ "shell:::echo `gnomeicu-client -u%s msgcount` new",
mbox[item].path + 5);
} else {
sprintf(buf, "shell:::echo `gnomeicu-client msgcount` new");
--
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