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

Avoid compiler warnings with some versions of GCC.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@201 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2010-02-04 00:33:37 +00:00
parent ef5177349e
commit 5a75b2f091
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shellinabox/launcher.c
View file

@ -696,7 +696,7 @@ static int forkPty(int *pty, int useLogin, struct Utmp **utmp,
// Become the session/process-group leader // Become the session/process-group leader
setsid(); setsid();
setpgid(0, 0); setpgid(0, 0);
// Redirect standard I/O to the pty // Redirect standard I/O to the pty
dup2(slave, 0); dup2(slave, 0);
dup2(slave, 1); dup2(slave, 1);
@ -736,11 +736,11 @@ static const struct passwd *getPWEnt(uid_t uid) {
#endif #endif
check(buf = malloc(len)); check(buf = malloc(len));
check(!getpwuid_r(uid, &pwbuf, buf, len, &pw) && pw); check(!getpwuid_r(uid, &pwbuf, buf, len, &pw) && pw);
if (!pw->pw_name ) pw->pw_name = ""; if (!pw->pw_name ) pw->pw_name = (char *)"";
if (!pw->pw_passwd) pw->pw_passwd = ""; if (!pw->pw_passwd) pw->pw_passwd = (char *)"";
if (!pw->pw_gecos ) pw->pw_gecos = ""; if (!pw->pw_gecos ) pw->pw_gecos = (char *)"";
if (!pw->pw_dir ) pw->pw_dir = ""; if (!pw->pw_dir ) pw->pw_dir = (char *)"";
if (!pw->pw_shell ) pw->pw_shell = ""; if (!pw->pw_shell ) pw->pw_shell = (char *)"";
struct passwd *passwd; struct passwd *passwd;
check(passwd = calloc(sizeof(struct passwd) + check(passwd = calloc(sizeof(struct passwd) +
strlen(pw->pw_name) + strlen(pw->pw_name) +