Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to make fish work on Cygwin. Firstly a bunch of minor fixes fo the wcs* fallback functions, secondly MSG_DONTWAIT (a socket flag) is set to zero if it isn't already defined

Browse source 
darcs-hash:20060126095706-ac50b-766c1e2c0408dc51fc7379af38005352f7603b1e.gz
This commit is contained in:
axel 2006-01-26 19:57:06 +10:00
parent 5893154823
commit 5054492c6a
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fishd.c
View file

@ -73,6 +73,15 @@ time the original barrier request was sent have been received.
#define UNIX_PATH_MAX 100 #define UNIX_PATH_MAX 100
#endif #endif
/**
Fallback if MSG_DONTWAIT isn't defined. That's actually prerry bad,
and may lead to strange fishd behaviour, but at least it should
work most of the time.
*/
#ifndef MSG_DONTWAIT
#define MSG_DONTWAIT 0
#endif
/** /**
Small greeting to show that fishd is running Small greeting to show that fishd is running
*/ */

16
wutil.c
View file

@ -715,7 +715,7 @@ int wprintf( const wchar_t *filter, ... )
wint_t fgetwc(FILE *stream) wint_t fgetwc(FILE *stream)
{ {
wchar_t res=0; wchar_t res=0;
mbstate_t state=0; mbstate_t state;
memset (&state, '\0', sizeof (state)); memset (&state, '\0', sizeof (state));
while(1) while(1)
@ -763,10 +763,10 @@ wint_t getwc(FILE *stream)
wint_t fputwc(wchar_t wc, FILE *stream) wint_t fputwc(wchar_t wc, FILE *stream)
{ {
int res; int res;
char *s[MB_CUR_MAX+1]; char s[MB_CUR_MAX+1];
memset( s, 0, MB_CUR_MAX+1 ); memset( s, 0, MB_CUR_MAX+1 );
wctomb( s, wc ); wctomb( s, wc );
res = fputs( sm stream ); res = fputs( s, stream );
return res==EOF?WEOF:wc; return res==EOF?WEOF:wc;
} }
@ -782,7 +782,7 @@ wint_t putwc(wchar_t wc, FILE *stream)
/* /*
Used by fallback wcstok. Borrowed from glibc Used by fallback wcstok. Borrowed from glibc
*/ */
static size_t wcsspn (const wchar_t *wcs, static size_t fish_wcsspn (const wchar_t *wcs,
const wchar_t *accept ) const wchar_t *accept )
{ {
register const wchar_t *p; register const wchar_t *p;
@ -806,7 +806,7 @@ static size_t wcsspn (const wchar_t *wcs,
/* /*
Used by fallback wcstok. Borrowed from glibc Used by fallback wcstok. Borrowed from glibc
*/ */
static wchar_t *wcspbrk (const wchar_t *wcs, const wchar_t *accept) static wchar_t *fish_wcspbrk (const wchar_t *wcs, const wchar_t *accept)
{ {
while (*wcs != L'\0') while (*wcs != L'\0')
if (wcschr (accept, *wcs) == NULL) if (wcschr (accept, *wcs) == NULL)
@ -819,7 +819,7 @@ static wchar_t *wcspbrk (const wchar_t *wcs, const wchar_t *accept)
/* /*
Fallback wcstok implementation. Borrowed from glibc. Fallback wcstok implementation. Borrowed from glibc.
*/ */
wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr) wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **save_ptr)
{ {
wchar_t *result; wchar_t *result;
@ -835,7 +835,7 @@ wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)
} }
/* Scan leading delimiters. */ /* Scan leading delimiters. */
wcs += wcsspn (wcs, delim); wcs += fish_wcsspn (wcs, delim);
if (*wcs == L'\0') if (*wcs == L'\0')
{ {
@ -846,7 +846,7 @@ wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)
/* Find the end of the token. */ /* Find the end of the token. */
result = wcs; result = wcs;
wcs = wcspbrk (result, delim); wcs = fish_wcspbrk (result, delim);
if (wcs == NULL) if (wcs == NULL)
{ {

2
wutil.h
View file

@ -12,7 +12,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdarg.h>
/** /**
Call this function on startup to create internal wutil Call this function on startup to create internal wutil