mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
0e3426bbcf
* string/argz-extract.c: Remove const from decl. * string/argz.h: Here too. * Makeconfig (version.mk): Fix regexp in sed cmd. Depend on $(..)Makeconfig. * GMP code updated from gmp-2.0 release. * stdlib/Makefile (mpn-routines): Removed add_1, added inlines. * sysdeps/generic/add_1.c: File removed. * stdlib/strtod.c: mp_limb is now mp_limb_t. * stdlib/fpioconst.c, stdlib/fpioconst.h: Likewise. * stdio-common/_itoa.c: Likewise. * stdio-common/printf_fp.c: Likewise. Don't include ansidecl.h. * sysdeps/mach/hurd/getcwd.c: Use io_identity instead of io_stat. * shlib-versions: New file. * Makerules (soversions.mk): New target, include file generated from shlib-versions. Moved shared library rules before installation rules. Rewrote shared library installation rules for versioned libraries. * math/Makefile (libm.so-version): Variable removed. * sysdeps/mach/hurd/i386/exc2signal.c: Use struct hurd_signal_detail. * hurd/report-wait.c (_S_msg_describe_ports): New function. * configure.in: Add AC_PROG_LN_S check. * config.make.in (LN_S): New variable. Sun May 5 03:10:44 1996 Ulrich Drepper <drepper@cygnus.com> * misc/efgcvt_r.c (ecvt_r): Work aroung gcc bug. gcc does not know about weak aliases now and optimizes necessary `if' statement away. * posix/unistd.h: Add swapoff prototype. * sysdeps/generic/confname.h: Add even more POSIX.4 symbols. * sysdeps/posix/fpathconf.c (__fpathconf): Get information for _PC_PATH_MAX from fstatfs function if available. * sysdeps/posix/sysconf.c: Add code to handle _SC_AIO_LISTIO_MAX, _SC_AIO_MAX, _SC_AIO_PRIO_DELTA_MAX, _SC_DELAYTIMER_MAX, _SC_MQ_OPEN_MAX, _SC_MQ_PRIO_MAX, _SC_RTSIG_MAX, _SC_SEM_NSEMS_MAX, _SC_SEM_VALUE_MAX, _SC_SIGQUEUE_MAX, and _SC_TIMER_MAX. * sysdeps/unix/sysv/sysv4/sysconf.c: Ditto. * sysdeps/stub/swapoff.c: New file. Stub version for swapoff function. * sysdeps/unix/syscalls.list: Add swapoff. * sysdeps/unix/sysv/linux/Dist: Add sys/acct.h. * sysdeps/unix/sysv/linux/Makefile [$(subdir) == misc] (sysdep_routines): Add mount, umount, llseek, setfsgid, setfsuid, sysinfo, and uselib. (headers): Add sys/sysinfo.h. * sysdeps/unix/sysv/linux/gethostid.c: Prevent warning. * sysdeps/unix/sysv/linux/i386/Makefile [$(subdir) == misc] (sysdep_routines): Add ioperm, iopl, and vm86. (headers): Add sys/perm.h and sys/vm86.h. * sysdeps/unix/sysv/linux/i386/sys/perm.h: New file. Contains prototypes for iopl and ioperm. * sysdeps/unix/sysv/linux/i386/sys/vm86.h: New file. Contains prototype for vm86. * sysdeps/unix/sysv/linux/i386/syscalls.list: New file. Add vm86 system call. * sysdeps/unix/sysv/linux/sys/acct.h: New file. Contains prototypes for acct function. * sysdeps/unix/sysv/linux/sys/socket.h: Provide real header file with prototypes. * sysdeps/unix/sysv/linux/sys/sysinfo.h: New file. Contains prototype for sysinfo function. * sysdeps/unix/sysv/linux/syscalls.list: Add flock, ioperm, iopl, llseek, setfsgid, setfsuid, sysinfo, and uselib. * sysdeps/unix/sysv/linux/sysconf.c: Instead of duplicating posix/sysconf.c now only handle cases different to that implementation. Tue May 7 15:08:19 1996 Miles Bader <miles@gnu.ai.mit.edu> * stdio/linewrap.c (__line_wrap_output): Renamed from lwoutput (all references changed). Now exported. * stdio/linewrap.c (struct data): Type deleted (moved to linewrap.h). (wrap_stream, unwrap_stream, lwclose, lwfileno, lwoutput, line_wrap_stream, line_unwrap_stream): Use struct line_wrap_data instead of struct data. (lwoutput, line_wrap_stream, line_unwrap_stream): Rename various occurences of `wrap' and `wrapmargin' to `wmargin'. (line_wrapped, line_wrap_lmargin, line_wrap_set_lmargin, line_wrap_rmargin, line_wrap_set_rmargin, line_wrap_wmargin, line_wrap_set_wmargin, line_wrap_point): New functions. * stdio/linewrap.h: New file. * stdio/Makefile (headers): Add linewrap.h. Tue May 7 14:19:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/i386/Makefile: File removed. * stdio/stdio.h: Remove line_wrap_stream, line_unwap_stream decls. * sysdeps/unix/sysv/linux/schedbits.h: New file. Tue May 7 13:47:02 1996 Miles Bader <miles@gnu.ai.mit.edu> * stdio/linewrap.c (struct data): Make margin fields not-pointers. (lwoutput): Adjust uses acordingly. * sysdeps/mach/hurd/fdatasync.c: New file. * sysdeps/mach/hurd/fsync.c: Pass new flag to file_sync. * sysdeps/mach/hurd/xmknod.c: Pass new flag to dir_link. * sysdeps/mach/hurd/symlink.c: Likewise. * sysdeps/mach/hurd/link.c: Likewise. * sysdeps/mach/hurd/bind.c: Likewise. * hurd/hurdsig.c (write_corefile): Likewise. * hurd/hurdsig.c (write_corefile): Pass cttyid port to crash server. * sysdeps/mach/hurd/fpathconf.c: RPC takes int pointer, not long int. * sysdeps/mach/hurd/_exit.c (_hurd_exit): Pass sigcode arg to proc_mark_exit. * sysdeps/mach/hurd/dl-sysdep.c (_exit): Likewise. * sysdeps/mach/hurd/wait4.c: Pass sigcode arg to proc_wait. * sysdeps/mach/hurd/rename.c: Pass new flag to dir_rename. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Use struct hurd_signal_detail. * hurd/catch-exc.c (_S_catch_exception_raise): Likewise. * hurd/hurd-raise.c (_hurd_raise_signal): Likewise. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/setitimer.c (restart_itimer): Likewise. * hurd/hurd/signal.h: Fix _hurd_exception2signal prototype. * hurd/hurdsig.c (write_corefile): Take const struct hurd_signal_detail * arg. Pass all details to crash_dump_task. (_hurd_internal_post_signal): Pass DETAIL to write_corefile. (_hurd_internal_post_signal: suspend): Pass code and error to proc_mark_stop. * hurd/hurdprio.c (_hurd_priority_which_map): Pass flags arg to proc_getprocinfo by reference.
425 lines
11 KiB
C
425 lines
11 KiB
C
/* Word-wrapping and line-truncating streams.
|
||
Copyright (C) 1996 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
The GNU C 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
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with the GNU C Library; see the file COPYING.LIB. If
|
||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
#include <stdio.h>
|
||
#include <ctype.h>
|
||
#include <string.h>
|
||
#include <stdlib.h>
|
||
|
||
#include <linewrap.h>
|
||
|
||
void __line_wrap_output (FILE *, int);
|
||
|
||
/* Install our hooks into a stream. */
|
||
static inline void
|
||
wrap_stream (FILE *stream, struct line_wrap_data *d)
|
||
{
|
||
static __io_close_fn lwclose;
|
||
static __io_fileno_fn lwfileno;
|
||
|
||
stream->__cookie = d;
|
||
stream->__room_funcs.__output = &__line_wrap_output;
|
||
stream->__io_funcs.__close = &lwclose;
|
||
stream->__io_funcs.__fileno = &lwfileno;
|
||
stream->__io_funcs.__seek = NULL; /* Cannot seek. */
|
||
}
|
||
|
||
/* Restore a stream to its original state. */
|
||
static inline void
|
||
unwrap_stream (FILE *stream, struct line_wrap_data *d)
|
||
{
|
||
stream->__cookie = d->cookie;
|
||
stream->__room_funcs.__output = d->output;
|
||
stream->__io_funcs.__close = d->close;
|
||
stream->__io_funcs.__fileno = d->fileno;
|
||
stream->__io_funcs.__seek = d->seek;
|
||
}
|
||
|
||
/* Cookie io functions that might get called on a wrapped stream.
|
||
Must pass the original cookie to the original functions. */
|
||
|
||
static int
|
||
lwclose (void *cookie)
|
||
{
|
||
struct line_wrap_data *d = cookie;
|
||
return (*d->close) (d->cookie);
|
||
}
|
||
|
||
static int
|
||
lwfileno (void *cookie)
|
||
{
|
||
struct line_wrap_data *d = cookie;
|
||
return (*d->fileno) (d->cookie);
|
||
}
|
||
|
||
/* This function is called when STREAM must be flushed.
|
||
C is EOF or a character to be appended to the buffer contents. */
|
||
void
|
||
__line_wrap_output (FILE *stream, int c)
|
||
{
|
||
char *buf, *nl;
|
||
size_t len;
|
||
|
||
/* Extract our data and restore the stream's original cookie
|
||
and output function so writes we do really go out. */
|
||
struct line_wrap_data *d = stream->__cookie;
|
||
unwrap_stream (stream, d);
|
||
|
||
/* Scan the buffer for newlines. */
|
||
buf = stream->__buffer;
|
||
while ((buf < stream->__bufp || (c != EOF && c != '\n')) && !stream->__error)
|
||
{
|
||
size_t r;
|
||
|
||
if (d->point == 0 && d->lmargin != 0)
|
||
{
|
||
/* We are starting a new line. Print spaces to the left margin. */
|
||
const size_t pad = d->lmargin;
|
||
if (stream->__bufp + pad < stream->__put_limit)
|
||
{
|
||
/* We can fit in them in the buffer by moving the
|
||
buffer text up and filling in the beginning. */
|
||
memmove (buf + pad, buf, stream->__bufp - buf);
|
||
stream->__bufp += pad; /* Compensate for bigger buffer. */
|
||
memset (buf, ' ', pad); /* Fill in the spaces. */
|
||
buf += pad; /* Don't bother searching them. */
|
||
}
|
||
else
|
||
{
|
||
/* No buffer space for spaces. Must flush. */
|
||
size_t i;
|
||
char *olimit;
|
||
|
||
len = stream->__bufp - buf;
|
||
olimit = stream->__put_limit;
|
||
stream->__bufp = stream->__put_limit = buf;
|
||
for (i = 0; i < pad; ++i)
|
||
(*d->output) (stream, ' ');
|
||
stream->__put_limit = olimit;
|
||
memcpy (stream->__bufp, buf, len);
|
||
stream->__bufp += len;
|
||
}
|
||
d->point = pad;
|
||
}
|
||
|
||
len = stream->__bufp - buf;
|
||
nl = memchr (buf, '\n', len);
|
||
|
||
if (!nl)
|
||
{
|
||
/* The buffer ends in a partial line. */
|
||
|
||
if (d->point + len + (c != EOF && c != '\n') <= d->rmargin)
|
||
{
|
||
/* The remaining buffer text is a partial line and fits
|
||
within the maximum line width. Advance point for the
|
||
characters to be written and stop scanning. */
|
||
d->point += len;
|
||
break;
|
||
}
|
||
else
|
||
/* Set the end-of-line pointer for the code below to
|
||
the end of the buffer. */
|
||
nl = stream->__bufp;
|
||
}
|
||
else if (d->point + (nl - buf) <= d->rmargin)
|
||
{
|
||
/* The buffer contains a full line that fits within the maximum
|
||
line width. Reset point and scan the next line. */
|
||
d->point = 0;
|
||
buf = nl + 1;
|
||
continue;
|
||
}
|
||
|
||
/* This line is too long. */
|
||
r = d->rmargin;
|
||
|
||
if (d->wmargin < 0)
|
||
{
|
||
/* Truncate the line by overwriting the excess with the
|
||
newline and anything after it in the buffer. */
|
||
if (nl < stream->__bufp)
|
||
{
|
||
memcpy (buf + (r - d->point), nl, stream->__bufp - nl);
|
||
stream->__bufp -= buf + (r - d->point) - nl;
|
||
/* Reset point for the next line and start scanning it. */
|
||
d->point = 0;
|
||
buf += r + 1; /* Skip full line plus \n. */
|
||
}
|
||
else
|
||
{
|
||
/* The buffer ends with a partial line that is beyond the
|
||
maximum line width. Advance point for the characters
|
||
written, and discard those past the max from the buffer. */
|
||
d->point += len;
|
||
stream->__bufp -= d->point - r;
|
||
if (c != '\n')
|
||
/* Swallow the extra character too. */
|
||
c = EOF;
|
||
break;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
/* Do word wrap. Go to the column just past the maximum line
|
||
width and scan back for the beginning of the word there.
|
||
Then insert a line break. */
|
||
|
||
char *p, *nextline;
|
||
int i;
|
||
|
||
p = buf + (r + 1 - d->point);
|
||
while (p >= buf && !isblank (*p))
|
||
--p;
|
||
nextline = p + 1; /* This will begin the next line. */
|
||
|
||
if (nextline > buf)
|
||
{
|
||
/* Swallow separating blanks. */
|
||
do
|
||
--p;
|
||
while (isblank (*p));
|
||
nl = p + 1; /* The newline will replace the first blank. */
|
||
}
|
||
else
|
||
{
|
||
/* A single word that is greater than the maximum line width.
|
||
Oh well. Put it on an overlong line by itself. */
|
||
p = buf + (r + 1 - d->point);
|
||
/* Find the end of the long word. */
|
||
do
|
||
++p;
|
||
while (p < nl && !isblank (*p));
|
||
if (p == nl)
|
||
{
|
||
/* It already ends a line. No fussing required. */
|
||
d->point = 0;
|
||
buf = nl + 1;
|
||
continue;
|
||
}
|
||
/* We will move the newline to replace the first blank. */
|
||
nl = p;
|
||
/* Swallow separating blanks. */
|
||
do
|
||
++p;
|
||
while (isblank (*p));
|
||
/* The next line will start here. */
|
||
nextline = p;
|
||
}
|
||
|
||
/* Temporarily reset bufp to include just the first line. */
|
||
stream->__bufp = nl;
|
||
if (nextline - (nl + 1) < d->wmargin)
|
||
/* The margin needs more blanks than we removed.
|
||
Output the first line so we can use the space. */
|
||
(*d->output) (stream, '\n');
|
||
else
|
||
/* We can fit the newline and blanks in before
|
||
the next word. */
|
||
*stream->__bufp++ = '\n';
|
||
|
||
/* Reset the counter of what has been output this line. */
|
||
d->point = 0;
|
||
|
||
/* Add blanks up to the wrap margin column. */
|
||
for (i = 0; i < d->wmargin; ++i)
|
||
*stream->__bufp++ = ' ';
|
||
|
||
/* Copy the tail of the original buffer into the current buffer
|
||
position. */
|
||
if (stream->__bufp != nextline)
|
||
memcpy (stream->__bufp, nextline, buf + len - nextline);
|
||
len -= nextline - buf;
|
||
|
||
/* Continue the scan on the remaining lines in the buffer. */
|
||
buf = stream->__bufp;
|
||
|
||
/* Restore bufp to include all the remaining text. */
|
||
stream->__bufp += len;
|
||
}
|
||
}
|
||
|
||
if (!stream->__error)
|
||
{
|
||
(*d->output) (stream, c);
|
||
if (c == '\n')
|
||
d->point = 0;
|
||
else if (c != EOF)
|
||
++d->point;
|
||
}
|
||
|
||
wrap_stream (stream, d);
|
||
}
|
||
|
||
/* Modify STREAM so that it prefixes lines written on it with LMARGIN spaces
|
||
and limits them to RMARGIN columns total. If WMARGIN >= 0, words that
|
||
extend past RMARGIN are wrapped by replacing the whitespace before them
|
||
with a newline and WMARGIN spaces. Otherwise, chars beyond RMARGIN are
|
||
simply dropped until a newline. Returns STREAM after modifying it, or
|
||
NULL if there was an error. */
|
||
FILE *
|
||
line_wrap_stream (FILE *stream, size_t lmargin, size_t rmargin, size_t wmargin)
|
||
{
|
||
struct line_wrap_data *d = malloc (sizeof *d);
|
||
|
||
if (!d)
|
||
return NULL;
|
||
|
||
/* Ensure full setup before we start tweaking. */
|
||
fflush (stream);
|
||
|
||
/* Initialize our wrapping state. */
|
||
d->point = 0;
|
||
|
||
/* Save the original cookie and output and close hooks. */
|
||
d->cookie = stream->__cookie;
|
||
d->output = stream->__room_funcs.__output;
|
||
d->close = stream->__io_funcs.__close;
|
||
d->fileno = stream->__io_funcs.__fileno;
|
||
|
||
/* Take over the stream. */
|
||
wrap_stream (stream, d);
|
||
|
||
/* Line-wrapping streams are normally line-buffered. This is not
|
||
required, just assumed desired. The wrapping feature should continue
|
||
to work if the stream is switched to full or no buffering. */
|
||
stream->__linebuf = 1;
|
||
|
||
d->lmargin = lmargin;
|
||
d->rmargin = rmargin;
|
||
d->wmargin = wmargin;
|
||
|
||
return stream;
|
||
}
|
||
|
||
/* Remove the hooks placed in STREAM by `line_wrap_stream'. */
|
||
void
|
||
line_unwrap_stream (FILE *stream)
|
||
{
|
||
struct line_wrap_data *d = stream->__cookie;
|
||
unwrap_stream (stream, d);
|
||
free (d);
|
||
}
|
||
|
||
/* Functions on wrapped streams. */
|
||
|
||
/* Returns true if STREAM is line wrapped. */
|
||
inline int
|
||
line_wrapped (FILE *stream)
|
||
{
|
||
return (stream->__room_funcs.__output == &__line_wrap_output);
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else return its left margin. */
|
||
size_t
|
||
line_wrap_lmargin (FILE *stream)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
return ((struct line_wrap_data *)stream->__cookie)->lmargin;
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else set its left margin to
|
||
LMARGIN and return the old value. */
|
||
size_t
|
||
line_wrap_set_lmargin (FILE *stream, size_t lmargin)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
else
|
||
{
|
||
struct line_wrap_data *d = stream->__cookie;
|
||
size_t old = d->lmargin;
|
||
d->lmargin = lmargin;
|
||
return old;
|
||
}
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else return its left margin. */
|
||
size_t
|
||
line_wrap_rmargin (FILE *stream)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
return ((struct line_wrap_data *)stream->__cookie)->rmargin;
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else set its right margin to
|
||
RMARGIN and return the old value. */
|
||
size_t
|
||
line_wrap_set_rmargin (FILE *stream, size_t rmargin)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
else
|
||
{
|
||
struct line_wrap_data *d = stream->__cookie;
|
||
size_t old = d->rmargin;
|
||
d->rmargin = rmargin;
|
||
return old;
|
||
}
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else return its wrap margin. */
|
||
size_t
|
||
line_wrap_wmargin (FILE *stream)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
return ((struct line_wrap_data *)stream->__cookie)->wmargin;
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else set its left margin to
|
||
WMARGIN and return the old value. */
|
||
size_t
|
||
line_wrap_set_wmargin (FILE *stream, size_t wmargin)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
else
|
||
{
|
||
struct line_wrap_data *d = stream->__cookie;
|
||
size_t old = d->wmargin;
|
||
d->wmargin = wmargin;
|
||
return old;
|
||
}
|
||
}
|
||
|
||
/* If STREAM is not line-wrapped return -1, else return the column number of
|
||
the current output point. */
|
||
size_t
|
||
line_wrap_point (FILE *stream)
|
||
{
|
||
if (! line_wrapped (stream))
|
||
return -1;
|
||
return ((struct line_wrap_data *)stream->__cookie)->point;
|
||
}
|
||
|
||
#ifdef TEST
|
||
int
|
||
main (int argc, char **argv)
|
||
{
|
||
int c;
|
||
puts ("stopme");
|
||
line_wrap_stream (stdout, atoi (argv[1]), atoi (argv[2] ?: "-1"));
|
||
while ((c = getchar()) != EOF) putchar (c);
|
||
return 0;
|
||
}
|
||
#endif
|