s/non-zero/nonzero/g

33 files changed, 99 insertions, 99 deletions

diff --git a/src/chgrp.c b/src/chgrp.c
index 0cc33c60d..8de7f39a2 100644
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -73,10 +73,10 @@ static int changes_only;
 /* The name of the group to which ownership of the files is being given. */
 static char *groupname;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/chmod.c b/src/chmod.c
index eb7116b0d..cae5d7e65 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -57,10 +57,10 @@ static int verbose;
 /* If nonzero, describe only modes that change. */
 static int changes_only;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -94,7 +94,7 @@ describe_change (char *file, short unsigned int mode, int changed)
 }
 
 /* Change the mode of FILE according to the list of operations CHANGES.
-   If DEREF_SYMLINK is non-zero and FILE is a symbolic link, change the
+   If DEREF_SYMLINK is nonzero and FILE is a symbolic link, change the
    mode of the referenced file.  If DEREF_SYMLINK is zero, ignore symbolic
    links.  Return 0 if successful, 1 if errors occurred. */
 
diff --git a/src/chown.c b/src/chown.c
index bb2ad6e95..f3bbf45b7 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -79,10 +79,10 @@ static char *username;
 /* The name of the group to which ownership of the files is being given. */
 static char *groupname;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/cp.c b/src/cp.c
index 145fb02f6..4607d9a92 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -130,10 +130,10 @@ static int umask_kill;
 /* This process's effective user ID.  */
 static uid_t myeuid;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_opts[] =
@@ -459,7 +459,7 @@ do_copy (int argc, char **argv)
 }
 
 /* Copy the file SRC_PATH to the file DST_PATH.  The files may be of
-   any type.  NEW_DST should be non-zero if the file DST_PATH cannot
+   any type.  NEW_DST should be nonzero if the file DST_PATH cannot
    exist because its parent directory was just created; NEW_DST should
    be zero if DST_PATH might already exist.  DEVICE is the device
    number of the parent directory, or 0 if the parent of this file is
@@ -1037,7 +1037,7 @@ re_protect (char *const_dst_path, int src_offset, struct dir_attr *attr_list)
 }
 
 /* Read the contents of the directory SRC_PATH_IN, and recursively
-   copy the contents to DST_PATH_IN.  NEW_DST is non-zero if
+   copy the contents to DST_PATH_IN.  NEW_DST is nonzero if
    DST_PATH_IN is a directory that was created previously in the
    recursion.   SRC_SB and ANCESTORS describe SRC_PATH_IN.
    Return 0 if successful, -1 if an error occurs. */
@@ -1188,13 +1188,13 @@ copy_reg (char *src_path, char *dst_path)
 	{
 	  buf[n_read] = 1;	/* Sentinel to stop loop.  */
 
-	  /* Find first non-zero *word*, or the word with the sentinel.  */
+	  /* Find first nonzero *word*, or the word with the sentinel.  */
 
 	  ip = (int *) buf;
 	  while (*ip++ == 0)
 	    ;
 
-	  /* Find the first non-zero *byte*, or the sentinel.  */
+	  /* Find the first nonzero *byte*, or the sentinel.  */
 
 	  cp = (char *) (ip - 1);
 	  while (*cp++ == 0)
diff --git a/src/date.c b/src/date.c
index 49ca9ef75..378b30262 100644
--- a/src/date.c
+++ b/src/date.c
@@ -50,13 +50,13 @@ static void usage ();
 /* The name this program was run with, for error messages. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
-/* If non-zero, print or set Coordinated Universal Time.  */
+/* If nonzero, print or set Coordinated Universal Time.  */
 static int universal_time = 0;
 
 static struct option const long_options[] =
@@ -76,7 +76,7 @@ static struct option const long_options[] =
 /* Parse each line in INPUT_FILENAME as with --date and display the
    each resulting time and date.  If the file cannot be opened, tell why
    then exit.  Issue a diagnostic for any lines that cannot be parsed.
-   If any line cannot be parsed, return non-zero;  otherwise return zero.  */
+   If any line cannot be parsed, return nonzero;  otherwise return zero.  */
 
 static int
 batch_convert (input_filename, format)
diff --git a/src/dd.c b/src/dd.c
index dae19ee04..09f66aba2 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -305,10 +305,10 @@ static unsigned char const ebcdic_to_ascii[] =
   070, 071, 0372, 0373, 0374, 0375, 0376, 0377
 };
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/df.c b/src/df.c
index 222f973e0..a8400ecdd 100644
--- a/src/df.c
+++ b/src/df.c
@@ -81,7 +81,7 @@ static int posix_format;
 
 /* If nonzero, invoke the `sync' system call before getting any usage data.
    Using this option can make df very slow, especially with many or very
-   busy disks.  Default to non-zero because the sync call does make a
+   busy disks.  Default to nonzero because the sync call does make a
    difference on some systems -- SunOs4.1.3, for one.  I have been assured
    that it is *not* necessary on Linux, so there should be a way to
    configure this.  FIXME.  */
@@ -119,13 +119,13 @@ static struct fs_type_list *fs_exclude_list;
 /* Linked list of mounted filesystems. */
 static struct mount_entry *mount_list;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
-/* If non-zero, print filesystem type as well.  */
+/* If nonzero, print filesystem type as well.  */
 static int print_type;
 
 static struct option const long_options[] =
diff --git a/src/du.c b/src/du.c
index 41e8b537b..0041232fa 100644
--- a/src/du.c
+++ b/src/du.c
@@ -159,10 +159,10 @@ static int (*xstat) ();
 /* The exit status to use if we don't get any fatal errors. */
 static int exit_status;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 /* Grand total size of all args. */
@@ -554,7 +554,7 @@ hash_reset (void)
 
 /* Insert an item (inode INO and device DEV) in the hash
    structure in the global variable `htab', if an entry with the same data
-   was not found already.  Return zero if the item was inserted and non-zero
+   was not found already.  Return zero if the item was inserted and nonzero
    if it wasn't.  */
 
 static int
@@ -621,7 +621,7 @@ hash_insert (ino_t ino, dev_t dev)
 }
 
 /* Insert INO and DEV in the hash structure HTAB, if not
-   already present.  Return zero if inserted and non-zero if it
+   already present.  Return zero if inserted and nonzero if it
    already existed.  */
 
 static int
diff --git a/src/env.c b/src/env.c
index 816b3b80e..0bce0eb99 100644
--- a/src/env.c
+++ b/src/env.c
@@ -96,10 +96,10 @@ extern char **environ;
 /* The name by which this program was run. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
@@ -150,7 +150,7 @@ main (argc, argv, envp)
 
   if (optind != argc && !strcmp (argv[optind], "-"))
     ignore_environment = 1;
-  
+
   environ = dummy_environ;
   environ[0] = NULL;
 
diff --git a/src/id.c b/src/id.c
index b02ba7853..d161ac3ff 100644
--- a/src/id.c
+++ b/src/id.c
@@ -84,10 +84,10 @@ static gid_t rgid, egid;
 /* The number of errors encountered so far. */
 static int problems = 0;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
@@ -285,14 +285,14 @@ print_full_info (username)
     problems++;
   else
     printf ("(%s)", pwd->pw_name);
-  
+
   printf (" gid=%u", (unsigned) rgid);
   grp = getgrgid (rgid);
   if (grp == NULL)
     problems++;
   else
     printf ("(%s)", grp->gr_name);
-  
+
   if (euid != ruid)
     {
       printf (" euid=%u", (unsigned) euid);
@@ -302,7 +302,7 @@ print_full_info (username)
       else
 	printf ("(%s)", pwd->pw_name);
     }
-  
+
   if (egid != rgid)
     {
       printf (" egid=%u", (unsigned) egid);
diff --git a/src/install.c b/src/install.c
index 86dc6f1d3..dea82831f 100644
--- a/src/install.c
+++ b/src/install.c
@@ -134,10 +134,10 @@ static int strip_files;
 /* If nonzero, install a directory instead of a regular file. */
 static int dir_arg;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -303,7 +303,7 @@ static char buffer[READ_SIZE];
 
 /* Copy file FROM onto file TO, creating TO if necessary.
    Return 0 if the copy is successful, 1 if not.  If the copy is
-   successful, set *TO_CREATED to non-zero if TO was created (if it did
+   successful, set *TO_CREATED to nonzero if TO was created (if it did
    not exist or did, but was unlinked) and to zero otherwise.  If the
    copy fails, don't modify *TO_CREATED.  */
 
@@ -394,7 +394,7 @@ copy_file (char *from, char *to, int *to_created)
 }
 
 /* Set the attributes of file or directory PATH.
-   If NO_NEED_TO_CHOWN is non-zero, don't call chown.
+   If NO_NEED_TO_CHOWN is nonzero, don't call chown.
    Return 0 if successful, 1 if not. */
 
 static int
diff --git a/src/ln.c b/src/ln.c
index d80a9c0da..8f144aabb 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -92,10 +92,10 @@ static int hard_dir_link;
    symlink-to-dir before creating the new link.  */
 static int dereference_dest_dir_symlinks = 1;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -177,7 +177,7 @@ do_link (char *source, char *dest)
       char *new_dest;
       PATH_BASENAME_CONCAT (new_dest, dest, source);
       dest = new_dest;
-      /* Set this to non-zero to force another call to lstat
+      /* Set this to nonzero to force another call to lstat
 	 with the new destination.  */
       lstat_status = 1;
     }
diff --git a/src/logname.c b/src/logname.c
index 44b53a854..e12c3ebd7 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -26,10 +26,10 @@
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/ls.c b/src/ls.c
index e07c0eaa9..8d234877d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -465,10 +465,10 @@ static int format_needs_stat;
 
 static int exit_status;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -1673,7 +1673,7 @@ extract_dirs_from_files (const char *dirname, int recursive)
   files_index = j;
 }
 
-/* Return non-zero if `name' doesn't end in `.' or `..'
+/* Return nonzero if `name' doesn't end in `.' or `..'
    This is so we don't try to recurse on `././././. ...' */
 
 static int
diff --git a/src/mkdir.c b/src/mkdir.c
index 6312bb3d3..6b4aad8d3 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -44,10 +44,10 @@ char *program_name;
 /* If nonzero, ensure that all parents of the specified directory exist.  */
 static int path_mode;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/mkfifo.c b/src/mkfifo.c
index 86e3377d5..ec33aef50 100644
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -35,10 +35,10 @@
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/mknod.c b/src/mknod.c
index 30989bcce..580ccae2e 100644
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -41,10 +41,10 @@
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/mv.c b/src/mv.c
index 2cea495c9..089a261c3 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -91,10 +91,10 @@ static uid_t myeuid;
 /* FIXME */
 static struct stat dest_stats, source_stats;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/pathchk.c b/src/pathchk.c
index 2b10b8c65..9c137ee25 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -99,10 +99,10 @@ static void usage ();
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
@@ -174,13 +174,13 @@ static char const portable_chars[256] =
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 80-95 */
   0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 96-111 */
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 112-127 */
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
diff --git a/src/printenv.c b/src/printenv.c
index f631ab13a..8cee1766b 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -39,10 +39,10 @@
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/rm.c b/src/rm.c
index 2f9593eeb..26c528699 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -93,10 +93,10 @@ static int unlink_dirs;
 /* If nonzero, stdin is a tty.  */
 static int stdin_tty;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_opts[] =
diff --git a/src/rmdir.c b/src/rmdir.c
index 8c2f75b7e..13593fb0a 100644
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -39,10 +39,10 @@ char *program_name;
 /* If nonzero, remove empty parent directories. */
 static int empty_paths;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/seq.c b/src/seq.c
index ec72eea50..2cd1bc30a 100644
--- a/src/seq.c
+++ b/src/seq.c
@@ -30,7 +30,7 @@ static int check_format ();
 static char *get_width_format ();
 static int print_numbers ();
 
-/* If non-zero print all number with equal width. */
+/* If nonzero print all number with equal width. */
 static int equal_width;
 
 /* The printf(3) format used for output. */
@@ -45,10 +45,10 @@ char *program_name;
 /* The string used to separate two number. */
 static char *separator;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 /* The increment. */
@@ -111,7 +111,7 @@ main (argc, argv)
   from = 1.0;
   step_is_set = 0;
 
-  /* We have to handle negative numbers in the command line but this 
+  /* We have to handle negative numbers in the command line but this
      conflicts with the command line arguments.  So the getopt mode is
      REQUIRE_ORDER (the '+' in the format string) and it abort on the
      first non-option or negative number.  */
diff --git a/src/sleep.c b/src/sleep.c
index 15b8fb065..e8f5cd9f9 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -29,10 +29,10 @@ static long argdecode ();
 /* The name by which this program was run. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/stty.c b/src/stty.c
index e177a486b..7ca5e1fde 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -1186,7 +1186,7 @@ set_speed (type, arg, mode)
 
 /* Get window size information.  First try getting the information
    associated with standard output and if that fails, try standard input.
-   Return zero for success, non-zero if both ioctl's failed.  */
+   Return zero for success, nonzero if both ioctl's failed.  */
 
 static int
 get_win_size (win)
diff --git a/src/su.c b/src/su.c
index ea4f1bfdc..1464d3b2a 100644
--- a/src/su.c
+++ b/src/su.c
@@ -161,10 +161,10 @@ extern char **environ;
 /* The name this program was run with.  */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 /* If nonzero, pass the `-f' option to the subshell.  */
diff --git a/src/tee.c b/src/tee.c
index b81d37579..2e980243a 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -41,10 +41,10 @@ static int ignore_interrupts;
 /* The name that this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -85,7 +85,7 @@ main (argc, argv)
 {
   int errs;
   int optc;
-	
+
   program_name = argv[0];
   append = 0;
   ignore_interrupts = 0;
diff --git a/src/test.c b/src/test.c
index 6675c3e99..4baab1924 100644
--- a/src/test.c
+++ b/src/test.c
@@ -248,7 +248,7 @@ integer_expected_error (pch)
   test_syntax_error (_("integer expression expected %s\n"), pch);
 }
 
-/* Return non-zero if the characters pointed to by STRING constitute a
+/* Return nonzero if the characters pointed to by STRING constitute a
    valid number.  Stuff the converted number into RESULT if RESULT is
    a non-null pointer to a long. */
 static int
@@ -309,7 +309,7 @@ isint (string, result)
 }
 
 /* Find the modification time of FILE, and stuff it into AGE, a pointer
-   to a long.  Return non-zero if successful, else zero. */
+   to a long.  Return nonzero if successful, else zero. */
 static int
 age_of (filename, age)
      char *filename;
@@ -882,7 +882,7 @@ binop (s)
 	  (STREQ (s, "-gt")) || (STREQ (s, "-ge")));
 }
 
-/* Return non-zero if OP is one of the test command's unary operators. */
+/* Return nonzero if OP is one of the test command's unary operators. */
 static int
 unop (op)
      int op;
@@ -1008,7 +1008,7 @@ EXPRESSION is true or false and sets exit status.  It is one of:\n\
   EXPRESSION1 -a EXPRESSION2   both EXPRESSION1 and EXPRESSION2 are true\n\
   EXPRESSION1 -o EXPRESSION2   either EXPRESSION1 or EXPRESSION2 is true\n\
 \n\
-  [-n] STRING          the length of STRING is non-zero\n\
+  [-n] STRING          the length of STRING is nonzero\n\
   -z STRING            the length of STRING is zero\n\
   STRING1 = STRING2    the strings are equal\n\
   STRING1 != STRING2   the strings are not equal\n\
diff --git a/src/touch.c b/src/touch.c
index b53935359..c49ddb28c 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -93,10 +93,10 @@ static char *ref_file;
 /* Info about the reference file. */
 static struct stat ref_stats;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/tty.c b/src/tty.c
index 6a9baf1a4..29d279df1 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -39,10 +39,10 @@ char *program_name;
 /* If nonzero, return an exit status but produce no output. */
 static int silent;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/uname.c b/src/uname.c
index 6fd34d8c3..dc4bcd360 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -20,7 +20,7 @@
    -s, --sysname	SunOS
    -n, --nodename	rocky8
    -r, --release	4.0
-   -v, --version	
+   -v, --version
    -m, --machine	sun
    -a, --all		SunOS rocky8 4.0  sun
 
@@ -63,10 +63,10 @@ static unsigned char toprint;
 /* The name this program was run with, for error messages. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/who.c b/src/who.c
index d31134296..cb0125fd8 100644
--- a/src/who.c
+++ b/src/who.c
@@ -92,10 +92,10 @@ char *xmalloc ();
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 #ifdef WHO
@@ -226,7 +226,7 @@ print_entry (this)
       mesg = '?';
       last_change = 0;
     }
-  
+
   printf ("%-8.*s", (int) sizeof (this->ut_name), this->ut_name);
   if (include_mesg)
     printf ("  %c  ", mesg);
@@ -492,7 +492,7 @@ who_am_i (filename)
   if (tty == NULL)
     return;
   tty += 5;			/* Remove "/dev/".  */
-  
+
   utmp_entry = search_entries (read_utmp (filename), tty);
   if (utmp_entry == NULL)
     return;
diff --git a/src/whoami.c b/src/whoami.c
index 2a7b45e65..f762dbc60 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -30,10 +30,10 @@
 /* The name this program was run with. */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version;
 
 static struct option const long_options[] =