libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* path.cc (is_unc_share): Remove redundant tests.

This commit is contained in:
Christopher Faylor 2004-05-04 15:09:58 +00:00
parent 423ea473f4
commit 3dcb399b58
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2004-04-20 Pierre Humblet <pierre.humblet@ieee.org>
Christopher Faylor <cgf@alum.bu.edu>
* path.cc (is_unc_share): Remove redundant tests.
2004-05-04 Corinna Vinschen <corinna@vinschen.de> 2004-05-04 Corinna Vinschen <corinna@vinschen.de>
* crt0.o (mainCRTStartup): 16 byte align stack for main function. * crt0.o (mainCRTStartup): 16 byte align stack for main function.

6
winsup/cygwin/Makefile.in
View File

@ -48,12 +48,12 @@ override INSTALL_DATA:=@INSTALL_DATA@
# #
MT_SAFE:=@MT_SAFE@ MT_SAFE:=@MT_SAFE@
DEFS:=@DEFS@ DEFS:=@DEFS@
CCEXTRA:=
CC:=@CC@ CC:=@CC@
# FIXME: Which is it, CC or CC_FOR_TARGET? # FIXME: Which is it, CC or CC_FOR_TARGET?
CC_FOR_TARGET:=$(CC) CC_FOR_TARGET:=$(CC)
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
override CFLAGS+=-MMD ${$(*F)_CFLAGS} -fmerge-constants -ftracer override CFLAGS+=-MMD ${$(*F)_CFLAGS} -fmerge-constants -ftracer $(CCEXTRA)
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CXXFLAGS@ CXXFLAGS=@CXXFLAGS@
@ -362,7 +362,7 @@ maintainer-clean realclean: clean
# Rule to build cygwin.dll # Rule to build cygwin.dll
$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
$(CXX) $(CXXFLAGS) $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ $(CXX) $(CXXFLAGS) -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
$(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \ $(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \
-lgcc $(DLL_IMPORTS) -lgcc $(DLL_IMPORTS)

14
winsup/cygwin/path.cc
View File

@ -936,14 +936,12 @@ win32_device_name (const char *src_path, char *win32_path, device& dev)
static bool __stdcall static bool __stdcall
is_unc_share (const char *path) is_unc_share (const char *path)
{ {
char *p = NULL; const char *p;
int ret = (isdirsep (path[0]) return (isdirsep (path[0])
&& isdirsep (path[1]) && isdirsep (path[1])
&& (isalnum (path[2]) || path[2] == '.') && (isalnum (path[2]) || path[2] == '.')
&& ((p = strpbrk (path + 3, "\\/")) != NULL)); && ((p = strpbrk (path + 3, "\\/")) != NULL)
if (!ret || p == NULL) && isalnum (p[1]));
return false;
return ret && isalnum (p[1]);
} }
/* Normalize a Win32 path. /* Normalize a Win32 path.