simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some compiler warnings that newer versions of GCC issue.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@75 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-03-16 15:08:11 +00:00
parent 2d4768183b
commit 85ae25cdf5
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2009-03-16 Markus Gutschke <markus@shellinabox.com>
* Fixed some compiler warnings, that newer versions of GCC issue.
2009-02-27 Markus Gutschke <markus@shellinabox.com> 2009-02-27 Markus Gutschke <markus@shellinabox.com>
* Added fallback on old-style pty's, if /dev/pts is not mounted. * Added fallback on old-style pty's, if /dev/pts is not mounted.

12
config.h
View file

@ -20,13 +20,13 @@
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
/* Define to 1 if you have the <openssl/bio.h> header file. */ /* Define to 1 if you have the <openssl/bio.h> header file. */
#define HAVE_OPENSSL_BIO_H 1 /* #undef HAVE_OPENSSL_BIO_H */
/* Define to 1 if you have the <openssl/err.h> header file. */ /* Define to 1 if you have the <openssl/err.h> header file. */
#define HAVE_OPENSSL_ERR_H 1 /* #undef HAVE_OPENSSL_ERR_H */
/* Define to 1 if you have the <openssl/ssl.h> header file. */ /* Define to 1 if you have the <openssl/ssl.h> header file. */
#define HAVE_OPENSSL_SSL_H 1 /* #undef HAVE_OPENSSL_SSL_H */
/* Define to 1 if you have the <pthread.h> header file. */ /* Define to 1 if you have the <pthread.h> header file. */
#define HAVE_PTHREAD_H 1 #define HAVE_PTHREAD_H 1
@ -35,13 +35,13 @@
#define HAVE_PTSNAME_R 1 #define HAVE_PTSNAME_R 1
/* Define to 1 if you have the <security/pam_appl.h> header file. */ /* Define to 1 if you have the <security/pam_appl.h> header file. */
#define HAVE_SECURITY_PAM_APPL_H 1 /* #undef HAVE_SECURITY_PAM_APPL_H */
/* Define to 1 if you have the <security/pam_client.h> header file. */ /* Define to 1 if you have the <security/pam_client.h> header file. */
#define HAVE_SECURITY_PAM_CLIENT_H 1 /* #undef HAVE_SECURITY_PAM_CLIENT_H */
/* Define to 1 if you have the <security/pam_misc.h> header file. */ /* Define to 1 if you have the <security/pam_misc.h> header file. */
#define HAVE_SECURITY_PAM_MISC_H 1 /* #undef HAVE_SECURITY_PAM_MISC_H */
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1

4
shellinabox/launcher.c
View file

@ -366,7 +366,7 @@ int launchChild(int service, struct Session *session) {
.width = session->width, .width = session->width,
.height = session->height }; .height = session->height };
strncat(request.peerName, httpGetPeerName(session->http), strncat(request.peerName, httpGetPeerName(session->http),
sizeof(request.peerName)); sizeof(request.peerName) - 1);
if (NOINTR(write(launcher, &request, sizeof(request))) != sizeof(request)) { if (NOINTR(write(launcher, &request, sizeof(request))) != sizeof(request)) {
return -1; return -1;
} }
@ -1243,7 +1243,7 @@ static void launcherDaemon(int fd) {
} else { } else {
int fds[2]; int fds[2];
if (!pipe(fds)) { if (!pipe(fds)) {
write(fds[1], "forkpty() failed\r\n", 18); NOINTR(write(fds[1], "forkpty() failed\r\n", 18));
NOINTR(close(fds[1])); NOINTR(close(fds[1]));
pty = fds[0]; pty = fds[0];
pid = 0; pid = 0;