diff options
author | Roland McGrath <roland@gnu.org> | 1996-05-08 02:07:47 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-05-08 02:07:47 +0000 |
commit | 0e3426bbcf2ff61d06d580fc9362fde79953a281 (patch) | |
tree | 6bc37583e3ea48a41eb273fbb112613b51cf64e6 /stdio/linewrap.h | |
parent | b928942eaa0401de9189a2709188f584425f5ca6 (diff) | |
download | glibc-0e3426bbcf2ff61d06d580fc9362fde79953a281.tar glibc-0e3426bbcf2ff61d06d580fc9362fde79953a281.tar.gz glibc-0e3426bbcf2ff61d06d580fc9362fde79953a281.tar.bz2 glibc-0e3426bbcf2ff61d06d580fc9362fde79953a281.zip |
Tue May 7 19:00:01 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* 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.
Diffstat (limited to 'stdio/linewrap.h')
-rw-r--r-- | stdio/linewrap.h | 189 |
1 files changed, 189 insertions, 0 deletions
diff --git a/stdio/linewrap.h b/stdio/linewrap.h new file mode 100644 index 0000000000..7ba337fad2 --- /dev/null +++ b/stdio/linewrap.h @@ -0,0 +1,189 @@ +/* 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. */ + +#ifndef __LINEWRAP_H__ +#define __LINEWRAP_H__ + +#include <stdio.h> +#include <ctype.h> +#include <string.h> + +#include <features.h> + +#include <string.h> /* Need size_t. */ + +__BEGIN_DECLS + +/* We keep this data for each line-wrapping stream. */ +struct line_wrap_data + { + size_t lmargin, rmargin; /* Left and right margins. */ + size_t wmargin; /* Margin to wrap to, or -1 to truncate. */ + size_t point; /* Current column of last chars flushed. */ + + /* Original cookie and hooks from the stream. */ + void *cookie; + void (*output) (FILE *, int); + __io_close_fn *close; + __io_fileno_fn *fileno; + __io_seek_fn *seek; + }; + +/* 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); + +/* Remove the hooks placed in STREAM by `line_wrap_stream'. */ +void line_unwrap_stream (FILE *stream); + +/* Returns true if STREAM is line wrapped. */ +extern inline int line_wrapped (FILE *stream); + +/* If STREAM is not line-wrapped return -1, else return its left margin. */ +extern size_t line_wrap_lmargin (FILE *stream); + +/* If STREAM is not line-wrapped return -1, else set its left margin to + LMARGIN and return the old value. */ +extern size_t line_wrap_set_lmargin (FILE *stream, size_t lmargin); + +/* If STREAM is not line-wrapped return -1, else return its left margin. */ +extern size_t line_wrap_rmargin (FILE *stream); + +/* If STREAM is not line-wrapped return -1, else set its right margin to + RMARGIN and return the old value. */ +extern size_t line_wrap_set_rmargin (FILE *stream, size_t rmargin); + +/* If STREAM is not line-wrapped return -1, else return its wrap margin. */ +extern size_t line_wrap_wmargin (FILE *stream); + +/* If STREAM is not line-wrapped return -1, else set its left margin to + WMARGIN and return the old value. */ +extern size_t line_wrap_set_wmargin (FILE *stream, size_t wmargin); + +/* If STREAM is not line-wrapped return -1, else return the column number of + the current output point. */ +extern size_t line_wrap_point (FILE *stream); + + +#ifdef __OPTIMIZE__ + +extern void __line_wrap_output (FILE *, int); /* private */ + +/* Returns true if STREAM is line wrapped. */ +extern 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. */ +extern inline 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. */ +extern inline 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. */ +extern inline 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. */ +extern inline 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. */ +extern inline 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. */ +extern inline 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. */ +extern inline size_t +line_wrap_point (FILE *stream) +{ + if (! line_wrapped (stream)) + return -1; + return ((struct line_wrap_data *)stream->__cookie)->point; +} + +#endif /* Optimizing. */ + +__END_DECLS + +#endif /* __LINEWRAP_H__ */ |