d845d12b1a
Merge all the changes from the recent FreeBSD HEAD snapshot
into our local copy.
FreeBSD actively maintains this program in their sources and their
repository contains over 100 commits with changes.
Keep the delta between the FreeBSD and NetBSD versions to absolute
minimum, mostly RCS Id and compatiblity fixes.
Major chages in this import:
- Added an option -ldi<N> to control indentation of local variable names.
- Added option -P for loading user-provided files as profiles
- Added -tsn for setting tabsize
- Rename -nsac/-sac ("space after cast") to -ncs/-cs
- Added option -fbs Enables (disables) splitting the function declaration and opening brace across two lines.
- Respect SIMPLE_BACKUP_SUFFIX environment variable in indent(1)
- Group global option variables into an options structure
- Use bsearch() for looking up type keywords.
- Don't produce unneeded space character in function declarators
- Don't unnecessarily add a blank before a comment ends.
- Don't ignore newlines after comments that follow braces.
Merge the FreeBSD intend(1) tests with our ATF framework.
All tests pass.
Upgrade prepared by Manikishan Ghantasala.
Final polishing by myself.
Part II, checkin new files.
62 lines
1.2 KiB
Plaintext
62 lines
1.2 KiB
Plaintext
/* $NetBSD: comments.0.stdout,v 1.1 2019/04/04 15:27:35 kamil Exp $ */
|
|
/* $FreeBSD: head/usr.bin/indent/tests/comments.0.stdout 334563 2018-06-03 15:28:55Z pstef $ */
|
|
typedef enum x {
|
|
aaaaaaaaaaaaaaaaaaaaaa = 1 << 0, /* test a */
|
|
bbbbbbbbbbbbbbbbb = 1 << 1, /* test b */
|
|
cccccccccccccc = 1 << 1, /* test c */
|
|
dddddddddddddddddddddddddddddd = 1 << 2 /* test d */
|
|
} x;
|
|
|
|
/* See r303597, r303598, r309219, and r309343 */
|
|
void
|
|
t(void)
|
|
{
|
|
/*
|
|
* Old indent wrapped the URL near where this sentence ends.
|
|
*
|
|
* https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html
|
|
*/
|
|
|
|
/*
|
|
* Old indent did not wrap to column 78
|
|
*
|
|
* aaaaaa bbbbbb cccccc dddddd eeeeee ffffff ggggg hhhhh iiiii jjjj
|
|
* kk
|
|
*/
|
|
|
|
/*
|
|
* Old indent unnecessarily removed the star comment continuation on
|
|
* the next line.
|
|
*
|
|
* *test*
|
|
*/
|
|
|
|
/*
|
|
* r309219 Go through linked list, freeing from the malloced (t[-1])
|
|
* address.
|
|
*/
|
|
|
|
/* r309343 */
|
|
}
|
|
|
|
int
|
|
c(void)
|
|
{
|
|
if (1) { /*- a christmas tree *
|
|
***
|
|
***** */
|
|
/*- another one *
|
|
***
|
|
***** */
|
|
7;
|
|
}
|
|
|
|
if (1) /*- a christmas tree *
|
|
***
|
|
***** */
|
|
/*- another one *
|
|
***
|
|
***** */
|
|
1;
|
|
}
|