Skip to content

Commit

Permalink
Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
easybe authored and KLuka committed Mar 11, 2015
1 parent 1dd42d6 commit 284d90c
Show file tree
Hide file tree
Showing 25 changed files with 115 additions and 124 deletions.
9 changes: 4 additions & 5 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
2009-04-28 Markus Gutschke <[email protected]>

* Fixed variable expansion in service descriptions.

2009-04-27 Markus Gutschke <[email protected]>

* Released version 2.7
Expand Down Expand Up @@ -268,7 +268,7 @@
cursor if the line ends in spaces.

* Work-around for an IE6 bug when doing HTTPS through proxies.

2009-03-21 Markus Gutschke <[email protected]>

* Released version 2.5
Expand Down Expand Up @@ -374,11 +374,11 @@
* Added CGI mode for demand-loading the shellinaboxd daemon
from a web server. This also allows for the web server to
perform authentication, instead of having shellinaboxd do so.

* Tightened setuid-root operation to no longer allow switching
to arbitrary users/groups. As before, setuid-root remains a
non-standard configuration that is not currently recommended.

* Fixed session management to deal better with torn down
connections. Closed one bug that could have resulted in
permanently orphaned connections, when the browser navigated
Expand All @@ -389,4 +389,3 @@
* First public release of the version 2.0 rewrite. This is the
first release of ShellInABox that supports an AJAX interface
instead of the original Java applet.

1 change: 0 additions & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,3 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:

`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

1 change: 0 additions & 1 deletion README.Fedora
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ some tips on getting things working:
Make sure you assign the correct SELinux labels to this file when copying
it into "/etc/pam.d":
cp -Z system_u:object_r:etc_t:s0 etc-pam.d-shellinabox-example /etc/pam.d/

1 change: 0 additions & 1 deletion TODO
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- Check if there is any way that we could fall back on gnutls if openssl is
unavailable
- Package for distributions other than Debian

2 changes: 1 addition & 1 deletion debian/shellinabox.init
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Short-Description: Shell In A Box Daemon
# Description: Daemon for publishing a login shell at
# http://localhost:SHELLINABOX_PORT
# where default port number is 4200.
# where default port number is 4200.
### END INIT INFO

# Authors: Markus Gutschke <[email protected]>, Marc Singer <[email protected]>
Expand Down
1 change: 0 additions & 1 deletion debian/source/options
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

20 changes: 10 additions & 10 deletions demo/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
<!--
ShellInABox - Make command line applications available as AJAX web applications
Copyright (C) 2008-2010 Markus Gutschke [email protected]
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
In addition to these license terms, the author grants the following
additional rights:
If you modify this program, or any covered work, by linking or
combining it with the OpenSSL project's OpenSSL library (or a
modified version of that library), containing parts covered by the
Expand All @@ -31,20 +31,20 @@
Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
You may at your option choose to remove this additional permission from
the work, or from any part of it.
It is possible to build this program in a way that it loads OpenSSL
libraries at run-time. If doing so, the following notices are required
by the OpenSSL and SSLeay licenses:
This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit. (http://www.openssl.org/)
This product includes cryptographic software written by Eric Young
([email protected])
The most up-to-date version of this program is always available from
http://shellinabox.com
-->
Expand Down
5 changes: 2 additions & 3 deletions demo/demo.jspp
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ Demo.prototype.intrinsic = function() {
}
v = arg1.val().substr(arg1.val().length - v);
value = new this.Value(TYPE_STRING, v, v);
break;
break;
case 'STR$':
value = new this.Value(TYPE_STRING, arg1.toString(),
arg1.toString());
Expand Down Expand Up @@ -909,7 +909,7 @@ Demo.prototype.intrinsic = function() {
v = String.fromCharCode(arg1.val());
value = new this.Value(TYPE_STRING, v, v);
break;
case 'SPC':
case 'SPC':
if (arg1.val() < 0) {
return this.error('Range error');
}
Expand Down Expand Up @@ -1183,4 +1183,3 @@ Demo.prototype.Value.prototype.val = function() {
Demo.prototype.Value.prototype.toString = function() {
return this.s;
};

2 changes: 1 addition & 1 deletion demo/demo.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="ShellInABox Demo" />
<Content type="url" href="http://shellinabox.googlecode.com/git/demo/demo.html" />
Expand Down
2 changes: 1 addition & 1 deletion demo/print-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
margin: 0px;
}

#print {
#print {
margin: 0px;
}

Expand Down
34 changes: 17 additions & 17 deletions demo/styles.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#vt100 a {
#vt100 a {
text-decoration: none;
color: inherit;
}

#vt100 a:hover {
#vt100 a:hover {
text-decoration: underline;
}

Expand All @@ -12,7 +12,7 @@
z-index: 2;
}

#vt100 #reconnect input {
#vt100 #reconnect input {
padding: 1ex;
font-weight: bold;
font-size: x-large;
Expand All @@ -29,7 +29,7 @@
z-index: 2;
}

#vt100 pre {
#vt100 pre {
margin: 0px;
}

Expand All @@ -44,11 +44,11 @@
padding: 1px;
}

#vt100 #console, #vt100 #alt_console, #vt100 #cursor, #vt100 #lineheight, #vt100 .hidden pre {
#vt100 #console, #vt100 #alt_console, #vt100 #cursor, #vt100 #lineheight, #vt100 .hidden pre {
font-family: "DejaVu Sans Mono", "Everson Mono", FreeMono, "Andale Mono", monospace;
}

#vt100 #lineheight {
#vt100 #lineheight {
position: absolute;
visibility: hidden;
}
Expand All @@ -75,7 +75,7 @@
margin: -1px;
}

#vt100 #padding {
#vt100 #padding {
visibility: hidden;
width: 1px;
height: 0px;
Expand All @@ -90,7 +90,7 @@
height: 0px;
}

#vt100 #menu {
#vt100 #menu {
overflow: visible;
position: absolute;
z-index: 3;
Expand All @@ -103,14 +103,14 @@
position: absolute;
}

#vt100 #menu .popup ul {
#vt100 #menu .popup ul {
list-style-type: none;
padding: 0px;
margin: 0px;
min-width: 10em;
}

#vt100 #menu .popup li {
#vt100 #menu .popup li {
padding: 3px 0.5ex 3px 0.5ex;
}

Expand All @@ -123,11 +123,11 @@
color: #AAAAAA;
}

#vt100 #menu .popup hr {
#vt100 #menu .popup hr {
margin: 0.5ex 0px 0.5ex 0px;
}

#vt100 #menu img {
#vt100 #menu img {
margin-right: 0.5ex;
width: 1ex;
height: 1ex;
Expand All @@ -136,7 +136,7 @@
#vt100 #scrollable.inverted { color: #ffffff;
background-color: #000000; }

#vt100 #kbd_button {
#vt100 #kbd_button {
float: left;
position: fixed;
z-index: 0;
Expand Down Expand Up @@ -198,7 +198,7 @@
visibility: hidden;
}

#vt100 #keyboard .shifted {
#vt100 #keyboard .shifted {
display: none;
}

Expand All @@ -218,15 +218,15 @@
display: none;
}

#vt100 #reconnect, #vt100 #cursor, #vt100 #menu, #vt100 #kbd_button, #vt100 #keyboard {
#vt100 #reconnect, #vt100 #cursor, #vt100 #menu, #vt100 #kbd_button, #vt100 #keyboard {
visibility: hidden;
}

#vt100 #scrollable {
#vt100 #scrollable {
overflow: hidden;
}

#vt100 #console, #vt100 #alt_console {
#vt100 #console, #vt100 #alt_console {
overflow: hidden;
width: 1000000ex;
}
Expand Down
4 changes: 2 additions & 2 deletions libhttp/httpconnection.c
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,7 @@ int httpHandleConnection(struct ServerConnection *connection, void *http_,
}
}
}

// If the callback only provided partial data, refill the outgoing
// buffer whenever it runs low.
if (http->isPartialReply && (!http->msg || http->msgLength <= 0)) {
Expand All @@ -1664,7 +1664,7 @@ int httpHandleConnection(struct ServerConnection *connection, void *http_,
http->msg = NULL;
http->msgLength = 0;
}

if ((!(*events || http->isSuspended) || timedOut) && http->sslHndl) {
*events = 0;
serverSetTimeout(connection, 1);
Expand Down
2 changes: 1 addition & 1 deletion libhttp/httpconnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ struct HttpHandler {
int (*websocketHandler)(struct HttpConnection *, void *, int,
const char *, int);
void *arg, *streamingArg;

};

struct HttpConnection *newHttpConnection(struct Server *server, int fd,
Expand Down
2 changes: 1 addition & 1 deletion libhttp/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static int serverCollectFullPayload(struct HttpConnection *http,
free(payload);
}
return rc;

}

static int serverCollectHandler(struct HttpConnection *http, void *handler_) {
Expand Down
1 change: 0 additions & 1 deletion logging/logging.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,3 @@ char *stringPrintfUnchecked(char *buf, const char *fmt, ...)
return s;
}
#endif

24 changes: 12 additions & 12 deletions shellinabox/cgi_root.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
<!--
ShellInABox - Make command line applications available as AJAX web applications
Copyright (C) 2008-2009 Markus Gutschke [email protected]
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
In addition to these license terms, the author grants the following
additional rights:
If you modify this program, or any covered work, by linking or
combining it with the OpenSSL project's OpenSSL library (or a
modified version of that library), containing parts covered by the
Expand All @@ -31,20 +31,20 @@
Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
You may at your option choose to remove this additional permission from
the work, or from any part of it.
It is possible to build this program in a way that it loads OpenSSL
libraries at run-time. If doing so, the following notices are required
by the OpenSSL and SSLeay licenses:
This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit. (http://www.openssl.org/)
This product includes cryptographic software written by Eric Young
([email protected])
([email protected])
The most up-to-date version of this program is always available from
http://shellinabox.com
-->
Expand All @@ -70,7 +70,7 @@
'<frame src="' + url + '#' +
encodeURIComponent(document.location.href) +
',%s' + '">\n' +
'</frameset>');
'</frameset>');
})();
--></script>
</head>
Expand Down
Loading

0 comments on commit 284d90c

Please sign in to comment.