From 5a75b2f091db3cd8f721468a60473569827d8f30 Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Thu, 4 Feb 2010 00:33:37 +0000 Subject: [PATCH] Avoid compiler warnings with some versions of GCC. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@201 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- shellinabox/launcher.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c index 0bb2214..7c45850 100644 --- a/shellinabox/launcher.c +++ b/shellinabox/launcher.c @@ -696,7 +696,7 @@ static int forkPty(int *pty, int useLogin, struct Utmp **utmp, // Become the session/process-group leader setsid(); setpgid(0, 0); - + // Redirect standard I/O to the pty dup2(slave, 0); dup2(slave, 1); @@ -736,11 +736,11 @@ static const struct passwd *getPWEnt(uid_t uid) { #endif check(buf = malloc(len)); check(!getpwuid_r(uid, &pwbuf, buf, len, &pw) && pw); - if (!pw->pw_name ) pw->pw_name = ""; - if (!pw->pw_passwd) pw->pw_passwd = ""; - if (!pw->pw_gecos ) pw->pw_gecos = ""; - if (!pw->pw_dir ) pw->pw_dir = ""; - if (!pw->pw_shell ) pw->pw_shell = ""; + if (!pw->pw_name ) pw->pw_name = (char *)""; + if (!pw->pw_passwd) pw->pw_passwd = (char *)""; + if (!pw->pw_gecos ) pw->pw_gecos = (char *)""; + if (!pw->pw_dir ) pw->pw_dir = (char *)""; + if (!pw->pw_shell ) pw->pw_shell = (char *)""; struct passwd *passwd; check(passwd = calloc(sizeof(struct passwd) + strlen(pw->pw_name) +