* cygwin.din: Eliminate some newlib wrappers.

* path.cc (get_devn): Only consider first 99 potential com devices.
(get_device_number): Ditto.
* times.cc (_times): Eliminate.
(_times): Renamed from times().
This commit is contained in:
Christopher Faylor 2002-06-06 00:09:55 +00:00
parent 39e65e0113
commit ee964e2f97
4 changed files with 29 additions and 27 deletions

View File

@ -1,3 +1,11 @@
2002-06-05 Christopher Faylor <cgf@redhat.com>
* cygwin.din: Eliminate some newlib wrappers.
* path.cc (get_devn): Only consider first 99 potential com devices.
(get_device_number): Ditto.
* times.cc (_times): Eliminate.
(_times): Renamed from times().
2002-06-05 Christopher Faylor <cgf@redhat.com> 2002-06-05 Christopher Faylor <cgf@redhat.com>
* dir.cc (rmdir): Streamline. Detect attempts to remove directories * dir.cc (rmdir): Streamline. Detect attempts to remove directories

View File

@ -106,8 +106,8 @@ clearerr
_clearerr = clearerr _clearerr = clearerr
clock clock
_clock = clock _clock = clock
close _close
_close = close close = _close
closedir closedir
_closedir = closedir _closedir = closedir
copysign copysign
@ -209,8 +209,8 @@ _fchown = fchown
fchown32 fchown32
fclose fclose
_fclose = fclose _fclose = fclose
fcntl _fcntl
_fcntl = fcntl fcntl = _fcntl
fcvt fcvt
_fcvt = fcvt _fcvt = fcvt
fcvtbuf fcvtbuf
@ -304,8 +304,8 @@ fseek
_fseek = fseek _fseek = fseek
fsetpos fsetpos
_fsetpos = fsetpos _fsetpos = fsetpos
fstat _fstat
_fstat = fstat fstat = _fstat
fstat64 fstat64
fstatfs fstatfs
_fstatfs = fstatfs _fstatfs = fstatfs
@ -472,8 +472,8 @@ jn
_jn = jn _jn = jn
jnf jnf
_jnf = jnf _jnf = jnf
kill _kill
_kill = kill kill = _kill
labs labs
_labs = labs _labs = labs
lchown lchown
@ -521,8 +521,8 @@ login
logout logout
longjmp longjmp
_longjmp = longjmp _longjmp = longjmp
lseek _lseek
_lseek = lseek lseek = _lseek
lseek64 lseek64
lstat = cygwin_lstat lstat = cygwin_lstat
_lstat = cygwin_lstat _lstat = cygwin_lstat
@ -630,8 +630,8 @@ remainderf
_remainderf = remainderf _remainderf = remainderf
remove remove
_remove = remove _remove = remove
rename _rename
_rename = rename rename = _rename
rewind rewind
_rewind = rewind _rewind = rewind
rewinddir rewinddir
@ -764,8 +764,8 @@ sscanf
_sscanf = sscanf _sscanf = sscanf
_sscanf_r _sscanf_r
sscanf_r = _sscanf_r sscanf_r = _sscanf_r
stat _stat
_stat = stat stat = _stat
stat64 stat64
statfs statfs
_statfs = statfs _statfs = statfs
@ -868,8 +868,8 @@ tempnam
_tempnam = tempnam _tempnam = tempnam
time time
_time = time _time = time
times _times
_times = times times = _times
timezone timezone
tmpfile tmpfile
_tmpfile = tmpfile _tmpfile = tmpfile
@ -930,8 +930,8 @@ vsscanf
_vsscanf = vsscanf _vsscanf = vsscanf
_vsscanf_r _vsscanf_r
vsscanf_r = _vsscanf_r vsscanf_r = _vsscanf_r
wait _wait
_wait = wait wait = _wait
waitpid waitpid
_waitpid = waitpid _waitpid = waitpid
wait3 wait3

View File

@ -916,7 +916,7 @@ get_devn (const char *name, int &unit)
devn = FH_MEM; devn = FH_MEM;
unit = 4; unit = 4;
} }
else if (deveqn ("com", 3) && (unit = digits (name + 3)) >= 0) else if (deveqn ("com", 3) && (unit = digits (name + 3)) >= 0 && unit < 100)
devn = FH_SERIAL; devn = FH_SERIAL;
else if (deveqn ("ttyS", 4) && (unit = digits (name + 4)) >= 0) else if (deveqn ("ttyS", 4) && (unit = digits (name + 4)) >= 0)
{ {
@ -1070,7 +1070,7 @@ get_device_number (const char *unix_path, const char *w32_path, int &unit)
if (p) if (p)
unix_path = p + 1; unix_path = p + 1;
if (udeveqn ("com", 3) if (udeveqn ("com", 3)
&& (unit = digits (unix_path + 3)) >= 0) && (unit = digits (unix_path + 3)) >= 0 && unit < 100)
devn = FH_SERIAL; devn = FH_SERIAL;
} }

View File

@ -46,7 +46,7 @@ __to_clock_t (FILETIME * src, int flag)
/* times: POSIX 4.5.2.1 */ /* times: POSIX 4.5.2.1 */
extern "C" clock_t extern "C" clock_t
times (struct tms * buf) _times (struct tms * buf)
{ {
FILETIME creation_time, exit_time, kernel_time, user_time; FILETIME creation_time, exit_time, kernel_time, user_time;
@ -86,12 +86,6 @@ times (struct tms * buf)
return tc; return tc;
} }
extern "C" clock_t
_times (struct tms * buf)
{
return times (buf);
}
/* settimeofday: BSD */ /* settimeofday: BSD */
extern "C" int extern "C" int
settimeofday (const struct timeval *tv, const struct timezone *tz) settimeofday (const struct timeval *tv, const struct timezone *tz)