CVS: cvs.openbsd.org: src

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Ingo Schwarze
Date: Monday, January 3, 2011 - 3:27 pm

CVSROOT:	/cvs
Module name:	src
Changes by:	schwarze@cvs.openbsd.org	2011/01/03 15:27:21

Modified files:
	usr.bin/mandoc : libmandoc.h man_argv.c mandoc.c roff.c 
	regress/usr.bin/mandoc/roff: Makefile 
Added files:
	regress/usr.bin/mandoc/roff/args: Makefile man.in man.out_ascii 
	                                  roff.in roff.out_ascii 

Log message:
Unify roff macro argument parsing (in roff.c, roff_userdef()) and man macro
argument parsing (in man_argv.c, man_args()), both having different bugs,
to use one common macro argument parser (in mandoc.c, mandoc_getarg()),
because from the point of view of roff, man macros are just roff macros,
hence their arguments are parsed in exactly the same way.

While doing so, fix these bugs:
* Escaped blanks (i.e. those preceded by an odd number of backslashes)
were mishandled as argument separators in unquoted arguments to
user-defined roff macros.
* Unescaped blanks preceded by an even number of backslashes were not
recognized as argument separators in unquoted arguments to man macros.
* Escaped backslashes (i.e. pairs of backslashes) were not reduced
to single backslashes both in unquoted and quoted arguments both
to user-defined roff macros and to man macros.
* Escaped quotes (i.e. pairs of quotes inside quoted arguments) were
not reduced to single quotes in man macros.

OK kristaps@

Note that mdoc macro argument parsing is yet another beast for no good
reason and is probably afflicted by similar bugs.  But i don't attempt
to fix that right now because it is intricately entangled with lots of
unrelated high-level mdoc(7) functionality, like delimiter handling and
column list phrase handling.  Disentagling that would waste too much
time now.
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
CVS: cvs.openbsd.org: src, Ingo Schwarze, (Mon Jan 3, 3:27 pm)