Skip to content

Commit

Permalink
import less 381. changes:
Browse files Browse the repository at this point in the history
v375   4/7/02   Fix searching for SGR sequences; fix SECURE build;
                add SGR support to DJGPP version (thanks to Eli Zaretskii).
v376  6/10/02   Fix bug in overstriking mulitbyte UTF-8 characters
                (thanks to Jungshik Shin).
                Posted to Web page.
-----------------------------------------------------------------
v377  9/10/02   Fix bug in Windows version when file contains CR;
                fix bug in search highlights with -R;
                make initial buffer limit really be 64K not unlimited.
v378  9/30/02   Misc bug fixes and compiler warning cleanup.
                Posted to Web page.
-----------------------------------------------------------------
v379 11/23/02   Add -L option; fix bug with ctrl-K in lesskey files;
                improve UTF-8 overstriking and underscore overstriking;
                fix minor man page problems; change to autoconf 2.54.
v380 11/24/02   Make LINENUM same as POSITION.
v381 11/28/02   Make -N use 7 columns for line number if possible.
  • Loading branch information
mrg committed Apr 14, 2003
1 parent d96a93b commit daf5967
Show file tree
Hide file tree
Showing 43 changed files with 1,170 additions and 623 deletions.
36 changes: 35 additions & 1 deletion usr.bin/less/less/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,38 @@
======================================================================


Major changes between "less" versions 358 and 374
Major changes between "less" versions 378 and 381

* New -L option to disable LESSOPEN processing.

* Further support for large (64 bit) file addressing.
Large file support is now set up by the configure script.

* Use autoconf 2.54.
Replace configure.in, acconfig.h, defines.h.top with configure.ac.

* Overstriking underscore with underscore is now bold or underlined
depending on context.

* Use only 7 spaces for line numbers in -N mode, if possible.

* Fix some bugs in handling overstriking in UTF-8 files.

* Fix some nroff issues in the man page.

======================================================================

Major changes between "less" versions 376 and 378

* Bug fixes:
Default buffer space is now 64K as documented.
Search highlighting works properly when used with -R.
Windows version works properly when input file contains carriage returns.
Clean up some compiler warnings.

======================================================================

Major changes between "less" versions 358 and 376

* -x option can now specify multiple variable-width tab stops.

Expand Down Expand Up @@ -41,6 +72,9 @@

* Default LESSCHARSET for MS-DOS versions is now "dos".

* Searching works better with ANSI (SGR) escape sequences.
ANSI color escape sequences are now supported in the MS-DOS (DJGPP) version.

* Improved performance in reading very large pipes.

* Eliminated some dependencies on file offets being 32 bits.
Expand Down
4 changes: 2 additions & 2 deletions usr.bin/less/less/README
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Less, version 374
Less, version 381

This is the distribution of less, version 374, released 19 Feb 2002.
This is the distribution of less, version 381, released 17 Jan 2003.
This program is part of the GNU project (http://www.gnu.org).

This program is free software. You may redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion usr.bin/less/less/brac.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1984-2000 Mark Nudelman
* Copyright (C) 1984-2002 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Expand Down
2 changes: 1 addition & 1 deletion usr.bin/less/less/ch.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1984-2000 Mark Nudelman
* Copyright (C) 1984-2002 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Expand Down
3 changes: 2 additions & 1 deletion usr.bin/less/less/charset.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1984-2000 Mark Nudelman
* Copyright (C) 1984-2002 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Expand Down Expand Up @@ -164,6 +164,7 @@ icharset(name)
error("invalid charset name", NULL_PARG);
quit(QUIT_ERROR);
/*NOTREACHED*/
return (0);
}

#if HAVE_LOCALE
Expand Down
2 changes: 1 addition & 1 deletion usr.bin/less/less/cmd.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1984-2000 Mark Nudelman
* Copyright (C) 1984-2002 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Expand Down
23 changes: 14 additions & 9 deletions usr.bin/less/less/cmdbuf.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1984-2000 Mark Nudelman
* Copyright (C) 1984-2002 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Expand Down Expand Up @@ -64,25 +64,25 @@ struct mlist
*/
struct mlist mlist_search =
{ &mlist_search, &mlist_search, &mlist_search, NULL };
public void constant *ml_search = (void *) &mlist_search;
public void * constant ml_search = (void *) &mlist_search;

struct mlist mlist_examine =
{ &mlist_examine, &mlist_examine, &mlist_examine, NULL };
public void constant *ml_examine = (void *) &mlist_examine;
public void * constant ml_examine = (void *) &mlist_examine;

#if SHELL_ESCAPE || PIPEC
struct mlist mlist_shell =
{ &mlist_shell, &mlist_shell, &mlist_shell, NULL };
public void constant *ml_shell = (void *) &mlist_shell;
public void * constant ml_shell = (void *) &mlist_shell;
#endif

#else /* CMD_HISTORY */

/* If CMD_HISTORY is off, these are just flags. */
public void constant *ml_search = (void *)1;
public void constant *ml_examine = (void *)2;
public void * constant ml_search = (void *)1;
public void * constant ml_examine = (void *)2;
#if SHELL_ESCAPE || PIPEC
public void constant *ml_shell = (void *)3;
public void * constant ml_shell = (void *)3;
#endif

#endif /* CMD_HISTORY */
Expand Down Expand Up @@ -1030,10 +1030,15 @@ cmd_char(c)
/*
* Return the number currently in the command buffer.
*/
public int
public LINENUM
cmd_int()
{
return (atoi(cmdbuf));
register char *p;
LINENUM n = 0;

for (p = cmdbuf; *p != '\0'; p++)
n = (10 * n) + (*p - '0');
return (n);
}

/*
Expand Down
Loading

0 comments on commit daf5967

Please sign in to comment.