Removed non-standard fields from updwtmpx() wrapper function. This should improve
compatibility with systems that implement updwtmp() but not updwtmpx(). Also, changed Makefile rules in an attempt to improve compatibility with BSD make utilities. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@208 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com
parent
83621919cd
commit
c5d55118af
9 changed files with 26 additions and 31 deletions
20
Makefile.am
20
Makefile.am
|
|
@ -158,43 +158,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav \
|
|||
|
||||
${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
|
||||
@rm -f "$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$<" >"$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
|
||||
|
||||
${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
|
||||
@src="${top_srcdir}/shellinabox/shellinaboxd.man.in"; \
|
||||
|
|
|
|||
20
Makefile.in
20
Makefile.in
|
|
@ -1172,43 +1172,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav \
|
|||
|
||||
${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
|
||||
@rm -f "$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$<" >"$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
|
||||
|
||||
${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
|
||||
@rm -f "$@"
|
||||
ln "$<" "$@"
|
||||
ln "$^" "$@"
|
||||
|
||||
shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
|
||||
@src="${top_srcdir}/shellinabox/shellinaboxd.man.in"; \
|
||||
|
|
|
|||
2
config.h
2
config.h
|
|
@ -153,7 +153,7 @@
|
|||
#define STDC_HEADERS 1
|
||||
|
||||
/* Most recent revision number in the version control system */
|
||||
#define VCS_REVISION "207"
|
||||
#define VCS_REVISION "208"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.10"
|
||||
|
|
|
|||
2
configure
vendored
2
configure
vendored
|
|
@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
|||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
VCS_REVISION=207
|
||||
VCS_REVISION=208
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ AC_PREREQ(2.57)
|
|||
|
||||
dnl This is the one location where the authoritative version number is stored
|
||||
AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
|
||||
VCS_REVISION=207
|
||||
VCS_REVISION=208
|
||||
AC_SUBST(VCS_REVISION)
|
||||
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
|
||||
[Most recent revision number in the version control system])
|
||||
|
|
|
|||
|
|
@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
|
|||
};
|
||||
|
||||
VT100.prototype.about = function() {
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 207)" +
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 208)" +
|
||||
"\nCopyright 2008-2010 by Markus Gutschke\n" +
|
||||
"For more information check http://shellinabox.com");
|
||||
};
|
||||
|
|
|
|||
|
|
@ -503,7 +503,6 @@ static void updwtmpx(const char *wtmpx_file, const struct utmpx *utx) {
|
|||
struct utmp ut = { 0 };
|
||||
ut.ut_type = utx->ut_type;
|
||||
ut.ut_pid = utx->ut_pid;
|
||||
ut.ut_session = utx->ut_session;
|
||||
ut.ut_tv.tv_sec = utx->ut_tv.tv_sec;
|
||||
ut.ut_tv.tv_usec = utx->ut_tv.tv_usec;
|
||||
memcpy(&ut.ut_line, &utx->ut_line,
|
||||
|
|
@ -514,10 +513,6 @@ static void updwtmpx(const char *wtmpx_file, const struct utmpx *utx) {
|
|||
min(sizeof(ut.ut_user), sizeof(utx->ut_user)));
|
||||
memcpy(&ut.ut_host, &utx->ut_host,
|
||||
min(sizeof(ut.ut_host), sizeof(utx->ut_host)));
|
||||
memcpy(&ut.ut_exit, &utx->ut_exit,
|
||||
min(sizeof(ut.ut_exit), sizeof(utx->ut_exit)));
|
||||
memcpy(&ut.ut_addr_v6, &utx->ut_addr_v6,
|
||||
min(sizeof(ut.ut_addr_v6), sizeof(utx->ut_addr_v6)));
|
||||
updwtmp(wtmpx_file, &ut);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
|
|||
};
|
||||
|
||||
ShellInABox.prototype.about = function() {
|
||||
alert("Shell In A Box version " + "2.10 (revision 207)" +
|
||||
alert("Shell In A Box version " + "2.10 (revision 208)" +
|
||||
"\nCopyright 2008-2010 by Markus Gutschke\n" +
|
||||
"For more information check http://shellinabox.com" +
|
||||
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
|
||||
|
|
|
|||
|
|
@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
|
|||
};
|
||||
|
||||
VT100.prototype.about = function() {
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 207)" +
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 208)" +
|
||||
"\nCopyright 2008-2010 by Markus Gutschke\n" +
|
||||
"For more information check http://shellinabox.com");
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue