diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cat.c | 6 | ||||
| -rw-r--r-- | src/copy.c | 4 | ||||
| -rw-r--r-- | src/copy.h | 2 | ||||
| -rw-r--r-- | src/cp.c | 2 | ||||
| -rw-r--r-- | src/cut.c | 2 | ||||
| -rw-r--r-- | src/dd.c | 2 | ||||
| -rw-r--r-- | src/df.c | 2 | ||||
| -rw-r--r-- | src/fiemap.h | 2 | ||||
| -rw-r--r-- | src/longlong.h | 6 | ||||
| -rw-r--r-- | src/ls.c | 4 | ||||
| -rw-r--r-- | src/numfmt.c | 2 | ||||
| -rw-r--r-- | src/pr.c | 2 | ||||
| -rw-r--r-- | src/shred.c | 2 | ||||
| -rw-r--r-- | src/shuf.c | 2 | ||||
| -rw-r--r-- | src/split.c | 4 |
15 files changed, 22 insertions, 22 deletions
@@ -239,7 +239,7 @@ cat ( /* Pointer to the next character in the input buffer. */ char *bpin; - /* Pointer to the first non-valid byte in the input buffer, i.e. the + /* Pointer to the first non-valid byte in the input buffer, i.e., the current end of the buffer. */ char *eob; @@ -365,7 +365,7 @@ cat ( /* It was a real (not a sentinel) newline. */ /* Was the last line empty? - (i.e. have two or more consecutive newlines been read?) */ + (i.e., have two or more consecutive newlines been read?) */ if (++newlines > 0) { @@ -422,7 +422,7 @@ cat ( which means that the buffer is empty or that a proper newline has been found. */ - /* If quoting, i.e. at least one of -v, -e, or -t specified, + /* If quoting, i.e., at least one of -v, -e, or -t specified, scan for chars that need conversion. */ if (show_nonprinting) { diff --git a/src/copy.c b/src/copy.c index 632e1198d..b93c53313 100644 --- a/src/copy.c +++ b/src/copy.c @@ -184,7 +184,7 @@ create_hole (int fd, char const *name, bool punch_holes, off_t size) } /* Some file systems (like XFS) preallocate when write extending a file. - I.E. a previous write() may have preallocated extra space + I.e., a previous write() may have preallocated extra space that the seek above will not discard. A subsequent write() could then make this allocation permanent. */ if (punch_holes && punch_hole (fd, file_end - size, size) < 0) @@ -487,7 +487,7 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, last_ext_start = ext_start; /* Treat an unwritten but allocated extent much like a hole. - I.E. don't read, but don't convert to a hole in the destination, + I.e., don't read, but don't convert to a hole in the destination, unless SPARSE_ALWAYS. */ /* For now, do not treat FIEMAP_EXTENT_UNWRITTEN specially, because that (in combination with no sync) would lead to data diff --git a/src/copy.h b/src/copy.h index c356c2910..bff5ff83b 100644 --- a/src/copy.h +++ b/src/copy.h @@ -254,7 +254,7 @@ struct cp_options that was specified on the command line. Use it to avoid clobbering source files in commands like this: rm -rf a b c; mkdir a b c; touch a/f b/f; mv a/f b/f c - For now, it protects only regular files when copying (i.e. not renaming). + For now, it protects only regular files when copying (i.e., not renaming). When renaming, it protects all non-directories. Use dest_info_init to initialize it, or set it to NULL to disable this feature. */ @@ -1191,7 +1191,7 @@ main (int argc, char **argv) "without an SELinux-enabled kernel")); /* FIXME: This handles new files. But what about existing files? - I.E. if updating a tree, new files would have the specified context, + I.e., if updating a tree, new files would have the specified context, but shouldn't existing files be updated for consistency like this? if (scontext) restorecon (dst_path, 0, true); @@ -425,7 +425,7 @@ set_fields (const char *fieldstr) return field_found; } -/* Increment *ITEM_IDX (i.e. a field or byte index), +/* Increment *ITEM_IDX (i.e., a field or byte index), and if required CURRENT_RP. */ static inline void @@ -2036,7 +2036,7 @@ dd_copy (void) The page alignment is necessary on any Linux kernel that supports either the SGI raw I/O patch or Steven Tweedies raw I/O patch. - It is necessary when accessing raw (i.e. character special) disk + It is necessary when accessing raw (i.e., character special) disk devices on Unixware or other SVR4-derived system. */ if (skip_records != 0 || skip_bytes != 0) @@ -605,7 +605,7 @@ excluded_fstype (const char *fstype) /* Filter mount list by skipping duplicate entries. In the case of duplicates - based on the device number - the mount entry - with a '/' in its me_devname (i.e. not pseudo name like tmpfs) wins. + with a '/' in its me_devname (i.e., not pseudo name like tmpfs) wins. If both have a real devname (e.g. bind mounts), then that with the shorter me_mountdir wins. With DEVICES_ONLY == true (set with df -a), only update the global device_list, rather than filtering the global mount_list. */ diff --git a/src/fiemap.h b/src/fiemap.h index 15ddff9a0..88a9fa614 100644 --- a/src/fiemap.h +++ b/src/fiemap.h @@ -95,7 +95,7 @@ struct fiemap /* Multiple files in block. Set EXTENT_NOT_ALIGNED. */ # define FIEMAP_EXTENT_DATA_TAIL 0x00000400 -/* Space allocated, but not data (i.e. zero). */ +/* Space allocated, but not data (i.e., zero). */ # define FIEMAP_EXTENT_UNWRITTEN 0x00000800 /* File does not natively support extents. Result merged for efficiency. */ diff --git a/src/longlong.h b/src/longlong.h index 758e2088d..7b059cc9e 100644 --- a/src/longlong.h +++ b/src/longlong.h @@ -83,13 +83,13 @@ along with this file. If not, see http://www.gnu.org/licenses/. */ high_addend_2, low_addend_2) adds two UWtype integers, composed by HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2 respectively. The result is placed in HIGH_SUM and LOW_SUM. Overflow - (i.e. carry out) is not stored anywhere, and is lost. + (i.e., carry out) is not stored anywhere, and is lost. 8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend, high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers, composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and LOW_SUBTRAHEND_2 respectively. The result is placed in HIGH_DIFFERENCE - and LOW_DIFFERENCE. Overflow (i.e. carry out) is not stored anywhere, + and LOW_DIFFERENCE. Overflow (i.e., carry out) is not stored anywhere, and is lost. If any of these macros are left undefined for a particular CPU, @@ -2033,7 +2033,7 @@ extern UWtype mpn_udiv_qrnnd_r (UWtype, UWtype, UWtype, UWtype *); if (__r1 < __m) \ { \ __q1--, __r1 += (d); \ - if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\ + if (__r1 >= (d)) /* i.e., we didn't get carry when adding to __r1 */\ if (__r1 < __m) \ __q1--, __r1 += (d); \ } \ @@ -3552,8 +3552,8 @@ static qsortFunc const sort_functions[][2][2][2] = }; /* The number of sort keys is calculated as the sum of - the number of elements in the sort_type enum (i.e. sort_numtypes) - the number of elements in the time_type enum (i.e. time_numtypes) - 1 + the number of elements in the sort_type enum (i.e., sort_numtypes) + the number of elements in the time_type enum (i.e., time_numtypes) - 1 This is because when sort_type==sort_time, we have up to time_numtypes possible sort keys. diff --git a/src/numfmt.c b/src/numfmt.c index a97994ada..550e3845f 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -1277,7 +1277,7 @@ extract_fields (char *line, int _field, *_suffix = skip_fields (*_data, 1); if (**_suffix) { - /* there is a suffix (i.e. the field is not the last on the line), + /* there is a suffix (i.e., the field is not the last on the line), so null-terminate the _data before it. */ **_suffix = '\0'; ++(*_suffix); @@ -46,7 +46,7 @@ only one POSIX requirement has to be met: The default n-separator should be a TAB. The consequence is a different width between the number and the text if the output position - of the separator changes, i.e. it depends upon the left margin used. + of the separator changes, i.e., it depends upon the left margin used. That's not nice but easy-to-use together with the defaults of other utilities, e.g. sort or cut. - Same as SunOS does. - With multicolumn output diff --git a/src/shred.c b/src/shred.c index e460e4f8e..543dcb0ca 100644 --- a/src/shred.c +++ b/src/shred.c @@ -517,7 +517,7 @@ dopass (int fd, struct stat const *st, char const *qname, off_t *sizep, /* Retry without direct I/O since this may not be supported at all on some (file) systems, or with the current size. - I.E. a specified --size that is not aligned, or when + I.e., a specified --size that is not aligned, or when dealing with slop at the end of a file with --exact. */ if (! try_without_directio && errno == EINVAL) { diff --git a/src/shuf.c b/src/shuf.c index 9db027c18..5a25e581c 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -273,7 +273,7 @@ read_input (FILE *in, char eolbyte, char ***pline) size_t n_lines; /* TODO: We should limit the amount of data read here, - to less than RESERVOIR_MIN_INPUT. I.E. adjust fread_file() to support + to less than RESERVOIR_MIN_INPUT. I.e., adjust fread_file() to support taking a byte limit. We'd then need to ensure we handle a line spanning this boundary. With that in place we could set use_reservoir_sampling when used==RESERVOIR_MIN_INPUT, and have read_input_reservoir_sampling() diff --git a/src/split.c b/src/split.c index d17616c17..8d03c1620 100644 --- a/src/split.c +++ b/src/split.c @@ -990,11 +990,11 @@ ofile_open (of_t *files, size_t i_check, size_t nfiles) In specialised cases the consumer can keep reading from the fifo, terminating on conditions in the data itself, or perhaps never in the case of 'tail -f'. - I.E. for fifos it is valid to attempt this reopen. + I.e., for fifos it is valid to attempt this reopen. We don't handle the filter_command case here, as create() will exit if there are not enough files in that case. - I.E. we don't support restarting filters, as that would + I.e., we don't support restarting filters, as that would put too much burden on users specifying --filter commands. */ fd = open (files[i_check].of_name, O_WRONLY | O_BINARY | O_APPEND | O_NONBLOCK); |