Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
/*
|
|
|
|
Copyright (C) 1993, 1995 Free Software Foundation
|
|
|
|
|
|
|
|
This file is part of the GNU IO Library. This library is free
|
|
|
|
software; you can redistribute it and/or modify it under the
|
|
|
|
terms of the GNU General Public License as published by the
|
|
|
|
Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this library; see the file COPYING. If not, write to the Free
|
|
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
As a special exception, if you link this library with files
|
|
|
|
compiled with a GNU compiler to produce an executable, this does not cause
|
|
|
|
the resulting executable to be covered by the GNU General Public License.
|
|
|
|
This exception does not however invalidate any other reasons why
|
|
|
|
the executable file might be covered by the GNU General Public License. */
|
|
|
|
|
|
|
|
/* Generic or default I/O operations. */
|
|
|
|
|
|
|
|
#include "libioP.h"
|
|
|
|
#ifdef __STDC__
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_un_link, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (fp->_flags & _IO_LINKED) {
|
|
|
|
_IO_FILE **f;
|
|
|
|
for (f = &_IO_list_all; *f != NULL; f = &(*f)->_chain) {
|
|
|
|
if (*f == fp) {
|
|
|
|
*f = fp->_chain;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fp->_flags &= ~_IO_LINKED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_link_in, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if ((fp->_flags & _IO_LINKED) == 0) {
|
|
|
|
fp->_flags |= _IO_LINKED;
|
|
|
|
fp->_chain = _IO_list_all;
|
|
|
|
_IO_list_all = fp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return minimum _pos markers
|
|
|
|
Assumes the current get area is the main get area. */
|
|
|
|
|
|
|
|
_IO_size_t
|
|
|
|
DEFUN(_IO_least_marker, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
_IO_ssize_t least_so_far = fp->_IO_read_end - fp->_IO_read_base;
|
|
|
|
register struct _IO_marker *mark;
|
|
|
|
for (mark = fp->_markers; mark != NULL; mark = mark->_next)
|
|
|
|
if (mark->_pos < least_so_far)
|
|
|
|
least_so_far = mark->_pos;
|
|
|
|
return least_so_far;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Switch current get area from backup buffer to (start of) main get area. */
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_switch_to_main_get_area, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
char *tmp;
|
|
|
|
fp->_flags &= ~_IO_IN_BACKUP;
|
|
|
|
/* Swap _IO_read_end and _IO_save_end. */
|
|
|
|
tmp = fp->_IO_read_end; fp->_IO_read_end= fp->_IO_save_end; fp->_IO_save_end= tmp;
|
|
|
|
/* Swap _IO_read_base and _IO_save_base. */
|
|
|
|
tmp = fp->_IO_read_base; fp->_IO_read_base = fp->_IO_save_base; fp->_IO_save_base = tmp;
|
|
|
|
fp->_IO_read_ptr = fp->_IO_read_base;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Switch current get area from main get area to (end of) backup area. */
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_switch_to_backup_area, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
char *tmp;
|
|
|
|
fp->_flags |= _IO_IN_BACKUP;
|
|
|
|
/* Swap _IO_read_end and _IO_save_end. */
|
|
|
|
tmp = fp->_IO_read_end; fp->_IO_read_end = fp->_IO_save_end; fp->_IO_save_end = tmp;
|
|
|
|
/* Swap _gbase and _IO_save_base. */
|
|
|
|
tmp = fp->_IO_read_base; fp->_IO_read_base = fp->_IO_save_base; fp->_IO_save_base = tmp;
|
|
|
|
fp->_IO_read_ptr = fp->_IO_read_end;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_switch_to_get_mode, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (fp->_IO_write_ptr > fp->_IO_write_base)
|
|
|
|
if (_IO_OVERFLOW (fp, EOF) == EOF)
|
|
|
|
return EOF;
|
|
|
|
if (_IO_in_backup(fp))
|
|
|
|
fp->_IO_read_base = fp->_IO_backup_base;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fp->_IO_read_base = fp->_IO_buf_base;
|
|
|
|
if (fp->_IO_write_ptr > fp->_IO_read_end)
|
|
|
|
fp->_IO_read_end = fp->_IO_write_ptr;
|
|
|
|
}
|
|
|
|
fp->_IO_read_ptr = fp->_IO_write_ptr;
|
|
|
|
|
|
|
|
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_write_end = fp->_IO_read_ptr;
|
|
|
|
|
|
|
|
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_free_backup_area, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (_IO_in_backup (fp))
|
|
|
|
_IO_switch_to_main_get_area(fp); /* Just in case. */
|
|
|
|
free (fp->_IO_save_base);
|
|
|
|
fp->_IO_save_base = NULL;
|
|
|
|
fp->_IO_save_end = NULL;
|
|
|
|
fp->_IO_backup_base = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
int
|
|
|
|
DEFUN(_IO_switch_to_put_mode, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
fp->_IO_write_base = fp->_IO_read_ptr;
|
|
|
|
fp->_IO_write_ptr = fp->_IO_read_ptr;
|
|
|
|
/* Following is wrong if line- or un-buffered? */
|
|
|
|
fp->_IO_write_end = fp->_flags & _IO_IN_BACKUP ? fp->_IO_read_end : fp->_IO_buf_end;
|
|
|
|
|
|
|
|
fp->_IO_read_ptr = fp->_IO_read_end;
|
|
|
|
fp->_IO_read_base = fp->_IO_read_end;
|
|
|
|
|
|
|
|
fp->_flags |= _IO_CURRENTLY_PUTTING;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(__overflow, (f, ch),
|
|
|
|
_IO_FILE *f AND int ch)
|
|
|
|
{
|
|
|
|
return _IO_OVERFLOW (f, ch);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
DEFUN(save_for_backup, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
/* Append [_IO_read_base.._IO_read_end] to backup area. */
|
|
|
|
int least_mark = _IO_least_marker(fp);
|
|
|
|
/* needed_size is how much space we need in the backup area. */
|
|
|
|
int needed_size = (fp->_IO_read_end - fp->_IO_read_base) - least_mark;
|
|
|
|
int current_Bsize = fp->_IO_save_end - fp->_IO_save_base;
|
|
|
|
int avail; /* Extra space available for future expansion. */
|
|
|
|
int delta;
|
|
|
|
struct _IO_marker *mark;
|
|
|
|
if (needed_size > current_Bsize)
|
|
|
|
{
|
|
|
|
char *new_buffer;
|
|
|
|
avail = 100;
|
|
|
|
new_buffer = (char*)malloc(avail+needed_size);
|
|
|
|
if (new_buffer == NULL)
|
|
|
|
return EOF; /* FIXME */
|
|
|
|
if (least_mark < 0)
|
|
|
|
{
|
|
|
|
memcpy(new_buffer + avail,
|
|
|
|
fp->_IO_save_end + least_mark,
|
|
|
|
-least_mark);
|
|
|
|
memcpy(new_buffer +avail - least_mark,
|
|
|
|
fp->_IO_read_base,
|
|
|
|
fp->_IO_read_end - fp->_IO_read_base);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
memcpy(new_buffer + avail,
|
|
|
|
fp->_IO_read_base + least_mark,
|
|
|
|
needed_size);
|
|
|
|
if (fp->_IO_save_base)
|
|
|
|
free (fp->_IO_save_base);
|
|
|
|
fp->_IO_save_base = new_buffer;
|
|
|
|
fp->_IO_save_end = new_buffer + avail + needed_size;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
avail = current_Bsize - needed_size;
|
|
|
|
if (least_mark < 0)
|
|
|
|
{
|
|
|
|
memmove(fp->_IO_save_base + avail,
|
|
|
|
fp->_IO_save_end + least_mark,
|
|
|
|
-least_mark);
|
|
|
|
memcpy(fp->_IO_save_base + avail - least_mark,
|
|
|
|
fp->_IO_read_base,
|
|
|
|
fp->_IO_read_end - fp->_IO_read_base);
|
|
|
|
}
|
|
|
|
else if (needed_size > 0)
|
|
|
|
memcpy(fp->_IO_save_base + avail,
|
|
|
|
fp->_IO_read_base + least_mark,
|
|
|
|
needed_size);
|
|
|
|
}
|
|
|
|
/* FIXME: Dubious arithmetic if pointers are NULL */
|
|
|
|
fp->_IO_backup_base = fp->_IO_save_base + avail;
|
|
|
|
/* Adjust all the streammarkers. */
|
|
|
|
delta = fp->_IO_read_end - fp->_IO_read_base;
|
|
|
|
for (mark = fp->_markers; mark != NULL; mark = mark->_next)
|
|
|
|
mark->_pos -= delta;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(__underflow, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (_IO_in_put_mode(fp))
|
|
|
|
if (_IO_switch_to_get_mode(fp) == EOF) return EOF;
|
|
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
|
|
return *(unsigned char*)fp->_IO_read_ptr;
|
|
|
|
if (_IO_in_backup(fp))
|
|
|
|
{
|
|
|
|
_IO_switch_to_main_get_area(fp);
|
|
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
|
|
return *fp->_IO_read_ptr;
|
|
|
|
}
|
|
|
|
if (_IO_have_markers(fp))
|
|
|
|
{
|
|
|
|
if (save_for_backup (fp))
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
else if (_IO_have_backup(fp))
|
|
|
|
_IO_free_backup_area(fp);
|
|
|
|
return _IO_UNDERFLOW (fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(__uflow, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (_IO_in_put_mode(fp))
|
|
|
|
if (_IO_switch_to_get_mode(fp) == EOF) return EOF;
|
|
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
|
|
return *(unsigned char*)fp->_IO_read_ptr++;
|
|
|
|
if (_IO_in_backup(fp))
|
|
|
|
{
|
|
|
|
_IO_switch_to_main_get_area(fp);
|
|
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
|
|
return *fp->_IO_read_ptr++;
|
|
|
|
}
|
|
|
|
if (_IO_have_markers(fp))
|
|
|
|
{
|
|
|
|
if (save_for_backup (fp))
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
else if (_IO_have_backup(fp))
|
|
|
|
_IO_free_backup_area(fp);
|
|
|
|
return _IO_UFLOW (fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_setb, (f, b, eb, a),
|
|
|
|
_IO_FILE *f AND char *b AND char *eb AND int a)
|
|
|
|
{
|
|
|
|
if (f->_IO_buf_base && !(f->_flags & _IO_USER_BUF))
|
|
|
|
FREE_BUF(f->_IO_buf_base);
|
|
|
|
f->_IO_buf_base = b;
|
|
|
|
f->_IO_buf_end = eb;
|
|
|
|
if (a)
|
|
|
|
f->_flags &= ~_IO_USER_BUF;
|
|
|
|
else
|
|
|
|
f->_flags |= _IO_USER_BUF;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_doallocbuf, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (fp->_IO_buf_base)
|
|
|
|
return;
|
|
|
|
if (!(fp->_flags & _IO_UNBUFFERED))
|
|
|
|
if (_IO_DOALLOCATE (fp) != EOF)
|
|
|
|
return;
|
|
|
|
_IO_setb(fp, fp->_shortbuf, fp->_shortbuf+1, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_default_underflow, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_default_uflow, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
int ch = _IO_UNDERFLOW (fp);
|
|
|
|
if (ch == EOF)
|
|
|
|
return EOF;
|
|
|
|
return *(unsigned char*)fp->_IO_read_ptr++;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_size_t
|
|
|
|
DEFUN(_IO_default_xsputn, (f, data, n),
|
|
|
|
register _IO_FILE *f AND const void *data AND _IO_size_t n)
|
|
|
|
{
|
|
|
|
register const char *s = (char*) data;
|
|
|
|
register _IO_size_t more = n;
|
|
|
|
if (more <= 0)
|
|
|
|
return 0;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
_IO_ssize_t count = f->_IO_write_end - f->_IO_write_ptr; /* Space available. */
|
|
|
|
if (count > 0)
|
|
|
|
{
|
|
|
|
if (count > more)
|
|
|
|
count = more;
|
|
|
|
if (count > 20)
|
|
|
|
{
|
|
|
|
memcpy(f->_IO_write_ptr, s, count);
|
|
|
|
s += count;
|
|
|
|
f->_IO_write_ptr += count;
|
|
|
|
}
|
|
|
|
else if (count <= 0)
|
|
|
|
count = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
register char *p = f->_IO_write_ptr;
|
|
|
|
register _IO_ssize_t i;
|
|
|
|
for (i = count; --i >= 0; ) *p++ = *s++;
|
|
|
|
f->_IO_write_ptr = p;
|
|
|
|
}
|
|
|
|
more -= count;
|
|
|
|
}
|
|
|
|
if (more == 0 || __overflow(f, (unsigned char)*s++) == EOF)
|
|
|
|
break;
|
|
|
|
more--;
|
|
|
|
}
|
|
|
|
return n - more;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_size_t
|
|
|
|
DEFUN(_IO_sgetn, (fp, data, n),
|
|
|
|
_IO_FILE *fp AND void *data AND _IO_size_t n)
|
|
|
|
{
|
|
|
|
/* FIXME handle putback buffer here! */
|
|
|
|
return _IO_XSGETN (fp, data, n);
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_size_t
|
|
|
|
DEFUN(_IO_default_xsgetn, (fp, data, n),
|
|
|
|
_IO_FILE *fp AND void *data AND _IO_size_t n)
|
|
|
|
{
|
|
|
|
register _IO_size_t more = n;
|
|
|
|
register char *s = (char*) data;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
_IO_ssize_t count = fp->_IO_read_end - fp->_IO_read_ptr; /* Data available. */
|
|
|
|
if (count > 0)
|
|
|
|
{
|
|
|
|
if (count > more)
|
|
|
|
count = more;
|
|
|
|
if (count > 20)
|
|
|
|
{
|
|
|
|
memcpy(s, fp->_IO_read_ptr, count);
|
|
|
|
s += count;
|
|
|
|
fp->_IO_read_ptr += count;
|
|
|
|
}
|
|
|
|
else if (count <= 0)
|
|
|
|
count = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
register char *p = fp->_IO_read_ptr;
|
|
|
|
register int i = (int)count;
|
|
|
|
while (--i >= 0) *s++ = *p++;
|
|
|
|
fp->_IO_read_ptr = p;
|
|
|
|
}
|
|
|
|
more -= count;
|
|
|
|
}
|
|
|
|
if (more == 0 || __underflow(fp) == EOF)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return n - more;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_sync, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_FILE*
|
|
|
|
DEFUN(_IO_default_setbuf, (fp, p, len),
|
|
|
|
register _IO_FILE *fp AND char* p AND _IO_ssize_t len)
|
|
|
|
{
|
|
|
|
if (_IO_SYNC (fp) == EOF)
|
|
|
|
return NULL;
|
|
|
|
if (p == NULL || len == 0)
|
|
|
|
{
|
|
|
|
fp->_flags |= _IO_UNBUFFERED;
|
|
|
|
_IO_setb(fp, fp->_shortbuf, fp->_shortbuf+1, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fp->_flags &= ~_IO_UNBUFFERED;
|
|
|
|
_IO_setb(fp, p, p+len, 0);
|
|
|
|
}
|
|
|
|
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_write_end = 0;
|
|
|
|
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_read_end = 0;
|
|
|
|
return fp;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_pos_t
|
|
|
|
DEFUN(_IO_default_seekpos, (fp, pos, mode),
|
|
|
|
_IO_FILE *fp AND _IO_pos_t pos AND int mode)
|
|
|
|
{
|
|
|
|
return _IO_SEEKOFF (fp, _IO_pos_as_off(pos), 0, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_default_doallocate, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
char *buf = ALLOC_BUF(_IO_BUFSIZ);
|
|
|
|
if (buf == NULL)
|
|
|
|
return EOF;
|
|
|
|
_IO_setb(fp, buf, buf+_IO_BUFSIZ, 1);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_init, (fp, flags),
|
|
|
|
register _IO_FILE *fp AND int flags)
|
|
|
|
{
|
|
|
|
fp->_flags = _IO_MAGIC|flags;
|
|
|
|
fp->_IO_buf_base = NULL;
|
|
|
|
fp->_IO_buf_end = NULL;
|
|
|
|
fp->_IO_read_base = NULL;
|
|
|
|
fp->_IO_read_ptr = NULL;
|
|
|
|
fp->_IO_read_end = NULL;
|
|
|
|
fp->_IO_write_base = NULL;
|
|
|
|
fp->_IO_write_ptr = NULL;
|
|
|
|
fp->_IO_write_end = NULL;
|
|
|
|
fp->_chain = NULL; /* Not necessary. */
|
|
|
|
|
|
|
|
fp->_IO_save_base = NULL;
|
|
|
|
fp->_IO_backup_base = NULL;
|
|
|
|
fp->_IO_save_end = NULL;
|
|
|
|
fp->_markers = NULL;
|
|
|
|
fp->_cur_column = 0;
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 02:37:21 +02:00
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
|
|
_IO_mutex_init (fp->_lock);
|
|
|
|
#endif
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_default_sync, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The way the C++ classes are mapped into the C functions in the
|
|
|
|
current implementation, this function can get called twice! */
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_default_finish, (fp),
|
|
|
|
_IO_FILE *fp)
|
|
|
|
{
|
|
|
|
struct _IO_marker *mark;
|
|
|
|
if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
|
|
|
|
{
|
|
|
|
FREE_BUF(fp->_IO_buf_base);
|
|
|
|
fp->_IO_buf_base = fp->_IO_buf_end = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (mark = fp->_markers; mark != NULL; mark = mark->_next)
|
|
|
|
mark->_sbuf = NULL;
|
|
|
|
|
|
|
|
if (fp->_IO_save_base)
|
|
|
|
{
|
|
|
|
free (fp->_IO_save_base);
|
|
|
|
fp->_IO_save_base = NULL;
|
|
|
|
}
|
|
|
|
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 02:37:21 +02:00
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
|
|
_IO_mutex_destroy (fp->_lock);
|
|
|
|
#endif
|
|
|
|
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
_IO_un_link(fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_pos_t
|
|
|
|
DEFUN(_IO_default_seekoff, (fp, offset, dir, mode),
|
|
|
|
register _IO_FILE *fp AND _IO_off_t offset AND int dir AND int mode)
|
|
|
|
{
|
|
|
|
return _IO_pos_BAD;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_sputbackc, (fp, c),
|
|
|
|
register _IO_FILE *fp AND int c)
|
|
|
|
{
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 09:30:38 +01:00
|
|
|
int result;
|
|
|
|
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
if (fp->_IO_read_ptr > fp->_IO_read_base
|
|
|
|
&& (unsigned char)fp->_IO_read_ptr[-1] == (unsigned char)c)
|
|
|
|
{
|
|
|
|
fp->_IO_read_ptr--;
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 09:30:38 +01:00
|
|
|
result = (unsigned char)c;
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
}
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 09:30:38 +01:00
|
|
|
else
|
|
|
|
result = _IO_PBACKFAIL (fp, c);
|
|
|
|
|
|
|
|
if (result != EOF)
|
|
|
|
fp->_flags &= ~_IO_EOF_SEEN;
|
|
|
|
|
|
|
|
return result;
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_sungetc, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 09:30:38 +01:00
|
|
|
int result;
|
|
|
|
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
if (fp->_IO_read_ptr > fp->_IO_read_base)
|
|
|
|
{
|
|
|
|
fp->_IO_read_ptr--;
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 09:30:38 +01:00
|
|
|
result = (unsigned char)*fp->_IO_read_ptr;
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
}
|
|
|
|
else
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 09:30:38 +01:00
|
|
|
result = _IO_PBACKFAIL (fp, EOF);
|
|
|
|
|
|
|
|
if (result != EOF)
|
|
|
|
fp->_flags &= ~_IO_EOF_SEEN;
|
|
|
|
|
|
|
|
return result;
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 04:48:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#if 0 /* Work in progress */
|
|
|
|
void
|
|
|
|
DEFUN(_IO_set_column, (fp, c),
|
|
|
|
register _IO_FILE *fp AND int c)
|
|
|
|
{
|
|
|
|
if (c == -1)
|
|
|
|
fp->_column = -1;
|
|
|
|
else
|
|
|
|
fp->_column = c - (fp->_IO_write_ptr - fp->_IO_write_base);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
int
|
|
|
|
DEFUN(_IO_set_column, (fp, i),
|
|
|
|
register _IO_FILE *fp AND int i)
|
|
|
|
{
|
|
|
|
fp->_cur_column = i+1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
unsigned
|
|
|
|
DEFUN(_IO_adjust_column, (start, line, count),
|
|
|
|
unsigned start AND const char *line AND int count)
|
|
|
|
{
|
|
|
|
register const char *ptr = line + count;
|
|
|
|
while (ptr > line)
|
|
|
|
if (*--ptr == '\n')
|
|
|
|
return line + count - ptr - 1;
|
|
|
|
return start + count;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_get_column, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
if (fp->_cur_column)
|
|
|
|
return _IO_adjust_column(fp->_cur_column - 1,
|
|
|
|
fp->_IO_write_base,
|
|
|
|
fp->_IO_write_ptr - fp->_IO_write_base);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN_VOID(_IO_flush_all)
|
|
|
|
{
|
|
|
|
int result = 0;
|
|
|
|
_IO_FILE *fp;
|
|
|
|
for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
|
|
|
|
if (fp->_IO_write_ptr > fp->_IO_write_base
|
|
|
|
&& _IO_OVERFLOW (fp, EOF) == EOF)
|
|
|
|
result = EOF;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN_VOID(_IO_flush_all_linebuffered)
|
|
|
|
{
|
|
|
|
_IO_FILE *fp;
|
|
|
|
for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
|
|
|
|
if (fp->_flags & _IO_LINE_BUF)
|
|
|
|
_IO_OVERFLOW (fp, EOF);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN_VOID(_IO_unbuffer_all)
|
|
|
|
{
|
|
|
|
_IO_FILE *fp;
|
|
|
|
for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
|
|
|
|
if (! (fp->_flags & _IO_UNBUFFERED))
|
|
|
|
_IO_SETBUF (fp, NULL, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN_VOID(_IO_cleanup)
|
|
|
|
{
|
|
|
|
_IO_flush_all ();
|
|
|
|
|
|
|
|
/* We currently don't have a reliable mechanism for making sure that
|
|
|
|
C++ static destructors are executed in the correct order.
|
|
|
|
So it is possible that other static destructord might want to
|
|
|
|
write to cout - and they're supposed to be able to do so.
|
|
|
|
|
|
|
|
The following will make the standard streambufs be unbuffered,
|
|
|
|
which forces any output from late destructors to be written out. */
|
|
|
|
_IO_unbuffer_all ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_init_marker, (marker, fp),
|
|
|
|
struct _IO_marker *marker AND _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
marker->_sbuf = fp;
|
|
|
|
if (_IO_in_put_mode(fp))
|
|
|
|
_IO_switch_to_get_mode(fp);
|
|
|
|
if (_IO_in_backup(fp))
|
|
|
|
marker->_pos = fp->_IO_read_ptr - fp->_IO_read_end;
|
|
|
|
else
|
|
|
|
marker->_pos = fp->_IO_read_ptr - fp->_IO_read_base;
|
|
|
|
|
|
|
|
/* Should perhaps sort the chain? */
|
|
|
|
marker->_next = fp->_markers;
|
|
|
|
fp->_markers = marker;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_remove_marker, (marker),
|
|
|
|
register struct _IO_marker *marker)
|
|
|
|
{
|
|
|
|
/* Unlink from sb's chain. */
|
|
|
|
register struct _IO_marker **ptr = &marker->_sbuf->_markers;
|
|
|
|
for (; ; ptr = &(*ptr)->_next)
|
|
|
|
{
|
|
|
|
if (*ptr == NULL)
|
|
|
|
break;
|
|
|
|
else if (*ptr == marker)
|
|
|
|
{
|
|
|
|
*ptr = marker->_next;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
if _sbuf has a backup area that is no longer needed, should we delete
|
|
|
|
it now, or wait until the next underflow?
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#define BAD_DELTA EOF
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_marker_difference, (mark1, mark2),
|
|
|
|
struct _IO_marker *mark1 AND struct _IO_marker *mark2)
|
|
|
|
{
|
|
|
|
return mark1->_pos - mark2->_pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return difference between MARK and current posistion of MARK's stream. */
|
|
|
|
int
|
|
|
|
DEFUN(_IO_marker_delta, (mark),
|
|
|
|
struct _IO_marker *mark)
|
|
|
|
{
|
|
|
|
int cur_pos;
|
|
|
|
if (mark->_sbuf == NULL)
|
|
|
|
return BAD_DELTA;
|
|
|
|
if (_IO_in_backup(mark->_sbuf))
|
|
|
|
cur_pos = mark->_sbuf->_IO_read_ptr - mark->_sbuf->_IO_read_end;
|
|
|
|
else
|
|
|
|
cur_pos = mark->_sbuf->_IO_read_ptr - mark->_sbuf->_IO_read_base;
|
|
|
|
return mark->_pos - cur_pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_seekmark, (fp, mark, delta),
|
|
|
|
_IO_FILE *fp AND struct _IO_marker *mark AND int delta)
|
|
|
|
{
|
|
|
|
if (mark->_sbuf != fp)
|
|
|
|
return EOF;
|
|
|
|
if (mark->_pos >= 0)
|
|
|
|
{
|
|
|
|
if (_IO_in_backup(fp))
|
|
|
|
_IO_switch_to_main_get_area(fp);
|
|
|
|
fp->_IO_read_ptr = fp->_IO_read_base + mark->_pos;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!_IO_in_backup(fp))
|
|
|
|
_IO_switch_to_backup_area(fp);
|
|
|
|
fp->_IO_read_ptr = fp->_IO_read_end + mark->_pos;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
DEFUN(_IO_unsave_markers, (fp),
|
|
|
|
register _IO_FILE *fp)
|
|
|
|
{
|
|
|
|
register struct _IO_marker *mark = fp->_markers;
|
|
|
|
if (mark)
|
|
|
|
{
|
|
|
|
#ifdef TODO
|
|
|
|
streampos offset = seekoff(0, ios::cur, ios::in);
|
|
|
|
if (offset != EOF)
|
|
|
|
{
|
|
|
|
offset += eGptr() - Gbase();
|
|
|
|
for ( ; mark != NULL; mark = mark->_next)
|
|
|
|
mark->set_streampos(mark->_pos + offset);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for ( ; mark != NULL; mark = mark->_next)
|
|
|
|
mark->set_streampos(EOF);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
fp->_markers = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_IO_have_backup(fp))
|
|
|
|
_IO_free_backup_area(fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_nobackup_pbackfail, (fp, c),
|
|
|
|
register _IO_FILE *fp AND int c)
|
|
|
|
{
|
|
|
|
if (fp->_IO_read_ptr > fp->_IO_read_base)
|
|
|
|
fp->_IO_read_ptr--;
|
|
|
|
if (c != EOF && *fp->_IO_read_ptr != c)
|
|
|
|
*fp->_IO_read_ptr = c;
|
|
|
|
return (unsigned char)c;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_default_pbackfail, (fp, c),
|
|
|
|
register _IO_FILE *fp AND int c)
|
|
|
|
{
|
|
|
|
if (fp->_IO_read_ptr <= fp->_IO_read_base)
|
|
|
|
{
|
|
|
|
/* Need to handle a filebuf in write mode (switch to read mode). FIXME!*/
|
|
|
|
if (_IO_have_backup(fp) && !_IO_in_backup(fp))
|
|
|
|
_IO_switch_to_backup_area(fp);
|
|
|
|
|
|
|
|
if (!_IO_have_backup(fp))
|
|
|
|
{
|
|
|
|
/* No backup buffer: allocate one. */
|
|
|
|
/* Use nshort buffer, if unused? (probably not) FIXME */
|
|
|
|
int backup_size = 128;
|
|
|
|
char *bbuf = (char*)malloc(backup_size);
|
|
|
|
if (bbuf == NULL)
|
|
|
|
return EOF;
|
|
|
|
fp->_IO_save_base = bbuf;
|
|
|
|
fp->_IO_save_end = fp->_IO_save_base + backup_size;
|
|
|
|
fp->_IO_backup_base = fp->_IO_save_end;
|
|
|
|
_IO_switch_to_backup_area(fp);
|
|
|
|
}
|
|
|
|
else if (fp->_IO_read_ptr <= fp->_IO_read_base)
|
|
|
|
{
|
|
|
|
/* Increase size of existing backup buffer. */
|
|
|
|
_IO_size_t new_size;
|
|
|
|
_IO_size_t old_size = fp->_IO_read_end - fp->_IO_read_base;
|
|
|
|
char *new_buf;
|
|
|
|
new_size = 2 * old_size;
|
|
|
|
new_buf = (char*)malloc(new_size);
|
|
|
|
if (new_buf == NULL)
|
|
|
|
return EOF;
|
|
|
|
memcpy(new_buf+(new_size-old_size), fp->_IO_read_base, old_size);
|
|
|
|
free (fp->_IO_read_base);
|
|
|
|
_IO_setg(fp,
|
|
|
|
new_buf, new_buf+(new_size-old_size), new_buf+new_size);
|
|
|
|
fp->_IO_backup_base = fp->_IO_read_ptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fp->_IO_read_ptr--;
|
|
|
|
if (c != EOF && *fp->_IO_read_ptr != c)
|
|
|
|
*fp->_IO_read_ptr = c;
|
|
|
|
return (unsigned char)*fp->_IO_read_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_pos_t
|
|
|
|
DEFUN(_IO_default_seek, (fp, offset, dir),
|
|
|
|
_IO_FILE *fp AND _IO_off_t offset AND int dir)
|
|
|
|
{
|
|
|
|
return _IO_pos_BAD;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(_IO_default_stat, (fp, st),
|
|
|
|
_IO_FILE *fp AND void* st)
|
|
|
|
{
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_ssize_t
|
|
|
|
DEFUN(_IO_default_read, (fp, data, n),
|
|
|
|
register _IO_FILE* fp AND void* data AND _IO_ssize_t n)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
_IO_ssize_t
|
|
|
|
DEFUN(_IO_default_write, (fp, data, n),
|
|
|
|
register _IO_FILE* fp AND const void* data AND _IO_ssize_t n)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef TODO
|
|
|
|
#if defined(linux)
|
|
|
|
#define IO_CLEANUP ;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef IO_CLEANUP
|
|
|
|
IO_CLEANUP
|
|
|
|
#else
|
|
|
|
struct __io_defs {
|
|
|
|
__io_defs() { }
|
|
|
|
~__io_defs() { _IO_cleanup(); }
|
|
|
|
};
|
|
|
|
__io_defs io_defs__;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* TODO */
|