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_write): remove rb_str_locktmp(). [ruby-dev:25050]

Browse source 
* io.c (io_fwrite): takes VALUE string as an argument.
  [ruby-dev:25050]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-12-07 06:34:26 +00:00
parent 9b0e00079e
commit 02c45389c5
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
io.c
View file

@ -385,15 +385,15 @@ rb_io_wait_writable(f)
} }
/* writing functions */ /* writing functions */
long static long
io_fwrite(ptr, len, fptr) io_fwrite(str, fptr)
const char *ptr; VALUE str;
long len;
OpenFile *fptr; OpenFile *fptr;
{ {
long n, r; long len, n, r, offset = 0;
FILE *f = GetWriteFile(fptr); FILE *f = GetWriteFile(fptr);
len = RSTRING(str)->len;
if ((n = len) <= 0) return n; if ((n = len) <= 0) return n;
if (fptr->mode & FMODE_SYNC) { if (fptr->mode & FMODE_SYNC) {
io_fflush(f, fptr); io_fflush(f, fptr);
@ -401,28 +401,30 @@ io_fwrite(ptr, len, fptr)
rb_io_check_closed(fptr); rb_io_check_closed(fptr);
} }
retry: retry:
r = write(fileno(f), ptr, n); r = write(fileno(f), RSTRING(str)->ptr+offset, n);
if (r == n) return len; if (r == n) return len;
if (0 <= r) { if (0 <= r) {
ptr += r; offset += r;
n -= r; n -= r;
errno = EAGAIN; errno = EAGAIN;
} }
if (rb_io_wait_writable(fileno(f))) { if (rb_io_wait_writable(fileno(f))) {
rb_io_check_closed(fptr); rb_io_check_closed(fptr);
if (offset < RSTRING(str)->len)
goto retry; goto retry;
} }
return -1L; return -1L;
} }
#if defined(__human68k__) || defined(__vms) #if defined(__human68k__) || defined(__vms)
do { do {
if (fputc(*ptr++, f) == EOF) { if (fputc(RSTRING(str)->ptr+offset, f) == EOF) {
offset++;
if (ferror(f)) return -1L; if (ferror(f)) return -1L;
break; break;
} }
} while (--n > 0); } while (--n > 0);
#else #else
while (errno = 0, ptr += (r = fwrite(ptr, 1, n, f)), (n -= r) > 0) { while (errno = 0, offset += (r = fwrite(RSTRING(str)->ptr+offset, 1, n, f)), (n -= r) > 0) {
if (ferror(f) if (ferror(f)
#if defined __BORLANDC__ #if defined __BORLANDC__
|| errno || errno
@ -434,6 +436,7 @@ io_fwrite(ptr, len, fptr)
if (rb_io_wait_writable(fileno(f))) { if (rb_io_wait_writable(fileno(f))) {
rb_io_check_closed(fptr); rb_io_check_closed(fptr);
clearerr(f); clearerr(f);
if (offset < RSTRING(str)->len)
continue; continue;
} }
return -1L; return -1L;
@ -455,7 +458,7 @@ rb_io_fwrite(ptr, len, f)
of.f2 = NULL; of.f2 = NULL;
of.mode = FMODE_WRITABLE; of.mode = FMODE_WRITABLE;
of.path = NULL; of.path = NULL;
return io_fwrite(ptr, len, &of); return io_fwrite(rb_str_new(ptr, len), &of);
} }
/* /*
@ -496,9 +499,7 @@ io_write(io, str)
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
rb_io_check_writable(fptr); rb_io_check_writable(fptr);
rb_str_locktmp(str); n = io_fwrite(str, fptr);
n = io_fwrite(RSTRING(str)->ptr, RSTRING(str)->len, fptr);
rb_str_unlocktmp(str);
if (n == -1L) rb_sys_fail(fptr->path); if (n == -1L) rb_sys_fail(fptr->path);
if (!(fptr->mode & FMODE_SYNC)) { if (!(fptr->mode & FMODE_SYNC)) {
fptr->mode |= FMODE_WBUF; fptr->mode |= FMODE_WBUF;