Menu
▾
▴
[MinGW-cvs] msys/packages/less/358 ChangeLog.MSYS,NONE,1.1 command.c,1.1.1.1,1.2 funcs.h,1.1.1.1,1.2 option.c,1.1.1.1,1.2 option.h,1.1.1.1,1.2 opttbl.c,1.1.1.1,1.2
|
From: <ea...@us...> - 2002-12-06 14:41:14
|
Update of /cvsroot/mingw/msys/packages/less/358
In directory sc8-pr-cvs1:/tmp/cvs-serv23561
Modified Files:
command.c funcs.h option.c option.h opttbl.c
Added Files:
ChangeLog.MSYS
Log Message:
* ChangeLog.MYS: New file.
* command.c (mca_char): Resolve namespace conflict with option.
* funcs.h: Ditto.
* option.c: Ditto.
(every_first_cmd): Ditto.
(toggle_option): Ditto.
(propt): Ditto.
(single_char_option): Ditto.
* option.h: Ditto.
* opttbl.c: Ditto.
(init_option): Ditto.
(findopt): Ditto.
(findopt_name): Ditto.
--- NEW FILE: ChangeLog.MSYS ---
2002.12.06 Earnie Boyd <ea...@us...>
* ChangeLog.MYS: New file.
* command.c (mca_char): Resolve namespace conflict with option.
* funcs.h: Ditto.
* option.c: Ditto.
(every_first_cmd): Ditto.
(toggle_option): Ditto.
(propt): Ditto.
(single_char_option): Ditto.
* option.h: Ditto.
* opttbl.c: Ditto.
(init_option): Ditto.
(findopt): Ditto.
(findopt_name): Ditto.
Index: command.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/less/358/command.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** command.c 6 Dec 2002 14:01:39 -0000 1.1.1.1
--- command.c 6 Dec 2002 14:41:10 -0000 1.2
***************
*** 357,361 ****
* accepting chars until user hits RETURN.
*/
! struct option *o;
char *oname;
int lc;
--- 357,361 ----
* accepting chars until user hits RETURN.
*/
! struct lessoption *o;
char *oname;
int lc;
Index: funcs.h
===================================================================
RCS file: /cvsroot/mingw/msys/packages/less/358/funcs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** funcs.h 6 Dec 2002 14:01:39 -0000 1.1.1.1
--- funcs.h 6 Dec 2002 14:41:10 -0000 1.2
***************
*** 187,192 ****
public int getnum ();
public void init_option ();
! public struct option * findopt ();
! public struct option * findopt_name ();
public int iread ();
public void intread ();
--- 187,192 ----
public int getnum ();
public void init_option ();
! public struct lessoption * findopt ();
! public struct lessoption * findopt_name ();
public int iread ();
public void intread ();
Index: option.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/less/358/option.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** option.c 6 Dec 2002 14:01:40 -0000 1.1.1.1
--- option.c 6 Dec 2002 14:41:10 -0000 1.2
***************
*** 22,26 ****
#include "option.h"
! static struct option *pendopt;
public int plusoption = FALSE;
--- 22,26 ----
#include "option.h"
! static struct lessoption *pendopt;
public int plusoption = FALSE;
***************
*** 40,44 ****
char *s;
{
! register struct option *o;
register int optc;
char *optname;
--- 40,44 ----
char *s;
{
! register struct lessoption *o;
register int optc;
char *optname;
***************
*** 260,264 ****
int how_toggle;
{
! register struct option *o;
register int num;
int no_prompt;
--- 260,264 ----
int how_toggle;
{
! register struct lessoption *o;
register int num;
int no_prompt;
***************
*** 480,484 ****
int c;
{
! register struct option *o;
o = findopt(c);
--- 480,484 ----
int c;
{
! register struct lessoption *o;
o = findopt(c);
***************
*** 496,500 ****
int c;
{
! register struct option *o;
o = findopt(c);
--- 496,500 ----
int c;
{
! register struct lessoption *o;
o = findopt(c);
Index: option.h
===================================================================
RCS file: /cvsroot/mingw/msys/packages/less/358/option.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** option.h 6 Dec 2002 14:01:40 -0000 1.1.1.1
--- option.h 6 Dec 2002 14:41:10 -0000 1.2
***************
*** 50,54 ****
};
! struct option
{
char oletter; /* The controlling letter (a-z) */
--- 50,54 ----
};
! struct lessoption
{
char oletter; /* The controlling letter (a-z) */
Index: opttbl.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/less/358/opttbl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** opttbl.c 6 Dec 2002 14:01:40 -0000 1.1.1.1
--- opttbl.c 6 Dec 2002 14:41:10 -0000 1.2
***************
*** 108,112 ****
* Table of all options and their semantics.
*/
! static struct option option[] =
{
{ 'a', &a_optname,
--- 108,112 ----
* Table of all options and their semantics.
*/
! static struct lessoption option[] =
{
{ 'a', &a_optname,
***************
*** 341,345 ****
init_option()
{
! register struct option *o;
for (o = option; o->oletter != '\0'; o++)
--- 341,345 ----
init_option()
{
! register struct lessoption *o;
for (o = option; o->oletter != '\0'; o++)
***************
*** 356,364 ****
* Find an option in the option table, given its option letter.
*/
! public struct option *
findopt(c)
int c;
{
! register struct option *o;
for (o = option; o->oletter != '\0'; o++)
--- 356,364 ----
* Find an option in the option table, given its option letter.
*/
! public struct lessoption *
findopt(c)
int c;
{
! register struct lessoption *o;
for (o = option; o->oletter != '\0'; o++)
***************
*** 378,382 ****
* p_oname if non-NULL is set to point to the full option name.
*/
! public struct option *
findopt_name(p_optname, p_oname, p_err)
char **p_optname;
--- 378,382 ----
* p_oname if non-NULL is set to point to the full option name.
*/
! public struct lessoption *
findopt_name(p_optname, p_oname, p_err)
char **p_optname;
***************
*** 385,393 ****
{
char *optname = *p_optname;
! register struct option *o;
register struct optname *oname;
register int len;
int uppercase;
! struct option *maxo = NULL;
struct optname *maxoname = NULL;
int maxlen = 0;
--- 385,393 ----
{
char *optname = *p_optname;
! register struct lessoption *o;
register struct optname *oname;
register int len;
int uppercase;
! struct lessoption *maxo = NULL;
struct optname *maxoname = NULL;
int maxlen = 0;
|