Skip to content

Commit

Permalink
whitespace cleanup
Browse files Browse the repository at this point in the history
Remove all trailing whitespace from all text files. Some bot sent
Klacke and me a pull request saying it had done this for us, but I
reviewed the diffs and it was affecting lines that shouldn't have been
affected, so perl and I did it ourselves instead.
  • Loading branch information
vinoski committed Oct 31, 2011
1 parent 1b8546f commit 7811247
Show file tree
Hide file tree
Showing 118 changed files with 847 additions and 847 deletions.
182 changes: 91 additions & 91 deletions ChangeLog

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
Copyright (c) 2006, Claes Wikstrom, [email protected]
All rights reserved.

Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of "Yaws" nor the names of its contributors may be
used to endorse or promote products derived from this software without
* Neither the name of "Yaws" nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
4 changes: 2 additions & 2 deletions README.pkg-config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $ pkg-config yaws --modversion
1.80

$ pkg-config yaws --cflags
-I/usr/local/lib/yaws/include
-I/usr/local/lib/yaws/include

$ pkg-config yaws --libs
-pa /usr/local/lib/yaws/ebin
-pa /usr/local/lib/yaws/ebin
10 changes: 5 additions & 5 deletions README.win32-cygwin
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<Note> This is now deprecated as we have a proper
native win32 yaws now.



Yaws on Cygwin/Windows
Written by Bill Robertsson ([email protected])
Thu May 22 13:24:48 CEST 2008

To install.
To install.

You must have cygwin installed. This should include perl,
autoconf and make. There may be other packages that are
Expand All @@ -28,7 +28,7 @@ Extract the yaws archive, e.g.
Change to the newly created directory, start bash and run
configure. I recommend you select something other than the
default prefix, because you probably don't want YAWS in your
cygwin directories.
cygwin directories.

e.g.

Expand Down Expand Up @@ -81,13 +81,13 @@ There is also a section like this.
docroot = c:/bill/erl/yaws/var/yaws/www
listen = 0.0.0.0
dir_listings = true
<ssl>
<ssl>
keyfile = c:/bill/erl/yaws/etc/yaws-key.pem
certfile = c:/bill/erl/yaws/etc/yaws-cert.pem
</ssl>
</server>

SSL ??
SSL ??

Untested:
erlang in a directory with spaces in the name (e.g. "Program Files"
Expand Down
10 changes: 5 additions & 5 deletions applications/chat/chat/chat.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// -*- Fundamental -*-
// -*- Fundamental -*-
// File: chat.js (/var/www/chat.js)
// Author: Johan Bevemyr
// Created: Thu Nov 18 18:25:53 2004
// Purpose:
// Purpose:


// Uncomment this to get debug printouts in a separate window.

Expand Down Expand Up @@ -113,7 +113,7 @@ function create_xmlhttp() {

if (!xmlhttp && typeof XMLHttpRequest!='undefined')
xmlhttp = new XMLHttpRequest();

return xmlhttp;
}

Expand Down Expand Up @@ -200,7 +200,7 @@ function reader_init() {
xml_reader.onload=h;
}
else {
xml_reader.onreadystatechange=h;
xml_reader.onreadystatechange=h;
}

xml_reader.send(null);
Expand Down
2 changes: 1 addition & 1 deletion applications/chat/chat/chat.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ out(A) ->
<script>

function handleEnter(event) {
if (event == null)
if (event == null)
event = window.event;

var keyCode = event.keyCode ? event.keyCode : event.which ?
Expand Down
2 changes: 1 addition & 1 deletion applications/chat/chat/chat_write.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ out(A) ->
Error ->
Error
end.

</erl>
2 changes: 1 addition & 1 deletion applications/chat/include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
../ebin/%.app: %.app.src ../vsn.mk Makefile
perl -e $(APPSCRIPT) "$(VSN)" $(MODULES) < $< > $@

../ebin/%.appup: %.appup
../ebin/%.appup: %.appup
cp $< $@

../ebin/%.$(EMULATOR): %.erl
Expand Down
4 changes: 2 additions & 2 deletions applications/chat/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ MODULES=chat

HDR_FILES=

EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))

ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../chat

#
# Targets
#

all: $(EBIN_FILES)
all: $(EBIN_FILES)

$(EBIN_FILES) : $(HDR_FILES)

Expand Down
8 changes: 4 additions & 4 deletions applications/mail/README
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


This is a very basic WebMail application which is completely
stateless, by design. I didn't want any SQL databases etc
This is a very basic WebMail application which is completely
stateless, by design. I didn't want any SQL databases etc
for storing the emails.

The reason for building it was that I needed a local WebMail
Expand All @@ -19,7 +19,7 @@ To install

- Modify include.mk for your local paths

Run 'make' and 'make install'
Run 'make' and 'make install'



Expand All @@ -32,7 +32,7 @@ Run 'make' and 'make install'

Two things need to be edited in /etc/yaws.conf

1. yaws must find the beam code for mail.beam,
1. yaws must find the beam code for mail.beam,
By default (include.mk) that gets installed in
/var/yaws/ebin

Expand Down
6 changes: 3 additions & 3 deletions applications/mail/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Things to do
need to select the text part for the quote if the email
is of type multipart/alternative. We select text/html
to display.
- page large inboxes with 20 emails per page (sorted in
- page large inboxes with 20 emails per page (sorted in
reverse order with most recently received emails first)
- write an attachement cache to limit the delays when
- write an attachement cache to limit the delays when
fetching an attachement
- code outgoing emails as quoted-printable (must limit max
line length to 74 according to RFC ???)
Expand All @@ -17,5 +17,5 @@ Things to do
- Support imap mail backend system.
- Properly decode encoded attachments.



2 changes: 1 addition & 1 deletion applications/mail/include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
../ebin/%.app: %.app.src ../vsn.mk Makefile
perl -e $(APPSCRIPT) "$(VSN)" $(MODULES) < $< > $@

../ebin/%.appup: %.appup
../ebin/%.appup: %.appup
cp $< $@

../ebin/%.$(EMULATOR): %.erl
Expand Down
2 changes: 1 addition & 1 deletion applications/mail/mail/login.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ out(A) ->
mail:display_login(A, Reason)
end.

</erl>
</erl>
8 changes: 4 additions & 4 deletions applications/mail/mail/mail.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* -*- Java -*-
*
/* -*- Java -*-
*
* File: mail.js
* Author: Johan Bevemyr
* Created: Sun Feb 15 23:40:56 2004
Expand Down Expand Up @@ -35,7 +35,7 @@ function changeActive(depth) {
}
}

function setComposeCmd(val) {
function setComposeCmd(val) {
if (document.compose.to.value.length == 0) {
alert('The To: field must not be empty.');
document.compose.to.focus();
Expand Down Expand Up @@ -87,7 +87,7 @@ function setComposeCmd(val) {
} else if (document.compose.file10.value.length > 0) {
document.compose.attached.value="yes";
}

document.compose.cmd.value=val;
document.compose.submit();
}
Expand Down
4 changes: 2 additions & 2 deletions applications/mail/mail/reply.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ out(A) ->
Error
end.

</erl>
</erl>




Expand Down
2 changes: 1 addition & 1 deletion applications/mail/mail/send.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ out(A) ->
Error
end.

</erl>
</erl>
4 changes: 2 additions & 2 deletions applications/mail/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ include ../vsn.mk
VSN=$(YAWS_VSN)
MODULES=mail attachment smtp mail_html

EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))

ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../mail

#
# Targets
#

all: $(EBIN_FILES)
all: $(EBIN_FILES)

mail_vsn.erl: mail_vsn.template
. ../vsn.mk; sed "s/%VSN%/${MAIL_VSN}/" < mail_vsn.template > mail_vsn.erl
Expand Down
2 changes: 1 addition & 1 deletion applications/mail/src/mail_vsn.template
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

version() -> "%VSN%".



2 changes: 1 addition & 1 deletion applications/mail/src/yaws-webmail.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ popserver = localhost
smtpserver = localhost


## maildomin must be set,
## maildomin must be set,
maildomain = mydomain.org


Expand Down
18 changes: 9 additions & 9 deletions applications/wiki/README
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
This Wiki was originally based on Joe Armstrongs wiki implementation.
This Wiki was originally based on Joe Armstrongs wiki implementation.
It has been ported to yaws and hacked quite a bit in general by Johan
Bevemyr.

To Install
----------

Edit include.mk (change the WIKIINSTALLDIR and EBININSTALLDIR) then
Edit include.mk (change the WIKIINSTALLDIR and EBININSTALLDIR) then

make
make install


Edit your /etc/yaws.conf and include /var/yaws/ebin in the
ebin path ($EBININSTALLDIR), for example

ebin_dir = /var/yaws/ebin

It is possible to have several Wiki instances on the same server.
Just install the wiki/* files in the directory where you want a
It is possible to have several Wiki instances on the same server.
Just install the wiki/* files in the directory where you want a
Wiki instance. This is easily done by running the updateWiki script
and give a new directory as argument.

Expand All @@ -43,10 +43,10 @@ question marks to create the the page.
Look and feel
-------------

The layout of the Wiki pages is to a large extent controlled by
two templates in WikiPreferences.files called template.html
The layout of the Wiki pages is to a large extent controlled by
two templates in WikiPreferences.files called template.html
and template_info.html. There is an alternative look and feel
bundled, just copy template2.html to template.html and
bundled, just copy template2.html to template.html and
template_info2.html to template_info.html.

To maintain
Expand All @@ -58,7 +58,7 @@ updateWiki - takes a number of wiki directories and updates
the .yaws files etc

getPassword - takes a path to a wob file as argument. Will print
the password associated with that node.
the password associated with that node.

importFiles - takes a path to a wob file as argument. Will add
any files in the corresponding .files directory
Expand Down
2 changes: 1 addition & 1 deletion applications/wiki/include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
../ebin/%.app: %.app.src ../vsn.mk Makefile
perl -e $(APPSCRIPT) "$(VSN)" $(MODULES) < $< > $@

../ebin/%.appup: %.appup
../ebin/%.appup: %.appup
cp $< $@

../ebin/%.$(EMULATOR): %.erl
Expand Down
6 changes: 3 additions & 3 deletions applications/wiki/scripts/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# -*- Makefile -*-
# -*- Makefile -*-
# File: Makefile (/usr/local/src/yaws/yaws/applications/wiki/scripts/Makefile)
# Author: Johan Bevemyr
# Created: Sat May 17 13:15:29 2003
# Purpose:
# Purpose:

include ../include.mk

SCRIPTS=importFiles getPassword updateWiki addFile
Expand Down
4 changes: 2 additions & 2 deletions applications/wiki/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ MODULES=wiki \
wiki_plugin_menu \
utils

EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))

ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../wiki

Expand All @@ -31,7 +31,7 @@ ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../wiki



all: $(EBIN_FILES)
all: $(EBIN_FILES)

wiki_vsn.erl: wiki_vsn.template
. ../vsn.mk; sed "s/%VSN%/${WIKI_VSN}/" < wiki_vsn.template > wiki_vsn.erl
Expand Down
Loading

0 comments on commit 7811247

Please sign in to comment.