github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-15 14:22:57 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

Browse source
This commit is contained in:
Mirek Fidler 2026-07-31 11:17:00 +02:00
commit d55c26da69
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/Core/App.cpp
View file

@ -730,13 +730,13 @@ String GetUserName()
::GetUserNameW(temp, &w);
return temp;
#else
size_t bsz = 1024;
Buffer<char> buf(bsz);
struct passwd pwd;
struct passwd *result = NULL;
int rc;
while((rc = getpwuid_r(getuid(), &pwd, buf, bsz, &result)) == ERANGE)
buf.Alloc(bsz *= 2);
size_t bsz = 1024;
Buffer<char> buf(bsz);
struct passwd pwd;
struct passwd *result = NULL;
int rc;
while((rc = getpwuid_r(getuid(), &pwd, buf, bsz, &result)) == ERANGE)
buf.Alloc(bsz *= 2);
return rc == 0 && result ? pwd.pw_name : "";
#endif

3
uppsrc/ide/Debuggers/GdbData.cpp
View file

@ -173,9 +173,6 @@ void Gdb::Autos()
for(;;) {
if(p.Char('.') && p.IsId())
exp << '.';
else
if(p.Char2('-', '>') && p.IsId())
exp << "->";
else
break;
exp << p.ReadId();