diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/devprobe.c | 2 | ||||
| -rw-r--r-- | utils/ftpcp.c | 2 | ||||
| -rw-r--r-- | utils/ftpdir.c | 2 | ||||
| -rw-r--r-- | utils/login.c | 2 | ||||
| -rw-r--r-- | utils/mount.c | 2 | ||||
| -rw-r--r-- | utils/shd.c | 2 | ||||
| -rw-r--r-- | utils/storeinfo.c | 4 | ||||
| -rw-r--r-- | utils/vmstat.c | 4 | ||||
| -rw-r--r-- | utils/w.c | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/utils/devprobe.c b/utils/devprobe.c index b5ebafe4..d7020322 100644 --- a/utils/devprobe.c +++ b/utils/devprobe.c @@ -35,7 +35,7 @@ static const struct argp_option options[] = { {0} }; static const char *args_doc = "DEVNAME..."; -static const char *doc = "Test for the existance of mach device DEVNAME..." +static const char *doc = "Test for the existence of mach device DEVNAME..." "\vThe exit status is 0 if any devices were found."; int diff --git a/utils/ftpcp.c b/utils/ftpcp.c index 4c4c151a..67ccb1a0 100644 --- a/utils/ftpcp.c +++ b/utils/ftpcp.c @@ -240,7 +240,7 @@ efinish (struct epoint *e) } /* Give a name which refers to a directory file, and a name in that - directory, this should return in COMPOSITE the composite name refering to + directory, this should return in COMPOSITE the composite name referring to that name in that directory, in malloced storage. */ error_t eappend (struct epoint *e, diff --git a/utils/ftpdir.c b/utils/ftpdir.c index 9b496add..4ccb821d 100644 --- a/utils/ftpdir.c +++ b/utils/ftpdir.c @@ -39,7 +39,7 @@ static struct argp_option options[] = {"account", 'a', "ACCT",0, "Account to login as"}, {"separator",'S', "SEP", 0, "String to separate multiple listings"}, {"prefix", 'P', "PFX", 0, "String to proceed listings; the first and second" - " occurances of %s are replace by HOST and DIR"}, + " occurrences of %s are replace by HOST and DIR"}, {"host", 'h', "HOST",0, "Use HOST as a default host"}, {"debug", 'D', 0, 0, "Turn on debugging output for ftp connections"}, {"intepret", 'i', 0, 0, "Parse the directory output"}, diff --git a/utils/login.c b/utils/login.c index aefc2187..cad3b1ed 100644 --- a/utils/login.c +++ b/utils/login.c @@ -663,7 +663,7 @@ main(int argc, char *argv[]) if (ugids.eff_uids.num + ugids.avail_uids.num == 0) /* We're transiting from having some uids to having none, which means this is probably a new login session. Unless specified otherwise, - set a timer to kill this session if it hasn't aquired any ids by + set a timer to kill this session if it hasn't acquired any ids by then. Note that we fork off the timer process before clearing the process owner: because we're interested in killing unowned processes, proc's in-same-login-session rule should apply to us diff --git a/utils/mount.c b/utils/mount.c index e9f64d85..8b059c23 100644 --- a/utils/mount.c +++ b/utils/mount.c @@ -48,7 +48,7 @@ static const struct argp_option argp_opts[] = {"timeout", 'T', "MILLISECONDS", 0, "Timeout for translator startup"}, {"format", 'p', "mount|fstab|translator", OPTION_ARG_OPTIONAL, "Output format for query (no filesystem arguments)"}, - {"options", 'o', "OPTIONS", 0, "A `,' seperated list of options"}, + {"options", 'o', "OPTIONS", 0, "A `,' separated list of options"}, {"readonly", 'r', 0, 0, "Never write to disk or allow opens for writing"}, {"writable", 'w', 0, 0, "Use normal read/write behavior"}, {"update", 'u', 0, 0, "Flush any meta-data cached in core"}, diff --git a/utils/shd.c b/utils/shd.c index 0587fa42..a1a4b26b 100644 --- a/utils/shd.c +++ b/utils/shd.c @@ -86,7 +86,7 @@ run (char **argv, int fd0, int fd1) file = file_name_lookup (program, O_EXEC, 0); if (file == MACH_PORT_NULL) { - error (0, errno, program); + error (0, errno, "%s", program); return -1; } else diff --git a/utils/storeinfo.c b/utils/storeinfo.c index 411bf11a..a738d50d 100644 --- a/utils/storeinfo.c +++ b/utils/storeinfo.c @@ -204,7 +204,7 @@ main (int argc, char *argv[]) struct store *store; if (file == MACH_PORT_NULL) - error (3, err, source); + error (3, err, "%s", source); if (print_prefix < 0) /* By default, only print filename prefixes for multiple files. */ @@ -220,7 +220,7 @@ main (int argc, char *argv[]) of what the unknown data looked like. */ err = store_create (file, STORE_INACTIVE|STORE_NO_FILEIO, 0, &store); if (err) - error (4, err, source); + error (4, err, "%s", source); print_store (store, 0, what); store_free (store); diff --git a/utils/vmstat.c b/utils/vmstat.c index 86494dce..7d852992 100644 --- a/utils/vmstat.c +++ b/utils/vmstat.c @@ -111,7 +111,7 @@ print_val (val_t val, enum val_type type, float fval = val; char *units = " KMGT", *u = units; - while (fval > 1024) + while (fval >= 10000) { fval /= 1024; u++; @@ -456,7 +456,7 @@ main (int argc, char **argv) if (field->standard) output_fields |= (1 << (field - fields)); - /* Returns an appropiate SIZE_UNITS for printing FIELD. */ + /* Returns an appropriate SIZE_UNITS for printing FIELD. */ #define SIZE_UNITS(field) \ (size_units >= 0 \ ? size_units \ @@ -253,7 +253,7 @@ static void add_utmp_procs (struct proc_stat_list *procs, struct utmp *u) { /* The tty name, with space for '\0' termination and an - appropiate prefix. */ + appropriate prefix. */ char tty[sizeof _PATH_DEV + sizeof u->ut_line]; io_t tty_node; error_t err; |