diff options
| author | Ron Yorston <rmy@pobox.com> | 2025-11-11 10:00:52 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2025-11-11 10:00:52 +0000 |
| commit | 0ee678e0d1d465f3d83fb22a4ec4e7ca33686284 (patch) | |
| tree | 390f1390bcf2db0fe2cd2411e817eaed5832cfa0 /util-linux | |
| parent | af09683cfc5ffe05f3e42bb592fe15a753540d85 (diff) | |
| parent | 8d7ae80eda7e08ee361f8793683ae58216caf720 (diff) | |
| download | busybox-w32-merge.tar.gz busybox-w32-merge.tar.bz2 busybox-w32-merge.zip | |
Merge branch 'busybox' into mergemerge
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/eject.c | 2 | ||||
| -rw-r--r-- | util-linux/last.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/eject.c b/util-linux/eject.c index b9813262b..4fa6dbd94 100644 --- a/util-linux/eject.c +++ b/util-linux/eject.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | //kbuild:lib-$(CONFIG_EJECT) += eject.o | 31 | //kbuild:lib-$(CONFIG_EJECT) += eject.o |
| 32 | 32 | ||
| 33 | //usage:#define eject_trivial_usage | 33 | //usage:#define eject_trivial_usage |
| 34 | //usage: "[-t] [-T] [DEVICE]" | 34 | //usage: IF_FEATURE_EJECT_SCSI("[-s] ") "[-t] [-T] [DEVICE]" |
| 35 | //usage:#define eject_full_usage "\n\n" | 35 | //usage:#define eject_full_usage "\n\n" |
| 36 | //usage: "Eject DEVICE or default /dev/cdrom\n" | 36 | //usage: "Eject DEVICE or default /dev/cdrom\n" |
| 37 | //usage: IF_FEATURE_EJECT_SCSI( | 37 | //usage: IF_FEATURE_EJECT_SCSI( |
diff --git a/util-linux/last.c b/util-linux/last.c index 7530d013d..aafd01bb9 100644 --- a/util-linux/last.c +++ b/util-linux/last.c | |||
| @@ -157,7 +157,7 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
| 157 | ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4); | 157 | ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4); |
| 158 | next: | 158 | next: |
| 159 | pos -= sizeof(ut); | 159 | pos -= sizeof(ut); |
| 160 | if (pos <= 0) | 160 | if (pos < 0) |
| 161 | break; /* done. */ | 161 | break; /* done. */ |
| 162 | xlseek(file, pos, SEEK_SET); | 162 | xlseek(file, pos, SEEK_SET); |
| 163 | } | 163 | } |