[Pkg-wmaker-commits] [wmbiff] 22/92: Remove trailing whitespace.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 02:59:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbiff.
commit c4ab40ac9443f0ba3b410b30f876cad39b4dee32
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Oct 5 10:29:59 2014 -0500
Remove trailing whitespace.
---
AUTHORS | 8 ++--
FAQ | 40 +++++++++---------
Makefile.am | 6 +--
NEWS | 100 ++++++++++++++++++++++-----------------------
README | 48 +++++++++++-----------
TODO | 18 ++++----
autoconf/Makefile.am | 2 +-
configure.ac | 16 ++++----
scripts/security.debian.rb | 40 +++++++++---------
wmbiff/Client.h | 2 +-
wmbiff/Imap4Client.c | 12 +++---
wmbiff/Makefile.am | 12 +++---
wmbiff/Pop3Client.c | 12 +++---
wmbiff/ShellClient.c | 12 +++---
wmbiff/charutil.c | 2 +-
wmbiff/charutil.h | 2 +-
wmbiff/gnutls-common.c | 32 +++++++--------
wmbiff/maildirClient.c | 2 +-
wmbiff/mboxClient.c | 4 +-
wmbiff/passwordMgr.c | 10 ++---
wmbiff/sample.wmbiffrc | 8 ++--
wmbiff/socket.c | 6 +--
wmbiff/test_wmbiff.c | 12 +++---
wmbiff/tlsComm.c | 4 +-
wmbiff/tlsComm.h | 8 ++--
wmbiff/wmbiff.1 | 6 +--
wmbiff/wmbiff.c | 2 +-
wmbiff/wmbiffrc.5.in | 40 +++++++++---------
wmgeneral/Makefile.am | 2 +-
wmgeneral/misc.c | 6 +--
wmgeneral/wmgeneral.c | 6 +--
31 files changed, 240 insertions(+), 240 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index da65634..a4c8412 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,23 +1,23 @@
Copyrights
This program was written by Gennady Belyakov [8]gb at ccat.elect.ru
-
+
Exterior appearance was heavily derived from wminet, written by
Dave Clark (clarkd at skynet.ca),
Antoine Nulle (warp at xs4all.nl),
Martijn Pieterse (pieterse at xs4all.nl)
-
+
Some code (around mailbox checking, with some modifications) was taken
from xled, written by
Jan Schoenepauck (schoenep at uni-wuppertal.de) and
Joachim Gassen (joachim at fb4-1112.uni-muenster.de)
-
+
POP3 checking code was taken from wmpop3 by
Scott Holden (scotth at thezone.net)
Additional code was taken from xlassie, written by
Trent Piepho <xyzzy at speakeasy.net>
-
+
Many thanks for:
Angus Mackay (amackay at gusnet.cx)
Jordi Mallach P�rez (jordi at sindominio.net)
diff --git a/FAQ b/FAQ
index 288cc70..a8b9da6 100644
--- a/FAQ
+++ b/FAQ
@@ -29,7 +29,7 @@ tracker #706995).
* WMBiff doesn't work. How do I submit a bug?
See the Troubleshooting section of the wmbiffrc man
-page.
+page.
If that doesn't work, run 'wmbiff -debug > wmbiff.log' and
remove any passwords left in wmbiff.log. Submit this log
@@ -48,25 +48,25 @@ Some previously requested features can't be done:
- Count IMAP deleted messages separately (the protocol
doesn't support it without locking the mailbox).
- Reset the count of new messages to zero when spawning
- a mailer (it would just jump back again the next time
+ a mailer (it would just jump back again the next time
wmbiff looked).
Previously suggested features that are really hard:
- Support dock sizes other than 64x64
- Inverse video on new mail (or do more visually to grab attention)
-* I'm about to start writing a patch. How do I make sure it will
+* I'm about to start writing a patch. How do I make sure it will
get incorporated in WMBiff?
Start a conversation on wmbiff-devel, and you'll probably
-get some help.
-
-Tidbits:
- Avoid creating new Clients.
- - If you want an existing client to do something differently,
- find a way to parameterize its behavior.
+get some help.
+
+Tidbits:
+ Avoid creating new Clients.
+ - If you want an existing client to do something differently,
+ find a way to parameterize its behavior.
- If you want to use a shell command to get some
- information, make a recipe for ShellClient (open wmbiff.c
+ information, make a recipe for ShellClient (open wmbiff.c
and search for 'gicu').
If you must create a new client, Avoid Duplicating Code.
Document your patch. Add entries as appropriate to:
@@ -76,11 +76,11 @@ Tidbits:
* How do I get the very latest WMBiff from SourceForge CVS?
-See http://sourceforge.net/cvs/?group_id=26389, or
+See http://sourceforge.net/cvs/?group_id=26389, or
http://sourceforge.net/projects/wmbiff then click on CVS.
-
-cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wmbiff login
-cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wmbiff co wmbiff
+
+cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wmbiff login
+cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wmbiff co wmbiff
* I added a feature to WMBiff. How do I submit a patch?
** If you've modified code from a .tar.gz
@@ -88,7 +88,7 @@ cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wmbiff co wmbiff
(in the wmbiff-x.x.x/wmbiff directory)
make indent
cd ..
- make distclean
+ make distclean
cd ..
mv wmbiff-x.x.x wmbiff-changed
tar xvfz wmbiff-x.x.x.tar.gz
@@ -98,24 +98,24 @@ cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wmbiff co wmbiff
make indent
cd ..
[ optionally 'make distcheck' ]
- make maintainer-clean
+ make maintainer-clean
cvs update -d
[ resolve any conflicts ]
cvs diff -u | less [ make sure the differences are roughly correct ]
cd ..
mv wmbiff wmbiff-changed
- [ now checkout a new copy of wmbiff ]
+ [ now checkout a new copy of wmbiff ]
diff --unified --recursive --new-file --exclude CVS wmbiff wmbiff-changed > my-patch
-
+
** Sending the patch
Submit my-patch as an attachment to mail sent to
wmbiff-devel. Don't forget to subscribe to the mailing list
so that we can discuss your patch. This is roughly the same
procedure you'll use to submit patches to any code, although
others may not have the 'make indent' step.
-
-* This FAQ is wrong.
+
+* This FAQ is wrong.
Send mail to wmbiff-devel at lists.sourceforge.net.
diff --git a/Makefile.am b/Makefile.am
index 8bd4dce..1b6e215 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,11 @@ dist-hook-local: ChangeLog
chmod -R g-s .
indent:
- cd wmbiff && make indent
- cd wmgeneral && make indent
+ cd wmbiff && make indent
+ cd wmgeneral && make indent
# manually increment version in configure.ac, which should be enough.
-ChangeLog: Makefile configure.ac
+ChangeLog: Makefile configure.ac
@if test "x$(CVS2CL)" != "x" && test -e maint/changelog.sed; then \
echo "Running $(CVS2CL)..."; \
$(CVS2CL) --stdout --utc --day-of-week -I TODO -I NEWS -I .cvsignore | \
diff --git a/NEWS b/NEWS
index 939dc83..c9b3fde 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ Release 0.4.24 - June 22, 2004
unstable package libgnutls10-dev.
Release 0.4.23 - April 27, 2004
- * Allow server hostnames in IMAP to be IP addresses
+ * Allow server hostnames in IMAP to be IP addresses
(start with a number).
Release 0.4.22 - March 27, 2004
@@ -31,7 +31,7 @@ Release 0.4.21 - February 21, 2004
* Fix a bug where fetch times out to some IMAP servers.
Release 0.4.20 - January 1, 2004
- * Add --disable-crypto for source-based distributions
+ * Add --disable-crypto for source-based distributions
while libgcrypt is unstable.
* Sam Izzo's patch for changing the mouse click action
depending on whether a box has new mail.
@@ -49,37 +49,37 @@ Release 0.4.18 - November 8, 2003
* Bugfix to OS X keychain use for panther.
Release 0.4.17 - August 31, 2003
- * On Mac, ask the keychain for passwords if
+ * On Mac, ask the keychain for passwords if
askpass = internal:apple:keychain
- * Bugfix to an infinite loop found in the
+ * Bugfix to an infinite loop found in the
TLS interface.
-
+
Release 0.4.16 - July 7, 2003
- * Checks TLS certificates. See wmbiffrc(5) for
+ * Checks TLS certificates. See wmbiffrc(5) for
details on the certfile option. Designed to work
with mutt.
* Show a busy mouse cursor while talking to remote
- servers, to show that wmbiff won't be responsive
+ servers, to show that wmbiff won't be responsive
to mouse clicks for a little bit.
- * New buttontwo (middle click) action to complement
+ * New buttontwo (middle click) action to complement
action (left mouse click) and fetchcmd (right mouse).
- * #'s are now only comments in .wmbiffrc at the
- beginning of lines or following whitespace,
+ * #'s are now only comments in .wmbiffrc at the
+ beginning of lines or following whitespace,
allowing #'s in (most) passwords.
- * AppleScript examples for driving Apple's Mail
+ * AppleScript examples for driving Apple's Mail
application in sample.wmbiffrc
- * Special mailbox action 'msglst' brings up a
+ * Special mailbox action 'msglst' brings up a
transient window showing message headers from IMAP
- and program output for shell methods. This is
- intended to be faster than starting up a new
+ and program output for shell methods. This is
+ intended to be faster than starting up a new
mail program or re-executing a script.
* Avoid repetitive error messages when disconnected.
* Use conventional -geometry option handling.
* Fix bug in 0.4.15 to re-enable *'s in IMAP passwords.
Release 0.4.15 - Mar 30, 2003
- * Frobnicate internally stored passwords, partially
- obfuscating them in memory. Not actually more
+ * Frobnicate internally stored passwords, partially
+ obfuscating them in memory. Not actually more
secure, but harder to casually discover a password.
* Tighten configuration file lines to more quickly
detect misconfiguration. Add the -relax option if
@@ -89,13 +89,13 @@ Release 0.4.15 - Mar 30, 2003
Release 0.4.14 - Jan 24, 2003
* Handle building on systems with both posix and gnu
- regex in different but conflicting files.
- * Restart wmbiff on SIGUSR1. You may need to use
+ regex in different but conflicting files.
+ * Restart wmbiff on SIGUSR1. You may need to use
'killall -USR1 wmbiff' if it gets stuck.
* Restart wmbiff on ctrl-shift mouse 1.
Release 0.4.13 - Jan 20, 2003
- * Fix a file descriptor leak when using
+ * Fix a file descriptor leak when using
both Shell and IMAP clients.
* Portability to Mac OS X, Solaris, and probably BSD
restored (thanks sourceforge compile farm!) with a
@@ -107,14 +107,14 @@ Release 0.4.12 - Jan 3, 2003
-geometry handling. (Debian #173813)
Release 0.4.11 - Dec 28, 2002
- * security.debian.rb script to check for updates on
+ * security.debian.rb script to check for updates on
security.debian.org, installed in $prefix/lib/wmbiff/
- add: path.x=/usr/lib/wmbiff/security.debian.rb to
+ add: path.x=/usr/lib/wmbiff/security.debian.rb to
your .wmbiffrc (and install ruby if you haven't already).
* Internal cleanups to allow long askpass commands.
Release 0.4.10 - Dec 12, 2002
- * Peter McAlpine's globalnotify feature - elect to play a
+ * Peter McAlpine's globalnotify feature - elect to play a
sound on new mail in *any* mailbox without a chorus of
sounds from every mailbox.
* -skip-certificate-check option for when your imaps server
@@ -123,17 +123,17 @@ Release 0.4.10 - Dec 12, 2002
Release 0.4.9 - Dec 1, 2002
* GNUTLS v0.5.9 or higher required
* Check TLS certificate hostname against the hostname we're
- connecting to. This raises the bar, but does not make
- wmbiff's TLS implementation secure against man in the
+ connecting to. This raises the bar, but does not make
+ wmbiff's TLS implementation secure against man in the
middle attacks.
* WMBiff scales to the number of mailboxes you're
using. For openbox, this means less wasted space in the
slit and the possibility of up to 40 mailboxes. For
WindowMaker, this means more pretty chrome and less dark
LED if you have only a couple boxes. If you prefer the empty
- cells at the end, place "path.4=<space><space>" in your
+ cells at the end, place "path.4=<space><space>" in your
.wmbiffrc.
-
+
Release 0.4.8 - Sept 18, 2002
* GNUTLS v0.5.1-0.5.6, gcrypt v1.1.8 required.
* Allow spaces in IMAP mailbox paths. The new syntax is:
@@ -151,7 +151,7 @@ Release 0.4.6 - July 19, 2002
* GNUTLS v0.4.3, gcrypt v1.17 expected
Release 0.4.4 - June 27, 2002
- * GNUTLS version 0.4.3 required. The API has changed, and
+ * GNUTLS version 0.4.3 required. The API has changed, and
wmbiff is no longer compatible with GNUTLS versions prior
to 0.4.3. Certificate checking may be slightly more strict.
* GCRYPT version 1.1.7 is expected as well.
@@ -167,7 +167,7 @@ Release 0.4.3 - June 8, 2002
will not be completely erased when new mail arrives.
* Mouse handling fix.
* Cleanup of internals: handling of default configuration when
- .wmbiffrc does not exist, vertical position of rows, variable
+ .wmbiffrc does not exist, vertical position of rows, variable
names, etc.
* GNUTLS version 0.3.5 is expected; earlier and later versions
may be incompatible.
@@ -189,23 +189,23 @@ Release 0.4.0 - May 3, 2002
* GNUTLS version 0.3.5 is expected; earlier and later versions
may be incompatible.
* askpass: Passwords can be left empty for IMAP: ssh-askpass
- will be used to prompt the user. See sample.wmbiffrc
+ will be used to prompt the user. See sample.wmbiffrc
and wmbiffrc(5).
* skinfile: Background pixmaps can be specified in .wmbiffrc.
This has the effect of "skins." See wmbiffrc(5).
- Add "skinfile=wmbiff-master-contrast.xpm" to .wmbiffrc
+ Add "skinfile=wmbiff-master-contrast.xpm" to .wmbiffrc
for a more readable wmbiff.
* finger: Finger client added - finger a user's mailbox to get its
status. Requires perl and finger commands. See wmbiffrc(5).
Thanks to Andelko Horvat.
- * shell: Improvements to ShellClient - now allows three character
+ * shell: Improvements to ShellClient - now allows three character
text to be printed as status. If "new" is on the output
line, the text will be in yellow. Thanks to Andelko Horvat.
- * mbox: Paths can be specified including shell expressions
- in `'s. If requested, this feature can be expanded to other
+ * mbox: Paths can be specified including shell expressions
+ in `'s. If requested, this feature can be expanded to other
clients. Nested expressions are not supported.
* Permissions on .wmbiffrc are checked to protect security.
- Only a warning is printed now. This will degenerate in
+ Only a warning is printed now. This will degenerate in
later releases for .wmbiffrc's that store passwords.
* Migrated to automake / autoconf to detect defaults for
ssh-askpass and prepare for future changes.
@@ -312,26 +312,26 @@ Release 0.2q1 - Fri, 13 Apr 2001 02:47:10 -0400
* Drop all of the ":" after the pop3 and delimit all values with
spaces. This works well, as passwords/user-id's all agree that
the space is a non-legit value.
-
+
Example: assume my password is: myEmailhasa at init
-
+
Old way:
path.3=pop3:debian4tux:myEmailhasa at init@mail.telocity.com
New way:
path.3=pop3:debian4tux myEmailhasa at init mail.telcoity.com
-
+
Ahh...before you say it. "Backward compatibility?" You will
also find in the patch, a NEW function. So that the OLD and
NEW way is easily compatible with all ".wmbiffrc" files.
-
+
Dev. Comments:
This was not the cleanest way to implement it, but I had to
suffice with a clean/quick implementation. I originally wrote
one function to handle past and new parsing. However, I
thought it would be beneficial to leave them separated, so we
could eventually drop the old method?
-
+
Related Changes:
The man page will need to be updated (not provided in patch).
We can weed the "old" style out of the example script as well.
@@ -357,7 +357,7 @@ Release 0.2q1 - Fri, 13 Apr 2001 02:47:10 -0400
* wmbiff/wmbiff.c:
- for (index = 0; index < 4; index++)
+ for (index = 0; index < 5; index++)
-
+
BUG! Last postion #4 was not correctly being checked.
Now correctly checks each position.
@@ -366,7 +366,7 @@ Release 0.2q - Tue, 20 Mar 2001 05:32:35 +0100
* This release is by Jorge Garc�a <Jorge.Garcia at uv.es>.
* wmbiff/{*.[ch]}: removed unnecesary includes.
- * wmbiff/wmbiff.c: some cleanups and optimizations.
+ * wmbiff/wmbiff.c: some cleanups and optimizations.
+ init_biff:
* show error if user config file does not exists
* use of userconfig "interval" (wasn't correctly parsed)
@@ -374,12 +374,12 @@ Release 0.2q - Tue, 20 Mar 2001 05:32:35 +0100
and Blink_Mode local
+ parse_cmd: some changes to make uconfig_file local
+ {BlinkOn, BlinkOff, BlinkToogle}: Removed (merged by do_biff)
- + {ReadConfigString, ReadConfigInt}: Removed
+ + {ReadConfigString, ReadConfigInt}: Removed
+ countmail: removed init in header (wasn't used)
+ ReadLine: Created (new parsing code, extracts pairs of setting
and value)
+ Read_Config_File: now there is only ONE parse not 36!
- * wmbiff/{IMap4Client.c, Pop3Client.c}: check for correct format line to
+ * wmbiff/{IMap4Client.c, Pop3Client.c}: check for correct format line to
avoid "segmentation fault" while parsing.
@@ -398,7 +398,7 @@ Release 0.2p - Mon, 12 Mar 2001 00:00:00 -0600
* All your base are belong to us.
* I'm not maintaining wmBiff; I just submitted a big patch. Send your
complaints (or complements) to Yong-iL Joh.
-
+
Release 0.2o - Mon, 12 Mar 2001 00:00:00 +0900
@@ -429,7 +429,7 @@ Release 0.2o - Mon, 12 Mar 2001 00:00:00 +0900
Release 0.2n - Tue, 20 Feb 2001 0:00:00 +0900
-
+
* This release is by Yong-iL Joh <tolkien at mizi.com>.
* Nick Clarey <nclarey at 3glab.com> sent me a patch.
that enhances the following:
@@ -445,7 +445,7 @@ Release 0.2m - Mon, 5 Feb 2001 00:00:00 +0900
Release 0.2l - Thu, 11 Jan 2001 00:00:00 +0900
-
+
* This release is by Yong-iL Joh <tolkien at mizi.com>.
* Imap4Client.c had a bug when trying to connect to an imap4 server. Fixed
it.
@@ -465,10 +465,10 @@ Release 0.2-licq - Sat, 1 Jan 2000 00:00:00 +0000
* The actual date of this release is unknown, so I picked New Year's Day,
Y2K. (Dwayne C. Litzenberger)
* I found it from http://www.licq.org/download.html.
-
-Release 0.2 - Fri, 26 Nov 1999 00:00:00 +0000
-
+
+Release 0.2 - Fri, 26 Nov 1999 00:00:00 +0000
+
* This release is by Gennady Belyakov <gb at ccat.elect.ru>.
* We don't actually know the time zone of Gennady's changelog entries
(Dwayne C. Litzenberger).
@@ -480,7 +480,7 @@ Release 0.2 - Fri, 26 Nov 1999 00:00:00 +0000
Release 0.1a - Thu, 18 Nov 1999 00:00:00 +0000
-
+
* This release is by Gennady Belyakov <gb at ccat.elect.ru>.
* Some fixes with intialization
diff --git a/README b/README
index 07a9d43..872c9ec 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Introducing
-
+
WMBiff is an WindowMaker docking utility, that displays number of
total messages count or unread mail messages count in differrent
mailboxes.
@@ -10,26 +10,26 @@
Green ( cyan? :) ) digits display total number of messages, if there
are no unread messages in it.
-
+
Yellow digits display number of unread messages, with blinking on new
mail arrival, if any.
-
+
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).
-
+
Pressing on a 1st (left) mouse button will execute appropriate mail
reader (if defined in config file). Right-clicking will exec mail
fetching program (if any).
-
+
It is also possible to execute user-defined command line on new mail
arrival (for example, play .WAV file).
-
+
_________________________________________________________________
-
+
Compiling and Installation
-
+
Extract the archive:
tar -xvzf wmbiff-0.x.tar.gz
@@ -62,12 +62,12 @@ and specify differrent name of config file.
(from environment variable MAIL), labeled with word SPOOL, at first
position. All other positions will be empty.
_________________________________________________________________
-
+
See AUTHORS to see who has contributed to WMBiff.
_________________________________________________________________
-
+
Any suggestions/bug reports please send to our mailing list,
-
+
wmbiff-devel at lists.sourceforge.net
Please include the output of 'wmbiff -debug'.
@@ -81,32 +81,32 @@ wmbiff-devel list:
Hello,
I just found evidence of what I had believed for a long time.
-
+
http://www.monkey.org/openbsd/archive/ports/0101/msg00311.html
-
+
Gennady Belyakov passed away right after releasing 0.2 and when he
stopped answering mail :|
-
+
I guess we need to update the docs.
-
+
Jordi
Here is the message, if that URL becomes unavailable:
- To: ports at openbsd.org
- Subject: Re: mail/wmbiff update
- From: Vladimir Popov <pva48 at mail.ru>
- Date: Sat, 27 Jan 2001 09:34:15 +0500
-
+ To: ports at openbsd.org
+ Subject: Re: mail/wmbiff update
+ From: Vladimir Popov <pva48 at mail.ru>
+ Date: Sat, 27 Jan 2001 09:34:15 +0500
+
On Fri, Jan 26, 2001 at 01:02:59PM +0000, Christian Weisgerber wrote:
- >
+ >
> The major issue I have with this port is that the master site/home
> page is unreachable.
- >
-
+ >
+
Well, wmbiff's author Gennady Belyakov passed away in late November 1999.
That's why that url isn't any longer valid.
-
+
--
Vladimir
diff --git a/TODO b/TODO
index 726f49f..0a8d318 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ these todo items are welcome.
** # comments make #'s unsuitable for passwords.
** : and @ delimiters make such characters unsuitable for
passwords.
-** the hierarchical configuration is not exported cleanly,
+** the hierarchical configuration is not exported cleanly,
setting a default and then propagating or overriding it
requires an odd syntax.
** elements with spaces are problematic
@@ -14,8 +14,8 @@ these todo items are welcome.
methods) are cumbersome.
** continuation lines would allow richer shell actions without
external shell scripts.
-* GNUTLS 0.5.9
-** adds gnutls_set_default_priority, which could clean up
+* GNUTLS 0.5.9
+** adds gnutls_set_default_priority, which could clean up
a lot of the code to set priorities for ciphers that
don't really matter to wmbiff.
* Font support
@@ -33,7 +33,7 @@ these todo items are welcome.
Sometimes my IMAP server is slow... well, it's my fault
that I keep a few thousand messages on it. The current
timeout code will cause it to fail prematurely.
-* Generic constructors for mboxes.
+* Generic constructors for mboxes.
There's some common code across different Clients;
this is one piece that could use refactoring.
* Add more shell "recipes" besides gicu.
@@ -52,7 +52,7 @@ these todo items are welcome.
but extra complicated, and has a useless default install
that requires root. xbuffy's led program seems quite
good, but depending on another biff program seems odd.
-* Add a failure-expect case in tlsComm.
+* Add a failure-expect case in tlsComm.
For example, an IMAP status query has a good response (*
STATUS) and a bad response (a003 NO STATUS). As soon as
one of them is received, we're done.
@@ -71,10 +71,10 @@ these todo items are welcome.
* Unlikely to get done, unless someone volunteers:
* KDE/Gnome users: Test with KDE or gnome-panel
Does Debian bug #108529 apply to wmbiff? Can wmbiff
- be swallowed by gnome-panel? It seems possible. It
+ be swallowed by gnome-panel? It seems possible. It
appears to be swallowed by FVWM correctly.
* Autoconf / Automake Wizards: fix FromCVS.sh
- How best to deal with libgnutls's macros? All
+ How best to deal with libgnutls's macros? All
I can do is hack.
* Paranoid Pop People: Support POP over TLS.
tlsComm.c should make it easy to provide TLS support
@@ -86,9 +86,9 @@ these todo items are welcome.
could be integrated.
* Recursive maildir support
Aggregation in general is an oft-desired feature.
-* G-Mail support
+* G-Mail support
Though the business model of free mail forces screen scrubbing,
- having someone else write and maintain the interface seems
+ having someone else write and maintain the interface seems
like it would significantly improve the utility of gmail.
$Id: TODO,v 1.21 2004/10/31 22:08:42 bluehal Exp $
diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
index fba51d9..4c8ef12 100644
--- a/autoconf/Makefile.am
+++ b/autoconf/Makefile.am
@@ -1,2 +1,2 @@
-EXTRA_DIST =
+EXTRA_DIST =
diff --git a/configure.ac b/configure.ac
index 941e704..c8a5943 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ dnl AC_CHECK_FUNC(asprintf, , VASPRINTF="vasprintf.c")
dnl replacing the old USE_POLL define
AC_CHECK_FUNCS(poll)
-dnl for gnutls-common.h, which defines this if missing.
+dnl for gnutls-common.h, which defines this if missing.
AC_CHECK_FUNCS(inet_ntop)
dnl declare RETSIGTYPE
@@ -68,12 +68,12 @@ dnl Parameter is minimum version
dnl TODO: fix so that GCRYPT is tested only if GNUTLS fails; the dependence
dnl between them makes this turn redundant
-AC_ARG_ENABLE(crypto, AC_HELP_STRING([ --disable-crypto ], [ disable gnutls/gcrypt ]),
- [ if test $enableval != yes; then
+AC_ARG_ENABLE(crypto, AC_HELP_STRING([ --disable-crypto ], [ disable gnutls/gcrypt ]),
+ [ if test $enableval != yes; then
gnutls="disabled"
gcrypt="disabled"
fi ])
-
+
GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS."
if test "$gnutls" = "ok"; then
@@ -96,7 +96,7 @@ if test "$gcrypt" = "ok"; then
AC_CHECK_HEADERS(gcrypt.h) ],
[ echo libgcrypt can be found at ftp://ftp.gnupg.org/pub/gcrypt/alpha/libgcrypt/ ] )
else
- AC_MSG_RESULT(GCRYPT disabled.)
+ AC_MSG_RESULT(GCRYPT disabled.)
fi;
@@ -106,7 +106,7 @@ AC_SUBST(GCRYPT_MAN_STATUS)
AC_SUBST(GNUTLS_COMMON_O)
dnl regex stuff.
-AC_CHECK_HEADERS(regex.h) dnl gnuregex.h
+AC_CHECK_HEADERS(regex.h) dnl gnuregex.h
dnl no longer needed AC_CHECK_LIB(gnuregex, re_search) dnl BSD.
dnl X11 stuff.
@@ -136,7 +136,7 @@ dnl AC_SUBST(GNOME_LIBS)
dnl AC_SUBST(GNOME_CFLAGS)
-dnl see if __attribute__ is supported. modified from AC_C_INLINE
+dnl see if __attribute__ is supported. modified from AC_C_INLINE
dnl in the autoconf distribution.
AC_DEFUN([WM_C_ATTRIBUTE],
[AC_CACHE_CHECK([for __attribute__ support], wm_cv_c_attribute,
@@ -152,7 +152,7 @@ foo_t foo () {return 0; }
])
case $wm_cv_c_attribute in
yes)AC_DEFINE(HAVE___ATTRIBUTE__, ,
- [Define if '__attribute__' is supported by the compiler])
+ [Define if '__attribute__' is supported by the compiler])
;;
esac
])# WM_C_ATTRIBUTE
diff --git a/scripts/security.debian.rb b/scripts/security.debian.rb
index e3ec366..11d2362 100755
--- a/scripts/security.debian.rb
+++ b/scripts/security.debian.rb
@@ -1,6 +1,6 @@
#! /usr/bin/ruby
-# Copyright 2002 Neil Spring <nspring at cs.washington.edu>
+# Copyright 2002 Neil Spring <nspring at cs.washington.edu>
# GPL
# report bugs to wmbiff-devel at lists.sourceforge.net
# or (preferred) use the debian BTS via 'reportbug'
@@ -26,7 +26,7 @@ Refetch_Interval_Sec = 6 * 60 * 60
Cachedir = ENV['HOME'] + '/.wmbiff-sdr'
# look for updates from this server. This script is designed around
-# (and simplified greatly by) using just a single server.
+# (and simplified greatly by) using just a single server.
Server = 'security.debian.org'
# extend the Array class with a max method.
@@ -55,7 +55,7 @@ end
def version_a_gt_b(a, b)
cmd = "/usr/bin/dpkg --compare-versions %s le %s" % [ a, b ]
# $stderr.puts cmd
- return (!Kernel.system(cmd))
+ return (!Kernel.system(cmd))
end
# figure out which lists to check
@@ -67,10 +67,10 @@ end
# file, the url, the system's cache of the file, and a
# per-user cache of the file.
packagelists = Dir.glob("/var/lib/apt/lists/#{Server}*Packages").map { |pkgfile|
- [ pkgfile.gsub(/.*#{Server}/, '').tr('_','/'), # the url path
+ [ pkgfile.gsub(/.*#{Server}/, '').tr('_','/'), # the url path
pkgfile, # the system cache of the packages file. probably up-to-date.
# and finally, a user's cache of the page, if needed.
- "%s/%s" % [ Cachedir, pkgfile.gsub(/.*#{Server}_/,'') ]
+ "%s/%s" % [ Cachedir, pkgfile.gsub(/.*#{Server}_/,'') ]
]
}
@@ -80,41 +80,41 @@ session = nil
# update the user's cache if necessary.
packagelists.each { |urlpath, sc, uc|
sctime = File.stat(sc).mtime
- cached_time =
+ cached_time =
if(test(?e, uc)) then
- uctime = File.stat(uc).mtime
+ uctime = File.stat(uc).mtime
if ( uctime < sctime ) then
# we have a user cache, but it is older than the system cache
File.unlink(uc) # delete the obsolete user cache.
- sctime
+ sctime
else
uctime
end
- else
+ else
# the user cache doesn't exist, but we might have
# talked to the server recently.
if(test(?e, uc + '.stamp')) then
- File.stat(uc + '.stamp').mtime
+ File.stat(uc + '.stamp').mtime
else
sctime
end
- end
+ end
if(Time.now > cached_time + Refetch_Interval_Sec) then
- debugmsg "fetching #{urlpath} %s > %s + %d" % [Time.now, cached_time, Refetch_Interval_Sec]
+ debugmsg "fetching #{urlpath} %s > %s + %d" % [Time.now, cached_time, Refetch_Interval_Sec]
begin
if(session == nil) then
session = Net::HTTP.new(Server)
- # session.set_pipe($stderr);
+ # session.set_pipe($stderr);
end
- begin
- # the warning with ruby1.8 on the following line
+ begin
+ # the warning with ruby1.8 on the following line
# has to do with the resp, data bit, which should
- # eventually be replaced with (copied from the
+ # eventually be replaced with (copied from the
# docs with the 1.8 net/http.rb)
# response = http.get('/index.html')
# puts response.body
- resp, data = session.get(urlpath,
- { 'If-Modified-Since' =>
+ resp, data = session.get(urlpath,
+ { 'If-Modified-Since' =>
cached_time.strftime( "%a, %d %b %Y %H:%M:%S GMT" ) })
rescue SocketError => e
# if the net is down, we'll get this error; avoid printing a stack trace.
@@ -189,9 +189,9 @@ updated = Array.new
# we're done. output a count in the format expected by wmbiff.
if(updatedcount > 0) then
- puts "%d new" % [ updatedcount ]
+ puts "%d new" % [ updatedcount ]
else
- puts "%d old" % [ installed.length ]
+ puts "%d old" % [ installed.length ]
end
puts updated.join("\n")
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index 607ba76..578f168 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -52,7 +52,7 @@ 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
+ 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 */
diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index c4115e7..0555f86 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -158,7 +158,7 @@ struct connection_state *unbind(
/*@null@*/
FILE *imap_open(Pop3 pc)
{
- static int complained_already; /* we have to succeed once before
+ static int complained_already; /* we have to succeed once before
complaining again about failure */
struct connection_state *scs;
struct imap_authentication_method *a;
@@ -173,7 +173,7 @@ FILE *imap_open(Pop3 pc)
return NULL;
}
- /* got this far; we're going to create a connection_state
+ /* got this far; we're going to create a connection_state
structure, although it might be a blacklist entry */
connection_name = malloc(strlen(PCU.serverName) + 20);
sprintf(connection_name, "%s:%d", PCU.serverName, PCU.serverPort);
@@ -234,7 +234,7 @@ FILE *imap_open(Pop3 pc)
}
/* we don't need the unencrypted state anymore */
- /* note that communication_failure will close the
+ /* note that communication_failure will close the
socket and free via tls_close() */
free(scs); /* fall through will scs = initialize_gnutls(sd); */
}
@@ -253,8 +253,8 @@ FILE *imap_open(Pop3 pc)
/* authenticate; first find out how */
/* note that capabilities may have changed since last
- time we may have asked, if we called STARTTLS, my
- server will allow plain password login within an
+ time we may have asked, if we called STARTTLS, my
+ server will allow plain password login within an
encrypted session. */
tlscomm_printf(scs, "a000 CAPABILITY\r\n");
if (tlscomm_expect(scs, "* CAPABILITY", capabilities, BUF_SIZE) == 0) {
@@ -584,7 +584,7 @@ static int authenticate_plaintext( /*@notnull@ */ Pop3 pc,
{
char buf[BUF_SIZE];
/* is login prohibited? */
- /* "An IMAP client which complies with [rfc2525, section 3.2]
+ /* "An IMAP client which complies with [rfc2525, section 3.2]
* MUST NOT issue the LOGIN command if this capability is present.
*/
if (strstr(capabilities, "LOGINDISABLED")) {
diff --git a/wmbiff/Makefile.am b/wmbiff/Makefile.am
index 86b90bc..c69c546 100644
--- a/wmbiff/Makefile.am
+++ b/wmbiff/Makefile.am
@@ -5,16 +5,16 @@ wmbiff_SOURCES = wmbiff.c socket.c Pop3Client.c mboxClient.c \
maildirClient.c Imap4Client.c tlsComm.c tlsComm.h ShellClient.c \
passwordMgr.c passwordMgr.h charutil.c charutil.h Client.h \
regulo.c regulo.h MessageList.c MessageList.h
-EXTRA_wmbiff_SOURCES = gnutls-common.c gnutls-common.h
+EXTRA_wmbiff_SOURCES = gnutls-common.c gnutls-common.h
wmbiff_LDADD = -L../wmgeneral -lwmgeneral @LIBGCRYPT_LIBS@ @GNUTLS_COMMON_O@
wmbiff_DEPENDENCIES = ../wmgeneral/libwmgeneral.a Makefile @GNUTLS_COMMON_O@
test_wmbiff_SOURCES = ShellClient.c charutil.c charutil.h Client.h \
test_wmbiff.c passwordMgr.c Imap4Client.c regulo.c Pop3Client.c \
- tlsComm.c tlsComm.h socket.c
+ tlsComm.c tlsComm.h socket.c
test_tlscomm_SOURCES = test_tlscomm.c \
- tlsComm.c tlsComm.h
-EXTRA_test_wmbiff_SOURCES = gnutls-common.c gnutls-common.h
-test_wmbiff_LDADD = @LIBGCRYPT_LIBS@
+ tlsComm.c tlsComm.h
+EXTRA_test_wmbiff_SOURCES = gnutls-common.c gnutls-common.h
+test_wmbiff_LDADD = @LIBGCRYPT_LIBS@
man_MANS = wmbiff.1 wmbiffrc.5
skindir = $(datadir)/wmbiff/skins
skin_DATA = wmbiff-master-led.xpm wmbiff-master-contrast.xpm \
@@ -54,7 +54,7 @@ distclean-local:
wmbiff-classic-master-contrast.xpm
# remove colors, then substitute old colors, then repalletize
-# for some reason $< doesn't always work.
+# for some reason $< doesn't always work.
wmbiff-master-contrast.xpm: wmbiff-master-led.xpm Makefile
egrep -v '^"[:%][[:space:]]c #' < wmbiff-master-led.xpm | \
sed -e 's/:/./g' -e 's/%/$$/g' -e 's/ 15 / 13 /' | \
diff --git a/wmbiff/Pop3Client.c b/wmbiff/Pop3Client.c
index 6792c42..e928d6d 100644
--- a/wmbiff/Pop3Client.c
+++ b/wmbiff/Pop3Client.c
@@ -4,7 +4,7 @@
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
Modified ; Mark Hurley ( debian4tux at telocity.com )
Modified : Neil Spring ( nspring at cs.washington.edu )
- *
+ *
* Pop3 Email checker.
*
* Last Updated : Tue Nov 13 13:45:23 PST 2001
@@ -52,7 +52,7 @@ extern struct connection_state *state_for_pcu(Pop3 pc);
static struct authentication_method {
const char *name;
- /* callback returns the connection state pointer if successful,
+ /* callback returns the connection state pointer if successful,
NULL if failed */
struct connection_state *(*auth_callback) (Pop3 pc, struct connection_state * scs, char *apop_str);
} auth_methods[] = {
@@ -169,7 +169,7 @@ int pop3CheckMail( /*@notnull@ */ Pop3 pc)
/* it is not an error to receive this according to RFC 1725 */
/* no error should be returned */
pc->UnreadMsgs = pc->TotalMsgs;
- // there's also a LIST command... not sure how to make use of it. */
+ // there's also a LIST command... not sure how to make use of it. */
} else {
sscanf(buf, "+OK %d", &read);
pc->UnreadMsgs = pc->TotalMsgs - read;
@@ -201,9 +201,9 @@ int pop3Create(Pop3 pc, const char *str)
int i;
int matchedchars;
/* ([^: ]+) user
- ([^@]+) or ([^ ]+) password
- ([^: ]+) server
- ([: ][0-9]+)? optional port
+ ([^@]+) or ([^ ]+) password
+ ([^: ]+) server
+ ([: ][0-9]+)? optional port
' *' gobbles trailing whitespace before authentication types.
use separate regexes for old and new types to permit
use of '@' in passwords
diff --git a/wmbiff/ShellClient.c b/wmbiff/ShellClient.c
index 5543832..8c66471 100644
--- a/wmbiff/ShellClient.c
+++ b/wmbiff/ShellClient.c
@@ -1,7 +1,7 @@
/* Author: Beno�t Rouits ( brouits at free.fr ) thanks to Neil Spring.
- from LicqClient by Yong-iL Joh ( tolkien at mizi.com )
+ from LicqClient by Yong-iL Joh ( tolkien at mizi.com )
and Jorge Garc�a ( Jorge.Garcia at uv.es )
- *
+ *
* generic Shell command support
*
* Last Updated : Tue Mar 5 15:23:35 CET 2002
@@ -55,8 +55,8 @@ FILE *kind_popen(const char *command, const char *type)
}
/* kind_pclose checks the return value from pclose and prints
- some nice error messages about it. ordinarily, this would be
- a good idea, but wmbiff has a sigchld handler that reaps
+ some nice error messages about it. ordinarily, this would be
+ a good idea, but wmbiff has a sigchld handler that reaps
children immediately (needed when spawning other child processes),
so no error checking can be done here until that's disabled */
@@ -74,7 +74,7 @@ static int kind_pclose( /*@only@ */ FILE * F,
if (exit_status != 0) {
if (exit_status == -1) {
- /* wmbiff has a sigchld handler already, so wait is likely
+ /* wmbiff has a sigchld handler already, so wait is likely
to fail */
SH_DM(pc, DEBUG_ERROR, "pclose '%s' failed: %s\n",
command, strerror(errno));
@@ -174,7 +174,7 @@ int shellCmdCheck(Pop3 pc)
}
SH_DM(pc, DEBUG_INFO, "'%s' returned '%s'\n", pc->path, commandOutput);
- /* see if it's numeric; the numeric check is somewhat
+ /* see if it's numeric; the numeric check is somewhat
useful, as wmbiff renders 4-digit numbers, but not
4-character strings. */
if (sscanf(commandOutput, "%d", &(count_status)) == 1) {
diff --git a/wmbiff/charutil.c b/wmbiff/charutil.c
index 9b8108b..0f513ba 100644
--- a/wmbiff/charutil.c
+++ b/wmbiff/charutil.c
@@ -248,7 +248,7 @@ void StripComment(char *buf)
{
char *p;
- /* Strip comments at beginning of line, or after whitespace.
+ /* Strip comments at beginning of line, or after whitespace.
a kludgy way of avoiding problems with #'s in passwords. */
if (buf[0] == '#')
buf[0] = '\0';
diff --git a/wmbiff/charutil.h b/wmbiff/charutil.h
index cbd687e..50d3435 100644
--- a/wmbiff/charutil.h
+++ b/wmbiff/charutil.h
@@ -1,7 +1,7 @@
/* $Id: charutil.h,v 1.12 2004/04/20 04:55:55 bluehal Exp $ */
/* Author: Mark Hurley (debian4tux at telocity.com)
*
- * Character / string manipulation utilities.
+ * Character / string manipulation utilities.
*
*/
diff --git a/wmbiff/gnutls-common.c b/wmbiff/gnutls-common.c
index 5f2bf76..4f3cc7a 100644
--- a/wmbiff/gnutls-common.c
+++ b/wmbiff/gnutls-common.c
@@ -81,9 +81,9 @@ void print_x509_info(gnutls_session session, const char* hostname)
if (print_cert) {
size_t size;
-
+
size = sizeof(buffer);
-
+
ret = gnutls_x509_crt_export( crt, GNUTLS_X509_FMT_PEM, buffer, &size);
if (ret < 0) {
fprintf(stderr, "Encoding error: %s\n", gnutls_strerror(ret));
@@ -93,7 +93,7 @@ void print_x509_info(gnutls_session session, const char* hostname)
fputs( buffer, stdout);
fputs( "\n", stdout);
}
-
+
if (j==0 && hostname != NULL) { /* Check the hostname of the first certificate
* if it matches the name of the host we
* connected to.
@@ -118,7 +118,7 @@ void print_x509_info(gnutls_session session, const char* hostname)
str);
return;
}
-
+
printf("%s", xml_data.data);
gnutls_free( xml_data.data);
#endif
@@ -162,7 +162,7 @@ void print_x509_info(gnutls_session session, const char* hostname)
printf(" # fingerprint: %s\n", printable);
}
- /* Print the version of the X.509
+ /* Print the version of the X.509
* certificate.
*/
printf(" # version: #%d\n",
@@ -184,7 +184,7 @@ void print_x509_info(gnutls_session session, const char* hostname)
ret = gnutls_x509_crt_get_dn(crt, dn, &dn_size);
if (ret >= 0)
printf(" # Subject's DN: %s\n", dn);
-
+
dn_size = sizeof(dn);
ret = gnutls_x509_crt_get_issuer_dn(crt, dn, &dn_size);
if (ret >= 0)
@@ -192,7 +192,7 @@ void print_x509_info(gnutls_session session, const char* hostname)
}
gnutls_x509_crt_deinit(crt);
-
+
printf("\n");
}
@@ -217,7 +217,7 @@ void print_openpgp_info(gnutls_session session, const char* hostname)
unsigned int cert_list_size = 0;
time_t expiret;
time_t activet;
-
+
cert_list = gnutls_certificate_get_peers(session, &cert_list_size);
if (cert_list_size > 0) {
@@ -235,7 +235,7 @@ void print_openpgp_info(gnutls_session session, const char* hostname)
if (print_cert) {
size_t size;
-
+
size = sizeof(buffer);
ret = gnutls_openpgp_key_export( crt, GNUTLS_OPENPGP_FMT_BASE64, buffer, &size);
@@ -270,7 +270,7 @@ void print_openpgp_info(gnutls_session session, const char* hostname)
str);
return;
}
-
+
printf("%s", xml_data.data);
gnutls_free( xml_data.data);
@@ -287,7 +287,7 @@ void print_openpgp_info(gnutls_session session, const char* hostname)
else
printf("Never\n");
- if (gnutls_openpgp_key_get_fingerprint(crt, digest, &digest_size) >= 0)
+ if (gnutls_openpgp_key_get_fingerprint(crt, digest, &digest_size) >= 0)
{
print = printable;
for (i = 0; i < digest_size; i++) {
@@ -325,7 +325,7 @@ void print_openpgp_info(gnutls_session session, const char* hostname)
}
}
-
+
gnutls_openpgp_key_deinit( crt);
}
@@ -419,7 +419,7 @@ int print_info(gnutls_session session, const char* hostname)
print_cert_info(session, hostname);
print_cert_vrfy(session);
-
+
/* Check if we have been using ephemeral Diffie Hellman.
*/
if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS) {
@@ -660,17 +660,17 @@ void parse_comp(char **comp, int ncomp, int *comp_priority)
#endif
const char *inet_ntop(int af __attribute__((unused)), const void *src,
- char *dst, size_t cnt)
+ char *dst, size_t cnt)
{
char* ret;
ret = inet_ntoa( *((struct in_addr*)src));
-
+
if (strlen(ret) > cnt) {
return NULL;
}
strcpy( dst, ret);
-
+
return dst;
}
#endif
diff --git a/wmbiff/maildirClient.c b/wmbiff/maildirClient.c
index f2e5349..5858e46 100644
--- a/wmbiff/maildirClient.c
+++ b/wmbiff/maildirClient.c
@@ -2,7 +2,7 @@
/* Author : Yong-iL Joh ( tolkien at mizi.com )
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
Modified : Dwayne C. Litzenberger ( dlitz at dlitz.net )
- *
+ *
* Maildir checker.
*
* Last Updated : $Date: 2004/03/28 00:28:58 $
diff --git a/wmbiff/mboxClient.c b/wmbiff/mboxClient.c
index e5e85f3..f88a52b 100644
--- a/wmbiff/mboxClient.c
+++ b/wmbiff/mboxClient.c
@@ -3,7 +3,7 @@
Modified: Jorge Garc�a <Jorge.Garcia at uv.es>
Rob Funk <rfunk at funknet.net>
Neil Spring <nspring at cs.washington.edu>
- *
+ *
* MBOX checker.
*
* Last Updated : $Date: 2004/03/28 00:28:58 $
@@ -99,7 +99,7 @@ static void countMessages(Pop3 pc, const char *mbox_filename)
fclose(F);
}
-/* check file status; hold on to file information used
+/* check file status; hold on to file information used
to restore access time */
int
fileHasChanged(const char *mbox_filename, time_t * atime,
diff --git a/wmbiff/passwordMgr.c b/wmbiff/passwordMgr.c
index 131b558..28b6e30 100644
--- a/wmbiff/passwordMgr.c
+++ b/wmbiff/passwordMgr.c
@@ -1,5 +1,5 @@
-/* passwordMgr.c
- * Author: Neil Spring
+/* passwordMgr.c
+ * Author: Neil Spring
*/
/* this module implements a password cache: the goal is to
allow multiple wmbiff mailboxes that are otherwise
@@ -56,9 +56,9 @@ typedef struct password_binding_struct {
static password_binding pass_list = NULL;
-/* verifies that askpass_fname, if it has no spaces, exists as
- a file, is owned by the user or by root, and is not world
- writeable. This is just a sanity check, and is not intended
+/* verifies that askpass_fname, if it has no spaces, exists as
+ a file, is owned by the user or by root, and is not world
+ writeable. This is just a sanity check, and is not intended
to ensure the integrity of the password-asking program. */
/* would be static, but used in test_wmbiff */
int permissions_ok(Pop3 pc, const char *askpass_fname)
diff --git a/wmbiff/sample.wmbiffrc b/wmbiff/sample.wmbiffrc
index e0a4f58..6c19b8d 100644
--- a/wmbiff/sample.wmbiffrc
+++ b/wmbiff/sample.wmbiffrc
@@ -6,11 +6,11 @@
interval=60
# Global askpass -- choose a password acting program
-# that behaves like ssh-askpass. The default is
+# that behaves like ssh-askpass. The default is
# askpass = /usr/bin/ssh-askpass.
# askpass is invoked on IMAP entries that have no password
# below.
-# the commented version below is likely to work on RedHat
+# the commented version below is likely to work on RedHat
# systems; wmbiff's default is likely to work on Debian
# systems with ssh-askpass installed.
#askpass = /usr/libexec/openssh/x11-ssh-askpass
@@ -39,7 +39,7 @@ askpass = /usr/bin/ssh-askpass -fg cyan -bg black -xrm '*Dialog.title: WMBiff Pa
#skinfile=wmbiff-master-led.xpm
# higher contrast for lower-color displays
#skinfile=wmbiff-master-contrast.xpm
-# make your own derivative and submit it
+# make your own derivative and submit it
# to us at wmbiff-devel at lists.sourceforge.net
### First string ###
@@ -62,7 +62,7 @@ globalnotify=my_play /home/gb/sounds/new_mail_has_arrived.wav
# Don't want any global notification for this mailbox
notify.0=true
-# Command, which executed on left mouse click on label
+# Command, which executed on left mouse click on label
action.0=rxvt -name mutt -e mutt
# Rescan interval; default to global interval
diff --git a/wmbiff/socket.c b/wmbiff/socket.c
index 5ff9589..ff2c819 100644
--- a/wmbiff/socket.c
+++ b/wmbiff/socket.c
@@ -77,7 +77,7 @@ static int ipv4_sock_connect(struct in_addr *address, short port)
/* nspring/blueHal, 10 Apr 2002; added some extra error
printing, in line with the debug-messages-to-stdout
philosophy of the rest of the wmbiff code */
-/* 1 June 2002; incorporated IPv6 support by
+/* 1 June 2002; incorporated IPv6 support by
Jun-ichiro itojun Hagino <itojun at iijlab.net>, thanks! */
int sock_connect(const char *hostname, int port)
@@ -109,7 +109,7 @@ int sock_connect(const char *hostname, int port)
if (error) {
static int last_error;
if (last_error != error) {
- /* only report a problem if it's new. this is an
+ /* only report a problem if it's new. this is an
approximation that minimizes kept state. */
printf("%s: %s\n", hostname, gai_strerror(error));
last_error = error;
@@ -135,7 +135,7 @@ int sock_connect(const char *hostname, int port)
if (errno != last_connecterr) {
/* only report a problem if it's new.
EHOSTUNREACH is common when the net is down,
- for example; again, this is an approximation
+ for example; again, this is an approximation
to minimize kept state. */
last_connecterr = errno;
fprintf(stderr, "Error connecting to %s:%d: %s\n",
diff --git a/wmbiff/test_wmbiff.c b/wmbiff/test_wmbiff.c
index 5add324..8e090cc 100644
--- a/wmbiff/test_wmbiff.c
+++ b/wmbiff/test_wmbiff.c
@@ -406,14 +406,14 @@ int exists(UNUSED(const char *filename))
}
-// void initialize_blacklist(void) { }
+// void initialize_blacklist(void) { }
// void tlscomm_printf(UNUSED(int x), UNUSED(const char *f), ...) { }
-// void tlscomm_expect(void) { }
-// void tlscomm_close() { }
-// int tlscomm_is_blacklisted(UNUSED(const char *x)) { return 1; }
-// void initialize_gnutls(void) { }
+// void tlscomm_expect(void) { }
+// void tlscomm_close() { }
+// int tlscomm_is_blacklisted(UNUSED(const char *x)) { return 1; }
+// void initialize_gnutls(void) { }
// int sock_connect(UNUSED(const char *n), UNUSED(int p)) { return 1; } /* stdout */
-// void initialize_unencrypted(void) { }
+// void initialize_unencrypted(void) { }
int main(UNUSED(int argc), UNUSED(char *argv[]))
{
diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index 90fbc68..6f0bcd4 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -137,7 +137,7 @@ static int wait_for_it(int sd, int timeoutseconds)
// DMA(DEBUG_INFO,
// "select %d/%d returned %d descriptor, %d\n",
// sd, timeoutseconds, ready_descriptors, FD_ISSET(sd, &readfds));
-
+
} while(tv.tv_sec > 0 && (!FD_ISSET(sd, &readfds) || (errno == EINTR && ready_descriptors == -1)));
FD_ZERO(&readfds);
@@ -423,7 +423,7 @@ static int tls_compare_certificates(const gnutls_datum * peercert)
static void
tls_check_certificate(struct connection_state *scs,
- const char *remote_hostname)
+ const char *remote_hostname)
{
int ret;
unsigned int certstat;
diff --git a/wmbiff/tlsComm.h b/wmbiff/tlsComm.h
index 38911dd..26fa43c 100644
--- a/wmbiff/tlsComm.h
+++ b/wmbiff/tlsComm.h
@@ -1,6 +1,6 @@
/* tlsComm.h - interface for the thin layer that looks
sort of like fgets and fprintf, but might read or write
- to a socket or a TLS association
+ to a socket or a TLS association
Neil Spring (nspring at cs.washington.edu)
@@ -11,7 +11,7 @@
/* used to drill through per-mailbox debug keys */
#include "Client.h"
-/* opaque reference to the state associated with a
+/* opaque reference to the state associated with a
connection: may be just a file handle, or may include
encryption state */
struct connection_state;
@@ -28,9 +28,9 @@ struct connection_state *initialize_gnutls(int sd, /*@only@ */ char *name,
struct connection_state *initialize_unencrypted(int sd, /*@only@ */
char *name, Pop3 pc);
-/* store a binding when connect() times out. these should be
+/* store a binding when connect() times out. these should be
skipped when trying to check mail so that other mailboxes
- are checked responsively. I believe linux defaults to
+ are checked responsively. I believe linux defaults to
around 90 seconds for a failed connect() attempt */
/* TODO: engineer an eventual retry scheme */
/*@only@*/
diff --git a/wmbiff/wmbiff.1 b/wmbiff/wmbiff.1
index ae89efc..a7c5f78 100644
--- a/wmbiff/wmbiff.1
+++ b/wmbiff/wmbiff.1
@@ -33,7 +33,7 @@ and also optionally, a command can be executed on mail arrival (for example,
opening your mail reader or playing a sound file).
Pressing mouse button 1 will execute a command, defined in the user's config
-file. Mouse button 3 will execute a command to fetch mail, if defined.
+file. Mouse button 3 will execute a command to fetch mail, if defined.
To restart wmbiff, press mouse button 1 while holding control and shift keys,
or send it SIGUSR1.
@@ -56,7 +56,7 @@ Initial window position.
.B \-c <filename>
Use specified configuration file instead of ~/.wmbiffrc.
.TP
-.B \-debug
+.B \-debug
Print verbose log of progress.
.TP
.B \-fg <color>
@@ -93,7 +93,7 @@ new mail messages, if any, or the total number of messages.
This option also enables the special keyword "beep" (disabled
by default).
.TP
-.B \+w
+.B \+w
Do not use the "withdrawn" state: the wmbiff window will not
be captured as an icon and placed in the dock, but will
instead have its own window. This option starts with a '+'
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 8ed6429..ddc7f3f 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -245,7 +245,7 @@ static int Read_Config_File(char *filename, int *loopinterval)
return 0;
}
while (!feof(fp)) {
- /* skanky: -1 can represent an unparsed line
+ /* skanky: -1 can represent an unparsed line
or an error */
if (ReadLine(fp, setting, value, &mbox_index) == -1)
continue;
diff --git a/wmbiff/wmbiffrc.5.in b/wmbiff/wmbiffrc.5.in
index 66924e3..1800c80 100644
--- a/wmbiff/wmbiffrc.5.in
+++ b/wmbiff/wmbiffrc.5.in
@@ -3,7 +3,7 @@
.\"
.\" @configure_input@
.\"
-.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2002 by
+.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2002 by
.\" Jordi Mallach <jordi at debian.org>
.\"
.\" This is free documentation, see the latest version of the GNU
@@ -85,11 +85,11 @@ See \fBhttp://gnutls.org/manual/gnutls.html#Priority-Strings\fR for more details
\fBinterval\fP
Global interval between mailbox checking. Value is the number of seconds, 5
is the default.
-.TP
+.TP
\fBaskpass\fP
Program run to ask for IMAP passwords, if left empty in the configuration file.
The default is @DEFAULT_ASKPASS at . Can be specified on a per-mailbox basis.
-.TP
+.TP
\fBskinfile\fP
XPM pixmap file to load for the background. If not a full
path, wmbiff will search @SKINDIR@, /usr/share/wmbiff,
@@ -112,7 +112,7 @@ are supported:
.TP
.I mbox
This is a local mbox mailbox. After the prefix, you only need to put the
-path to the mailbox wmbiff needs to read.
+path to the mailbox wmbiff needs to read.
Local mboxes may be specified using shell commands enclosed
in back-ticks. (`s.)
.\"This is also the default.
@@ -127,7 +127,7 @@ mbox:/path/to/mail/debian-devel
.\" .RS
.TP
.I maildir
-This works just like \fImbox\fP above.
+This works just like \fImbox\fP above.
.RS
maildir:[:\fIflags\fP:]/path/to/mail/bugtraq/
.TP
@@ -135,8 +135,8 @@ maildir:[:\fIflags\fP:]/path/to/mail/bugtraq/
.TP
.I F
Flush directory caches by creating (then deleting) a temporary file
-in each maildir prior to checking. This hack speeds up checking
-network-mounted maildirs in cases where directory caching can cause
+in each maildir prior to checking. This hack speeds up checking
+network-mounted maildirs in cases where directory caching can cause
unwanted delays (eg. SFS-mounted maildirs).
.RE
.TP
@@ -144,18 +144,18 @@ unwanted delays (eg. SFS-mounted maildirs).
Using this type, WMBiff will check for mail on a pop3 server using the
specified username, password, host and an optional port number (defaulting
to 110). If your password contains a special character, eg. '@' or ':',
-use the second path format. See Authentication below for a description of
-the auth field.
+use the second path format. See Authentication below for a description of
+the auth field.
.RS
pop3:user:passwd at server[:port] [auth]
.RE
.RS
-pop3:user passwd server[ port] [auth]
+pop3:user passwd server[ port] [auth]
.RE
.TP
.I pop3s
Exactly like pop3, only uses TLS (SSL) when built with gnutls and defaults
-to port 995. @GNUTLS_MAN_STATUS@
+to port 995. @GNUTLS_MAN_STATUS@
.TP
.I imap
These are IMAP4 boxes. As with pop3, WMBiff will report the
@@ -164,11 +164,11 @@ accepts user, optional password, host and optional path to
mailbox and port number. See Authentication below for a
description of the auth field. The password may be left
empty: see askpass above for information on password
-prompting. If your password includes a @, use the
+prompting. If your password includes a @, use the
space delimited form. If it contains a space or #, use the
-askpass option instead. The mailbox field may be quoted,
-e.g., server/"Mail/Eggs and Spam". Mailboxes in subfolders
-may be described as /INBOX.subfolder by some servers and
+askpass option instead. The mailbox field may be quoted,
+e.g., server/"Mail/Eggs and Spam". Mailboxes in subfolders
+may be described as /INBOX.subfolder by some servers and
/Mail/subfolder by others.
.RS
imap:user:passwd at server[/mailbox][:port] [auth]
@@ -221,15 +221,15 @@ Command to be executed on new mail arrival in the given mailbox. Accepts
the special keyword "beep" to use the pc speaker.
.TP
\fBaction.n\fP
-Command to be executed on left mouse click on a mailbox label.
+Command to be executed on left mouse click on a mailbox label.
Accepts
-the special keyword "msglst" to pop up a window of recent message headers
+the special keyword "msglst" to pop up a window of recent message headers
from IMAP or POP3 mailboxes when the left mouse button is held.
.TP
\fBbuttontwo.n\fP
Command to be executed on middle mouse click on a mailbox level.
Accepts
-the special keyword "msglst" to pop up a window of
+the special keyword "msglst" to pop up a window of
recent message headers from IMAP or POP3 mailboxes when the middle mouse button is held.
.TP
\fBinterval.n\fP
@@ -245,11 +245,11 @@ in seconds.
Command to be executed to fetch mail. If not specified, fetching through
wmbiff is disabled completely.
Accepts
-the special keyword "msglst" to pop up a window of recent message headers
+the special keyword "msglst" to pop up a window of recent message headers
from IMAP and POP3 mailboxes when the right mouse button is held down,
though not when fetchinterval is nonzero.
.TP
-\fBdebug.n\fP
+\fBdebug.n\fP
Show debugging messages from this mailbox. Currently
supported values are "all" and "none". The \-debug option
to wmbiff overrides this setting. Since IMAP uses a single
diff --git a/wmgeneral/Makefile.am b/wmgeneral/Makefile.am
index ed65c43..0b3bc5d 100644
--- a/wmgeneral/Makefile.am
+++ b/wmgeneral/Makefile.am
@@ -1,7 +1,7 @@
noinst_LIBRARIES = libwmgeneral.a
libwmgeneral_a_SOURCES = misc.c misc.h wmgeneral.c wmgeneral.h
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
indent:
diff --git a/wmgeneral/misc.c b/wmgeneral/misc.c
index 0b56b4b..3733aa1 100644
--- a/wmgeneral/misc.c
+++ b/wmgeneral/misc.c
@@ -1,9 +1,9 @@
/* dock.c- built-in Dock module for WindowMaker
- *
+ *
* WindowMaker window manager
- *
+ *
* Copyright (c) 1997 Alfredo K. Kojima
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index dc06cb6..ddae0d7 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -17,7 +17,7 @@
* Now supports >256 colors
11/09/1998 (Martijn Pieterse, pieterse at xs4all.nl)
* Removed a bug from parse_rcfile. You could
- not use "start" in a command if a label was
+ not use "start" in a command if a label was
also start.
* Changed the needed geometry string.
We don't use window size, and don't support
@@ -189,7 +189,7 @@ static void GetXPM(XpmIcon * wmgen_local, const char *pixmap_bytes[])
/* For the colormap */
XGetWindowAttributes(display, Root, &attributes);
- /* despite the comment, I still don't understand...
+ /* despite the comment, I still don't understand...
attributes is subsequently unused in this function -ns 11/2002 */
wmgen_local->attributes.valuemask |=
@@ -598,7 +598,7 @@ void openXwindow(int argc, const char *argv[],
if( specified & YNegative ) {
y = DisplayHeight(display, DefaultScreen(display)) - y - pixmask_height;
}
- if( specified & XValue || specified & YValue ) {
+ if( specified & XValue || specified & YValue ) {
XMoveWindow(display, win, x, y);
} */
--
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