kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (io_unread): adhoc workaround for non-binary mode of some DOSish

Browse source 
platforms. this is not perfect and safety, but works with most cases.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-12-28 17:20:24 +00:00
parent 574b329748
commit 57bb055c93
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Dec 29 02:18:45 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (io_unread): adhoc workaround for non-binary mode of some DOSish
platforms. this is not perfect and safety, but works with most cases.
Fri Dec 28 23:53:18 2007 Tanaka Akira <akr@fsij.org> Fri Dec 28 23:53:18 2007 Tanaka Akira <akr@fsij.org>
* ext/strscan/strscan.c (str_new): new function for allocate an string * ext/strscan/strscan.c (str_new): new function for allocate an string

12
io.c
View file

@ -284,7 +284,19 @@ io_unread(rb_io_t *fptr)
if (fptr->rbuf_len == 0 || fptr->mode & FMODE_DUPLEX) if (fptr->rbuf_len == 0 || fptr->mode & FMODE_DUPLEX)
return; return;
/* xxx: target position may be negative if buffer is filled by ungetc */ /* xxx: target position may be negative if buffer is filled by ungetc */
#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
if (!(fptr->mode & FMODE_BINMODE)) {
int len = fptr->rbuf_len;
while (fptr->rbuf_len-- > 0) {
if (fptr->rbuf[fptr->rbuf_len] == '\n')
++len;
}
r = lseek(fptr->fd, -len, SEEK_CUR);
}
else
#else
r = lseek(fptr->fd, -fptr->rbuf_len, SEEK_CUR); r = lseek(fptr->fd, -fptr->rbuf_len, SEEK_CUR);
#endif
if (r < 0) { if (r < 0) {
if (errno == ESPIPE) if (errno == ESPIPE)
fptr->mode |= FMODE_DUPLEX; fptr->mode |= FMODE_DUPLEX;

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-12-28" #define RUBY_RELEASE_DATE "2007-12-29"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20071228 #define RUBY_RELEASE_CODE 20071229
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 28 #define RUBY_RELEASE_DAY 29
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];