diff --git a/NEWS b/NEWS index 16b9fa3..6fc2471 100644 --- a/NEWS +++ b/NEWS @@ -105,7 +105,7 @@ GNU coreutils NEWS -*- outline -*- selected programs in a single binary called "coreutils". The selected programs can still be called directly using symlinks to "coreutils" or shebangs with the option --coreutils-prog= passed to this program. The - install behaviour is determined by the option --enable-single-binary=symlinks + install behavior is determined by the option --enable-single-binary=symlinks or --enable-single-binary=shebangs (the default). With the symlinks option, you can't make a second symlink to any program because that will change the name of the called program, which is used by coreutils to determine the diff --git a/configure.ac b/configure.ac index 7e30f55..27caffd 100644 --- a/configure.ac +++ b/configure.ac @@ -503,7 +503,7 @@ man1_MANS=` # a distribution tarball. EXTRA_MANS=`for p in $no_install_progs_default; do echo man/$p.1; done` -# Replace all the programs by the single binary and simlinks if specified. +# Replace all the programs by the single binary and symlinks if specified. single_binary_progs= single_binary_libs= single_binary_deps= diff --git a/src/coreutils-arch.c b/src/coreutils-arch.c index a93f484..899cc93 100644 --- a/src/coreutils-arch.c +++ b/src/coreutils-arch.c @@ -21,7 +21,7 @@ #include "uname.h" /* Ensure that the main for uname is declared even if the tool is not being - build in this single-binary. */ + built in this single-binary. */ int _single_binary_main_uname (int argc, char** argv) ATTRIBUTE_NORETURN; int _single_binary_main_arch (int argc, char** argv) ATTRIBUTE_NORETURN; diff --git a/src/coreutils-dir.c b/src/coreutils-dir.c index 8166b0e..4b488f4 100644 --- a/src/coreutils-dir.c +++ b/src/coreutils-dir.c @@ -20,7 +20,7 @@ #include "system.h" #include "ls.h" -/* Ensure that the main for ls is declared even if the tool is not being build +/* Ensure that the main for ls is declared even if the tool is not being built in this single-binary. */ int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN; int _single_binary_main_dir (int argc, char** argv) ATTRIBUTE_NORETURN; diff --git a/src/coreutils-vdir.c b/src/coreutils-vdir.c index 2dbcd70..036367f 100644 --- a/src/coreutils-vdir.c +++ b/src/coreutils-vdir.c @@ -20,7 +20,7 @@ #include "system.h" #include "ls.h" -/* Ensure that the main for ls is declared even if the tool is not being build +/* Ensure that the main for ls is declared even if the tool is not being built in this single-binary. */ int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN; int _single_binary_main_vdir (int argc, char** argv) ATTRIBUTE_NORETURN; diff --git a/src/coreutils.c b/src/coreutils.c index d836782..f54f85d 100644 --- a/src/coreutils.c +++ b/src/coreutils.c @@ -31,7 +31,7 @@ /* Declare the main function on each one of the selected tools. This name needs to match the one passed as CFLAGS on single-binary.mk (generated - byt gen-single-binary.sh). */ + by gen-single-binary.sh). */ #define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \ int _single_binary_main_##main_name (int, char**) ATTRIBUTE_NORETURN; #include "coreutils.h" @@ -110,8 +110,8 @@ launch_program (const char *prog_name, int prog_argc, char **prog_argv) prctl (PR_SET_NAME, prog_name); #endif #if HAVE_PRCTL && defined PR_SET_MM_ARG_START - /* Shift the begining of the command line to prog_argv[0] (if set) so - /proc/pid/cmdline reflects the reight value. */ + /* Shift the beginning of the command line to prog_argv[0] (if set) so + /proc/pid/cmdline reflects the right value. */ prctl (PR_SET_MM_ARG_START, prog_argv[0]); #endif