Date: Sat, 15 Feb 2020 00:48:45 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r357949 - stable/12/libexec/rtld-elf Message-ID: <202002150048.01F0mjXF022090@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Feb 15 00:48:44 2020 New Revision: 357949 URL: https://svnweb.freebsd.org/changeset/base/357949 Log: MFC r357813: Fix indent. Modified: stable/12/libexec/rtld-elf/rtld.c Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/rtld-elf/rtld.c ============================================================================== --- stable/12/libexec/rtld-elf/rtld.c Fri Feb 14 23:27:45 2020 (r357948) +++ stable/12/libexec/rtld-elf/rtld.c Sat Feb 15 00:48:44 2020 (r357949) @@ -5580,26 +5580,30 @@ parse_args(char* argv[], int argc, bool *use_pathp, in print_usage(argv[0]); _exit(0); } else if (opt == 'f') { - /* - * -f XX can be used to specify a descriptor for the - * binary named at the command line (i.e., the later - * argument will specify the process name but the - * descriptor is what will actually be executed) - */ - if (j != arglen - 1) { - /* -f must be the last option in, e.g., -abcf */ - _rtld_error("Invalid options: %s", arg); - rtld_die(); - } - i++; - fd = parse_integer(argv[i]); - if (fd == -1) { - _rtld_error("Invalid file descriptor: '%s'", - argv[i]); - rtld_die(); - } - *fdp = fd; - break; + /* + * -f XX can be used to specify a + * descriptor for the binary named at + * the command line (i.e., the later + * argument will specify the process + * name but the descriptor is what + * will actually be executed). + * + * -f must be the last option in, e.g., -abcf. + */ + if (j != arglen - 1) { + _rtld_error("Invalid options: %s", arg); + rtld_die(); + } + i++; + fd = parse_integer(argv[i]); + if (fd == -1) { + _rtld_error( + "Invalid file descriptor: '%s'", + argv[i]); + rtld_die(); + } + *fdp = fd; + break; } else if (opt == 'p') { *use_pathp = true; } else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002150048.01F0mjXF022090>