github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a leak

Browse Source
This commit is contained in:
ridiculousfish 2012-02-29 17:55:28 -08:00
parent 8ada404c5f
commit 72da14e414
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common.cpp
View File

@ -559,9 +559,6 @@ wcstring wsetlocale(int category, const wchar_t *locale)
if (locale && wcscmp(locale,L"")){ if (locale && wcscmp(locale,L"")){
lang = wcs2str( locale ); lang = wcs2str( locale );
} }
{
lang = NULL;
}
char * res = setlocale(category,lang); char * res = setlocale(category,lang);
free( lang ); free( lang );
@ -661,6 +658,15 @@ ssize_t write_loop(int fd, const char *buff, size_t count)
return out_cum; return out_cum;
} }
ssize_t read_loop(int fd, void *buff, size_t count)
{
ssize_t result;
do {
result = read(fd, buff, count);
} while (result < 0 && (errno == EAGAIN || errno == EINTR));
return result;
}
void debug( int level, const wchar_t *msg, ... ) void debug( int level, const wchar_t *msg, ... )
{ {
va_list va; va_list va;
@ -743,12 +749,12 @@ void format_int_safe(char buff[128], int val) {
val = -val; val = -val;
while (val > 0) { while (val > 0) {
buff[idx++] = val % 10; buff[idx++] = '0' + (val % 10);
val /= 10; val /= 10;
} }
if (negative) if (negative)
buff[idx++] = '-'; buff[idx++] = '-';
buff[idx++] = 0; buff[idx] = 0;
size_t left = 0, right = idx - 1; size_t left = 0, right = idx - 1;
while (left < right) { while (left < right) {