Looking for a tool to reformat C / C++ source code capable of adding braces in "if" and "while" statements

Hello.

I am looking for a source code rewriting tool to change the format of the source code, such as “clang-format”, “indent”, but that allow to add braces in “if” and “while” statements when in the source code only affect a single statement that is not surrounded by braces.

I don’t know if I missed something in the documentation for “clang-format” and “indent”, but in those programs I have not been able to find an option to add braces. I’ve seen options to choose the position of existing braces, but not to add braces when the original source code doesn’t have them.

Kind regads,
Oscar

I got using astyle:

astyle --style=allman --add-brackets ttserver.c