Skip to content

Commit 87ba3af

Browse files
authored
Merge pull request #9317 from sylvestre/shred-passes
shred: ensure deterministic pass sequence compatibility with reference implementation
2 parents 2b67abe + 2e3a1ad commit 87ba3af

File tree

5 files changed

+322
-55
lines changed

5 files changed

+322
-55
lines changed

docs/src/extensions.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,6 @@ Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provide
190190

191191
Just like on macOS, `base32/base64/basenc` provides `-D` to decode data.
192192

193-
## `shred`
194-
195-
The number of random passes is deterministic in both GNU and uutils. However, uutils `shred` computes the number of random passes in a simplified way, specifically `max(3, x / 10)`, which is very close but not identical to the number of random passes that GNU would do. This also satisfies an expectation that reasonable users might have, namely that the number of random passes increases monotonically with the number of passes overall; GNU `shred` violates this assumption.
196-
197193
## `unexpand`
198194

199195
GNU `unexpand` provides `--first-only` to convert only leading sequences of blanks. We support a

src/uu/shred/locales/en-US.ftl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,10 @@ shred-couldnt-rename = {$file}: Couldn't rename to {$new_name}: {$error}
6565
shred-failed-to-open-for-writing = {$file}: failed to open for writing
6666
shred-file-write-pass-failed = {$file}: File write pass failed
6767
shred-failed-to-remove-file = {$file}: failed to remove file
68+
69+
# File I/O error messages
70+
shred-failed-to-clone-file-handle = failed to clone file handle
71+
shred-failed-to-seek-file = failed to seek in file
72+
shred-failed-to-read-seed-bytes = failed to read seed bytes from file
73+
shred-failed-to-get-metadata = failed to get file metadata
74+
shred-failed-to-set-permissions = failed to set file permissions

src/uu/shred/locales/fr-FR.ftl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,10 @@ shred-couldnt-rename = {$file} : Impossible de renommer en {$new_name} : {$error
6464
shred-failed-to-open-for-writing = {$file} : impossible d'ouvrir pour l'écriture
6565
shred-file-write-pass-failed = {$file} : Échec du passage d'écriture de fichier
6666
shred-failed-to-remove-file = {$file} : impossible de supprimer le fichier
67+
68+
# Messages d'erreur E/S de fichier
69+
shred-failed-to-clone-file-handle = échec du clonage du descripteur de fichier
70+
shred-failed-to-seek-file = échec de la recherche dans le fichier
71+
shred-failed-to-read-seed-bytes = échec de la lecture des octets de graine du fichier
72+
shred-failed-to-get-metadata = échec de l'obtention des métadonnées du fichier
73+
shred-failed-to-set-permissions = échec de la définition des permissions du fichier

0 commit comments

Comments
 (0)