From 5b2b72ed08f514444f05e7b42556ae096879f2e8 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 12 Jul 2018 19:54:23 +0300 Subject: Move STDIN, STDOUT, and STDERR to lower case --- bpkg/archive.cxx | 4 ++-- bpkg/archive.hxx | 2 +- bpkg/checksum.cxx | 18 +++++++++--------- bpkg/fetch-git.cxx | 2 +- bpkg/fetch.cxx | 16 ++++++++-------- bpkg/fetch.hxx | 2 +- bpkg/pkg-build.cli | 2 +- bpkg/pkg-disfigure.cxx | 4 ++-- bpkg/pkg-drop.cli | 2 +- bpkg/pkg-status.cli | 4 ++-- bpkg/pkg-verify.cxx | 6 +++--- bpkg/rep-info.cli | 4 ++-- bpkg/rep-info.cxx | 6 +++--- bpkg/rep-list.cli | 2 +- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx index ba03d70..f61e7f3 100644 --- a/bpkg/archive.cxx +++ b/bpkg/archive.cxx @@ -64,7 +64,7 @@ namespace bpkg for (const string& o: co.tar_option ()) args.push_back (o.c_str ()); - // -O/--to-stdout -- extract to STDOUT. + // -O/--to-stdout -- extract to stdout. // args.push_back ("-O"); @@ -106,7 +106,7 @@ namespace bpkg if (verb >= 2) print_process (args); - // If err is false, then redirect STDERR to STDOUT. + // If err is false, then redirect stderr to stdout. // auto_fd nfd (err ? nullfd : fdnull ()); diff --git a/bpkg/archive.hxx b/bpkg/archive.hxx index 6904f7a..17e854a 100644 --- a/bpkg/archive.hxx +++ b/bpkg/archive.hxx @@ -20,7 +20,7 @@ namespace bpkg package_dir (const path& archive); // Start the process of extracting the specified file from the archive. If - // error is false, then redirect STDERR to /dev/null (this can be used, for + // error is false, then redirect stderr to /dev/null (this can be used, for // example, to suppress diagnostics). // // Return a pair of processes that form a pipe. Wait on the second first. diff --git a/bpkg/checksum.cxx b/bpkg/checksum.cxx index 7f4afa8..ba55205 100644 --- a/bpkg/checksum.cxx +++ b/bpkg/checksum.cxx @@ -24,7 +24,7 @@ namespace bpkg check_sha256 (const path& prog) { // This one doesn't have --version or --help. Running it without any - // arguments causes it to calculate the sum of STDIN. But we can ask + // arguments causes it to calculate the sum of stdin. But we can ask // it to calculate a sum of an empty string. // const char* args[] = {prog.string ().c_str (), "-q", "-s", "", nullptr}; @@ -36,7 +36,7 @@ namespace bpkg if (verb >= 3) print_process (args); - process pr (pp, args, 0, -1, 1); // Redirect STDOUT and STDERR to a pipe. + process pr (pp, args, 0, -1, 1); // Redirect stdout and stderr to a pipe. try { @@ -83,7 +83,7 @@ namespace bpkg if (verb >= 3) print_process (args); - // Pipe STDOUT. Process exceptions must be handled by the caller. + // Pipe stdout. Process exceptions must be handled by the caller. // return process (pp, args.data (), 0, -1); } @@ -93,7 +93,7 @@ namespace bpkg static bool check_sha256sum (const path& prog) { - // sha256sum --version prints the version to STDOUT and exits with 0 + // sha256sum --version prints the version to stdout and exits with 0 // status. The first line starts with "sha256sum (GNU coreutils) 8.21". // const char* args[] = {prog.string ().c_str (), "--version", nullptr}; @@ -105,7 +105,7 @@ namespace bpkg if (verb >= 3) print_process (args); - process pr (pp, args, 0, -1); // Redirect STDOUT to a pipe. + process pr (pp, args, 0, -1); // Redirect stdout to a pipe. try { @@ -160,7 +160,7 @@ namespace bpkg if (verb >= 3) print_process (args); - // Pipe STDOUT. Process exceptions must be handled by the caller. + // Pipe stdout. Process exceptions must be handled by the caller. // return process (pp, args.data (), 0, -1); } @@ -170,7 +170,7 @@ namespace bpkg static bool check_shasum (const path& prog) { - // shasum --version prints just the version to STDOUT and exits with 0 + // shasum --version prints just the version to stdout and exits with 0 // status. The output looks like "5.84". // const char* args[] = {prog.string ().c_str (), "--version", nullptr}; @@ -182,7 +182,7 @@ namespace bpkg if (verb >= 3) print_process (args); - process pr (pp, args, 0, -1); // Redirect STDOUT to a pipe. + process pr (pp, args, 0, -1); // Redirect stdout to a pipe. try { @@ -226,7 +226,7 @@ namespace bpkg if (verb >= 3) print_process (args); - // Pipe STDOUT. Process exceptions must be handled by the caller. + // Pipe stdout. Process exceptions must be handled by the caller. // return process (pp, args.data (), 0, -1); } diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 395caf7..95dcbc7 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -1192,7 +1192,7 @@ namespace bpkg // Note that we suppress the (too detailed) fetch command output if the // verbosity level is 1. However, we still want to see the progress in - // this case, unless STDERR is not directed to a terminal. + // this case, unless stderr is not directed to a terminal. // // Also note that we don't need to specify --refmap option since we can // rely on the init() function that properly sets the diff --git a/bpkg/fetch.cxx b/bpkg/fetch.cxx index ad903cc..f764cce 100644 --- a/bpkg/fetch.cxx +++ b/bpkg/fetch.cxx @@ -23,7 +23,7 @@ namespace bpkg { tracer trace ("check_wget"); - // wget --version prints the version to STDOUT and exits with 0 + // wget --version prints the version to stdout and exits with 0 // status. The first line starts with "GNU Wget X.Y[.Z]. // const char* args[] = {prog.string ().c_str (), "--version", nullptr}; @@ -35,7 +35,7 @@ namespace bpkg if (verb >= 3) print_process (args); - process pr (pp, args, 0, -1); // Redirect STDOUT to a pipe. + process pr (pp, args, 0, -1); // Redirect stdout to a pipe. string l; @@ -105,7 +105,7 @@ namespace bpkg }; // Map verbosity level. If we are running quiet or at level 1 - // and the output is STDOUT, then run wget quiet. If at level + // and the output is stdout, then run wget quiet. If at level // 1 and the output is a file, then show the progress bar. At // level 2 and 3 run it at the default level (so we will print // the command line and it will display the progress, error @@ -181,7 +181,7 @@ namespace bpkg static bool check_curl (const path& prog) { - // curl --version prints the version to STDOUT and exits with 0 + // curl --version prints the version to stdout and exits with 0 // status. The first line starts with "curl X.Y.Z" // const char* args[] = {prog.string ().c_str (), "--version", nullptr}; @@ -193,7 +193,7 @@ namespace bpkg if (verb >= 3) print_process (args); - process pr (pp, args, 0, -1); // Redirect STDOUT to a pipe. + process pr (pp, args, 0, -1); // Redirect stdout to a pipe. try { @@ -238,7 +238,7 @@ namespace bpkg }; // Map verbosity level. If we are running quiet or at level 1 - // and the output is STDOUT, then run curl quiet. If at level + // and the output is stdout, then run curl quiet. If at level // 1 and the output is a file, then show the progress bar. At // level 2 and 3 run it at the default level (so we will print // the command line and it will display its elaborate progress). @@ -270,7 +270,7 @@ namespace bpkg for (const string& o: ops) args.push_back (o.c_str ()); - // Output. By default curl writes to STDOUT. + // Output. By default curl writes to stdout. // if (fo) { @@ -319,7 +319,7 @@ namespace bpkg if (verb >= 3) print_process (args); - process pr (pp, args, 0, -1, 1); // Redirect STDOUT and STDERR to a pipe. + process pr (pp, args, 0, -1, 1); // Redirect stdout and stderr to a pipe. try { diff --git a/bpkg/fetch.hxx b/bpkg/fetch.hxx index b7b9a29..b1433c6 100644 --- a/bpkg/fetch.hxx +++ b/bpkg/fetch.hxx @@ -106,7 +106,7 @@ namespace bpkg // // Start the process of fetching the specified URL. If out is empty, then - // fetch to STDOUT. In this case also don't show any progress unless we are + // fetch to stdout. In this case also don't show any progress unless we are // running verbose. // butl::process diff --git a/bpkg/pkg-build.cli b/bpkg/pkg-build.cli index a1a79de..c370ac4 100644 --- a/bpkg/pkg-build.cli +++ b/bpkg/pkg-build.cli @@ -253,7 +253,7 @@ namespace bpkg bool --print-only|-p { - "Print to \cb{STDOUT} what would be done without actually doing + "Print to \cb{stdout} what would be done without actually doing anything." } diff --git a/bpkg/pkg-disfigure.cxx b/bpkg/pkg-disfigure.cxx index bcd14f1..8da25be 100644 --- a/bpkg/pkg-disfigure.cxx +++ b/bpkg/pkg-disfigure.cxx @@ -135,8 +135,8 @@ namespace bpkg { auto_fd dev_null (open_dev_null ()); - // Redirect STDERR to /dev/null. Note that we don't expect - // anything to be written to STDOUT. + // Redirect stderr to /dev/null. Note that we don't expect + // anything to be written to stdout. // process pr (start_b (o, 1 /* stdout */, dev_null /* stderr */, diff --git a/bpkg/pkg-drop.cli b/bpkg/pkg-drop.cli index 4ef3733..2d7f206 100644 --- a/bpkg/pkg-drop.cli +++ b/bpkg/pkg-drop.cli @@ -72,7 +72,7 @@ namespace bpkg bool --print-only|-p { - "Print to \cb{STDOUT} what would be done without actually doing + "Print to \cb{stdout} what would be done without actually doing anything." } diff --git a/bpkg/pkg-status.cli b/bpkg/pkg-status.cli index fd6cba1..5ef00a9 100644 --- a/bpkg/pkg-status.cli +++ b/bpkg/pkg-status.cli @@ -29,8 +29,8 @@ namespace bpkg \l{bpkg-pkg-build(1)}). Additionally, the status of immediate or all dependencies of the above packages can be printed by specifying the \c{\b{--immediate}|\b{-i}} or \c{\b{--recursive}|\b{-r}} options, - respectively. Note that the status is written to \cb{STDOUT}, not - \cb{STDERR}. + respectively. Note that the status is written to \cb{stdout}, not + \cb{stderr}. The status output format is regular with components separated with spaces. Each line starts with the package name (and version, if diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx index 69014ac..a372efa 100644 --- a/bpkg/pkg-verify.cxx +++ b/bpkg/pkg-verify.cxx @@ -28,7 +28,7 @@ namespace bpkg // If diag is false, we need to make tar not print any diagnostics. There // doesn't seem to be an option to suppress this and the only way is to - // redirect STDERR to something like /dev/null. + // redirect stderr to something like /dev/null. // // If things go badly for tar and it starts spitting errors instead of the // manifest, the manifest parser will fail. But that's ok since we assume @@ -196,7 +196,7 @@ namespace bpkg { try { - manifest_serializer s (cout, "STDOUT"); + manifest_serializer s (cout, "stdout"); m.serialize (s); } catch (const manifest_serialization& e) @@ -205,7 +205,7 @@ namespace bpkg } catch (const io_error&) { - fail << "unable to write to STDOUT"; + fail << "unable to write to stdout"; } } else if (verb && !o.silent () && !o.no_result ()) diff --git a/bpkg/rep-info.cli b/bpkg/rep-info.cli index 35afd55..6ce1953 100644 --- a/bpkg/rep-info.cli +++ b/bpkg/rep-info.cli @@ -29,8 +29,8 @@ namespace bpkg prerequisite repositories followed by the list of available packages. This default format can be altered in various ways using options listed - below. Note also that the information is written to \cb{STDOUT}, not - \cb{STDERR}. + below. Note also that the information is written to \cb{stdout}, not + \cb{stderr}. If the current working directory contains a \cb{bpkg} configuration, then \cb{rep-info} will use its certificate database for the repository diff --git a/bpkg/rep-info.cxx b/bpkg/rep-info.cxx index 9f78a91..b551084 100644 --- a/bpkg/rep-info.cxx +++ b/bpkg/rep-info.cxx @@ -177,7 +177,7 @@ namespace bpkg // Note: serializing without any extra repository_manifests info. // - manifest_serializer s (cout, "STDOUT"); + manifest_serializer s (cout, "stdout"); for (const repository_manifest& rm: rms) rm.serialize (s); @@ -268,7 +268,7 @@ namespace bpkg // Note: serializing without any extra package_manifests info. // - manifest_serializer s (cout, "STDOUT"); + manifest_serializer s (cout, "stdout"); for (const package_manifest& pm: pms) pm.serialize (s); s.next ("", ""); // End of stream. @@ -310,7 +310,7 @@ namespace bpkg } catch (const io_error&) { - fail << "unable to write to STDOUT"; + fail << "unable to write to stdout"; } return 0; diff --git a/bpkg/rep-list.cli b/bpkg/rep-list.cli index e487ddc..5bd538d 100644 --- a/bpkg/rep-list.cli +++ b/bpkg/rep-list.cli @@ -24,7 +24,7 @@ namespace bpkg The \cb{rep-list} command lists the repositories in the configuration. For each repository a line containing the repository name and location is - printed to \cb{STDOUT}. If the \cb{--complements|-c} and/or + printed to \cb{stdout}. If the \cb{--complements|-c} and/or \cb{--prerequisites|-p} options are specified, then it is followed by the list of complement and/or prerequisite repositories, recursively." } -- cgit v1.1