Author: anevilyak Date: 2010-08-18 05:43:02 +0200 (Wed, 18 Aug 2010) New Revision: 38221 Changeset: http://dev.haiku-os.org/changeset/38221 Ticket: http://dev.haiku-os.org/ticket/6464 Modified: haiku/trunk/src/apps/terminal/Shell.cpp Log: Move the password structs outside of the inner block as well. Fixes #6464. Modified: haiku/trunk/src/apps/terminal/Shell.cpp =================================================================== --- haiku/trunk/src/apps/terminal/Shell.cpp 2010-08-18 00:29:05 UTC (rev 38220) +++ haiku/trunk/src/apps/terminal/Shell.cpp 2010-08-18 03:43:02 UTC (rev 38221) @@ -338,10 +338,10 @@ Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **argv) { const char* defaultArgs[3] = {kDefaultShell, "-l", NULL}; + struct passwd passwdStruct; + struct passwd *passwdResult; + char stringBuffer[256]; if (argv == NULL || argc == 0) { - struct passwd passwdStruct; - struct passwd *passwdResult; - char stringBuffer[256]; if (!getpwuid_r(getuid(), &passwdStruct, stringBuffer, sizeof(stringBuffer), &passwdResult)) { defaultArgs[0] = passwdStruct.pw_shell;