diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/copy.c | 8 | ||||
| -rw-r--r-- | src/du.c | 8 | ||||
| -rw-r--r-- | src/install.c | 2 | ||||
| -rw-r--r-- | src/ls.c | 12 | ||||
| -rw-r--r-- | src/touch.c | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/src/copy.c b/src/copy.c index 38d7c5da8..c3d71cbc8 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1946,9 +1946,9 @@ copy_internal (char const *src_name, char const *dst_name, if (!S_ISDIR (src_mode) && x->update) { - /* When preserving time stamps (but not moving within a file - system), don't worry if the destination time stamp is - less than the source merely because of time stamp + /* When preserving timestamps (but not moving within a file + system), don't worry if the destination timestamp is + less than the source merely because of timestamp truncation. */ int options = ((x->preserve_timestamps && ! (x->move_mode @@ -2681,7 +2681,7 @@ copy_internal (char const *src_name, char const *dst_name, /* See if the destination is already the desired symlink. FIXME: This behavior isn't documented, and seems wrong in some cases, e.g., if the destination symlink has the - wrong ownership, permissions, or time stamps. */ + wrong ownership, permissions, or timestamps. */ char *dest_link_val = areadlink_with_size (dst_name, dst_sb.st_size); if (dest_link_val && STREQ (dest_link_val, src_link_val)) @@ -81,8 +81,8 @@ struct duinfo /* Number of inodes in directory. */ uintmax_t inodes; - /* Latest time stamp found. If tmax.tv_sec == TYPE_MINIMUM (time_t) - && tmax.tv_nsec < 0, no time stamp has been found. */ + /* Latest timestamp found. If tmax.tv_sec == TYPE_MINIMUM (time_t) + && tmax.tv_nsec < 0, no timestamp has been found. */ struct timespec tmax; }; @@ -255,8 +255,8 @@ static enum time_type const time_types[] = ARGMATCH_VERIFY (time_args, time_types); /* 'full-iso' uses full ISO-style dates and times. 'long-iso' uses longer - ISO-style time stamps, though shorter than 'full-iso'. 'iso' uses shorter - ISO-style time stamps. */ + ISO-style timestamps, though shorter than 'full-iso'. 'iso' uses shorter + ISO-style timestamps. */ enum time_style { full_iso_time_style, /* --time-style=full-iso */ diff --git a/src/install.c b/src/install.c index 33496bdfa..592c3452a 100644 --- a/src/install.c +++ b/src/install.c @@ -531,7 +531,7 @@ change_timestamps (struct stat const *src_sb, char const *dest) if (utimens (dest, timespec)) { - error (0, errno, _("cannot set time stamps for %s"), quoteaf (dest)); + error (0, errno, _("cannot set timestamps for %s"), quoteaf (dest)); return false; } return true; @@ -418,8 +418,8 @@ enum format static enum format format; /* 'full-iso' uses full ISO-style dates and times. 'long-iso' uses longer - ISO-style time stamps, though shorter than 'full-iso'. 'iso' uses shorter - ISO-style time stamps. 'locale' uses locale-dependent time stamps. */ + ISO-style timestamps, though shorter than 'full-iso'. 'iso' uses shorter + ISO-style timestamps. 'locale' uses locale-dependent timestamps. */ enum time_style { full_iso_time_style, /* --time-style=full-iso */ @@ -730,11 +730,11 @@ static bool format_needs_stat; static bool format_needs_type; -/* An arbitrary limit on the number of bytes in a printed time stamp. +/* An arbitrary limit on the number of bytes in a printed timestamp. This is set to a relatively small value to avoid the need to worry about denial-of-service attacks on servers that run "ls" on behalf of remote clients. 1000 bytes should be enough for any practical - time stamp format. */ + timestamp format. */ enum { TIME_STAMP_LEN_MAXIMUM = MAX (1000, INT_STRLEN_BOUND (time_t)) }; @@ -1079,7 +1079,7 @@ first_percent_b (char const *fmt) /* max number of display cells to use */ enum { MAX_MON_WIDTH = 5 }; -/* abformat[RECENT][MON] is the format to use for time stamps with +/* abformat[RECENT][MON] is the format to use for timestamps with recentness RECENT and month MON. */ enum { ABFORMAT_SIZE = 128 }; static char abformat[2][12][ABFORMAT_SIZE]; @@ -3813,7 +3813,7 @@ align_nstrftime (char *buf, size_t size, bool recent, struct tm const *tm, return nstrftime (buf, size, nfmt, tm, tz, ns); } -/* Return the expected number of columns in a long-format time stamp, +/* Return the expected number of columns in a long-format timestamp, or zero if it cannot be calculated. */ static int diff --git a/src/touch.c b/src/touch.c index ff0ba92a9..cd4a9d3ab 100644 --- a/src/touch.c +++ b/src/touch.c @@ -374,8 +374,8 @@ main (int argc, char **argv) && newtime[0].tv_sec == now.tv_sec && newtime[0].tv_nsec == now.tv_nsec) { - /* Check that it really was "-d now", and not a time - stamp that just happens to be the current time. */ + /* Check that it really was "-d now", and not a timestamp + that just happens to be the current time. */ struct timespec notnow, notnow1; notnow.tv_sec = now.tv_sec ^ 1; notnow.tv_nsec = now.tv_nsec; |