aboutsummaryrefslogtreecommitdiff
path: root/stdio/linewrap.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-08 02:07:47 +0000
committerRoland McGrath <roland@gnu.org>1996-05-08 02:07:47 +0000
commit0e3426bbcf2ff61d06d580fc9362fde79953a281 (patch)
tree6bc37583e3ea48a41eb273fbb112613b51cf64e6 /stdio/linewrap.c
parentb928942eaa0401de9189a2709188f584425f5ca6 (diff)
downloadglibc-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.c')
-rw-r--r--stdio/linewrap.c183
1 files changed, 127 insertions, 56 deletions
diff --git a/stdio/linewrap.c b/stdio/linewrap.c
index e821cc3575..7f6576f29b 100644
--- a/stdio/linewrap.c
+++ b/stdio/linewrap.c
@@ -22,42 +22,27 @@ Cambridge, MA 02139, USA. */
#include <string.h>
#include <stdlib.h>
-/* We keep this data for each line-wrapping stream. */
-
-struct data
- {
- const size_t *lmargin, *rmargin; /* Left and right margins. */
- const size_t *wrapmargin; /* Margin to wrap to, or null 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;
- };
+#include <linewrap.h>
+
+void __line_wrap_output (FILE *, int);
/* Install our hooks into a stream. */
-
static inline void
-wrap_stream (FILE *stream, struct data *d)
+wrap_stream (FILE *stream, struct line_wrap_data *d)
{
- static void lwoutput (FILE *, int);
static __io_close_fn lwclose;
static __io_fileno_fn lwfileno;
stream->__cookie = d;
- stream->__room_funcs.__output = &lwoutput;
+ 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 data *d)
+unwrap_stream (FILE *stream, struct line_wrap_data *d)
{
stream->__cookie = d->cookie;
stream->__room_funcs.__output = d->output;
@@ -72,41 +57,40 @@ unwrap_stream (FILE *stream, struct data *d)
static int
lwclose (void *cookie)
{
- struct data *d = cookie;
+ struct line_wrap_data *d = cookie;
return (*d->close) (d->cookie);
}
static int
lwfileno (void *cookie)
{
- struct data *d = 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. */
-
-static void
-lwoutput (FILE *stream, int c)
+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 data *d = stream->__cookie;
+ struct line_wrap_data *d = stream->__cookie;
unwrap_stream (stream, d);
/* Scan the buffer for newlines. */
- for (buf = stream->__buffer;
- (buf < stream->__bufp || (c != EOF && c != '\n')) && !stream->__error)
+ buf = stream->__buffer;
+ while ((buf < stream->__bufp || (c != EOF && c != '\n')) && !stream->__error)
{
size_t r;
- if (d->point == 0 && d->lmargin && *d->lmargin != 0)
+ 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;
+ const size_t pad = d->lmargin;
if (stream->__bufp + pad < stream->__put_limit)
{
/* We can fit in them in the buffer by moving the
@@ -141,8 +125,7 @@ lwoutput (FILE *stream, int c)
{
/* The buffer ends in a partial line. */
- if (!d->rmargin ||
- d->point + len + (c != EOF && c != '\n') <= d->rmargin)
+ 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
@@ -155,7 +138,7 @@ lwoutput (FILE *stream, int c)
the end of the buffer. */
nl = stream->__bufp;
}
- else if (!d->rmargin || d->point + (nl - buf) <= d->rmargin)
+ 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. */
@@ -165,9 +148,9 @@ lwoutput (FILE *stream, int c)
}
/* This line is too long. */
- r = *d->rmargin;
+ r = d->rmargin;
- if (! d->wrapmargin)
+ if (d->wmargin < 0)
{
/* Truncate the line by overwriting the excess with the
newline and anything after it in the buffer. */
@@ -242,7 +225,7 @@ lwoutput (FILE *stream, int c)
/* Temporarily reset bufp to include just the first line. */
stream->__bufp = nl;
- if (nextline - (nl + 1) < d->wrap)
+ 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');
@@ -255,7 +238,7 @@ lwoutput (FILE *stream, int c)
d->point = 0;
/* Add blanks up to the wrap margin column. */
- for (i = 0; i < d->wrap; ++i)
+ for (i = 0; i < d->wmargin; ++i)
*stream->__bufp++ = ' ';
/* Copy the tail of the original buffer into the current buffer
@@ -284,19 +267,16 @@ lwoutput (FILE *stream, int c)
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 WRAP is not null,
- words that extend past *RMARGIN are wrapped by replacing the whitespace
- before them with a newline and *WRAP spaces. Otherwise, chars beyond
- *RMARGIN are simply dropped until a newline. Returns STREAM after
- modifying it, or NULL if there was an error. The pointers passed are
- stored in the stream and so must remain valid until `line_unwrap_stream'
- is called; the values pointed to can be changed between stdio calls. */
-
+/* 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 *wrap)
+line_wrap_stream (FILE *stream, size_t lmargin, size_t rmargin, size_t wmargin)
{
- struct data *d = malloc (sizeof *d);
+ struct line_wrap_data *d = malloc (sizeof *d);
if (!d)
return NULL;
@@ -321,25 +301,116 @@ line_wrap_stream (FILE *stream, size_t *lmargin, size_t *rmargin, size_t *wrap)
to work if the stream is switched to full or no buffering. */
stream->__linebuf = 1;
-#define ref(arg) d->arg = arg
- ref (lmargin);
- ref (rmargin);
- ref (wrap);
-#undef ref
+ 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 data *d = stream->__cookie;
+ 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)