summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2023-10-26 22:09:50 +0200
committerErich Eckner <git@eckner.net>2023-10-26 22:12:06 +0200
commit075f37d9b66e0fe6b732f1c43c1bc1d5120f90bb (patch)
tree5e1b033e6d0f44e6d0534acae6b002bd21603be1 /core
parent559e1a1cecb82609f63005f22e74bb372e0e1f3a (diff)
downloadcrux-patches-075f37d9b66e0fe6b732f1c43c1bc1d5120f90bb.tar.xz
update patch
Diffstat (limited to 'core')
-rw-r--r--core/coreutils/coreutils-shred.patch.new34
1 files changed, 17 insertions, 17 deletions
diff --git a/core/coreutils/coreutils-shred.patch.new b/core/coreutils/coreutils-shred.patch.new
index 285b07d..44a6102 100644
--- a/core/coreutils/coreutils-shred.patch.new
+++ b/core/coreutils/coreutils-shred.patch.new
@@ -1,6 +1,6 @@
---- old/src/shred.c 2023-10-26 21:50:03.988504109 +0200
-+++ new/src/shred.c 2023-10-26 21:48:50.505173932 +0200
-@@ -131,6 +131,7 @@
+--- old/src/shred.c 2023-10-26 22:09:37.015120384 +0200
++++ new/src/shred.c 2023-10-26 22:09:18.888454497 +0200
+@@ -129,6 +129,7 @@
struct Options
{
bool force; /* -f flag: chmod files if necessary */
@@ -8,15 +8,15 @@
size_t n_iterations; /* -n flag: Number of iterations */
off_t size; /* -s flag: size of file */
enum remove_method remove_file; /* -u flag: remove file after shredding */
-@@ -150,6 +151,7 @@
+@@ -148,6 +149,7 @@
{
- {"exact", no_argument, NULL, 'x'},
- {"force", no_argument, NULL, 'f'},
-+ {"shred-hard-links", no_argument, NULL, 'h'},
- {"iterations", required_argument, NULL, 'n'},
- {"size", required_argument, NULL, 's'},
- {"random-source", required_argument, NULL, RANDOM_SOURCE_OPTION},
-@@ -182,6 +184,7 @@
+ {"exact", no_argument, nullptr, 'x'},
+ {"force", no_argument, nullptr, 'f'},
++ {"shred-hard-links", no_argument, nullptr, 'h'},
+ {"iterations", required_argument, nullptr, 'n'},
+ {"size", required_argument, nullptr, 's'},
+ {"random-source", required_argument, nullptr, RANDOM_SOURCE_OPTION},
+@@ -180,6 +182,7 @@
printf (_("\
-f, --force change permissions to allow writing if necessary\n\
@@ -24,7 +24,7 @@
-n, --iterations=N overwrite N times instead of the default (%d)\n\
--random-source=FILE get random bytes from FILE\n\
-s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n\
-@@ -854,6 +857,11 @@
+@@ -850,6 +853,11 @@
error (0, 0, _("%s: file has negative size"), qname);
return false;
}
@@ -36,7 +36,7 @@
/* Allocate pass array */
passarray = xnmalloc (flags->n_iterations, sizeof *passarray);
-@@ -1168,7 +1176,7 @@
+@@ -1163,7 +1171,7 @@
main (int argc, char **argv)
{
bool ok = true;
@@ -45,16 +45,16 @@
char **file;
int n_files;
int c;
-@@ -1186,7 +1194,7 @@
+@@ -1181,7 +1189,7 @@
flags.n_iterations = DEFAULT_PASSES;
flags.size = -1;
-- while ((c = getopt_long (argc, argv, "fn:s:uvxz", long_opts, NULL)) != -1)
-+ while ((c = getopt_long (argc, argv, "fhn:s:uvxz", long_opts, NULL)) != -1)
+- while ((c = getopt_long (argc, argv, "fn:s:uvxz", long_opts, nullptr)) != -1)
++ while ((c = getopt_long (argc, argv, "fhn:s:uvxz", long_opts, nullptr)) != -1)
{
switch (c)
{
-@@ -1194,6 +1202,10 @@
+@@ -1189,6 +1197,10 @@
flags.force = true;
break;