1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
Index: secure-delete/Makefile
===================================================================
--- secure-delete.orig/Makefile
+++ secure-delete/Makefile
@@ -22,13 +22,13 @@ sdel-lib.o: sdel-lib.c
$(CC) ${OPT} -c sdel-lib.c
srm: srm.c
- $(CC) ${OPT} -o srm srm.c sdel-lib.o
+ $(CC) ${OPT} -o srm srm.c sdel-lib.o -lm
sfill: sfill.c
- $(CC) ${OPT} -o sfill sfill.c sdel-lib.o
+ $(CC) ${OPT} -o sfill sfill.c sdel-lib.o -lm
sswap: sswap.c
- $(CC) ${OPT} -o sswap sswap.c sdel-lib.o
+ $(CC) ${OPT} -o sswap sswap.c sdel-lib.o -lm
smem: smem.c
- $(CC) ${OPT} -o smem smem.c sdel-lib.o
+ $(CC) ${OPT} -o smem smem.c sdel-lib.o -lm
clean:
rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
Index: secure-delete/sdel-lib.c
===================================================================
--- secure-delete.orig/sdel-lib.c
+++ secure-delete/sdel-lib.c
@@ -130,6 +130,35 @@ void sdel_finnish() {
__internal_sdel_init = 0;
}
+void sdel_verbose(int turnv, int termwidthv, double counterv, double writesv){
+
+ double progress=(counterv/writesv)*1.0;
+ if (progress>0.0 && progress<=1.0) {
+ int progpos=termwidthv*progress;
+ if (turnv<10)
+ printf("pass:%i [",turnv);
+ else
+ printf("pass:%i[",turnv);
+
+ for (int progi=0; progi<termwidthv; progi++) {
+ if (progi<progpos)
+ printf("=");
+ else if (progi==progpos)
+ printf(">");
+ else
+ printf(" ");
+ }
+
+ int progout=(int)floor(progress*100.0);
+ if (progout<10)
+ printf("]%i%% \r", progout);
+ else if (progout<100)
+ printf("]%i%% \r", progout);
+ else
+ printf("]%i%%\r", progout);
+ fflush(stdout);
+ }
+}
/*
* secure_overwrite function parameters:
* mode = 0 : once overwrite with random data
@@ -146,6 +175,7 @@ int sdel_overwrite(int mode, int fd, lon
unsigned long writes;
unsigned long counter;
int turn;
+ int termwidth = 50;
int last = 0;
char buf[65535];
FILE *f;
@@ -163,6 +193,8 @@ int sdel_overwrite(int mode, int fd, lon
writes = 0;
/* do the first overwrite */
+ if (verbose)
+ printf("\n");
if (start == 0)
rewind(f);
else
@@ -173,13 +205,14 @@ int sdel_overwrite(int mode, int fd, lon
__sdel_fill_buf(std_array_00, bufsize, buf);
else
__sdel_fill_buf(std_array_ff, bufsize, buf);
- if (writes > 0)
- for (counter=1; counter<=writes; counter++)
+ if (writes > 0)
+ for (counter=1; counter<=writes; counter++){
fwrite(&buf, 1, bufsize, f); // dont care for errors
+ if (verbose)
+ sdel_verbose(0,termwidth,(double)counter,(double)writes);
+ }
else
do {} while(fwrite(&buf, 1, bufsize, f) == bufsize);
- if (verbose)
- printf("*");
fflush(f);
if (fsync(fd) < 0)
FLUSH;
@@ -199,8 +232,11 @@ int sdel_overwrite(int mode, int fd, lon
if ((turn >= 5) && (turn <= 31)) {
__sdel_fill_buf(write_modes[turn-5], bufsize, buf);
if (writes > 0)
- for (counter = 1; counter <= writes; counter++)
+ for (counter = 1; counter <= writes; counter++){
fwrite(&buf, 1, bufsize, f); // dont care for errors
+ if (verbose)
+ sdel_verbose((turn+1),termwidth,(double)counter,(double)writes);
+ }
else
do {} while(fwrite(&buf, 1, bufsize, f) == bufsize);
} else {
@@ -213,6 +249,8 @@ int sdel_overwrite(int mode, int fd, lon
if (! last)
__sdel_random_buf(bufsize, buf);
fwrite(&buf, 1, bufsize, f); // dont care for errors
+ if (verbose)
+ sdel_verbose((turn+1),termwidth,(double)counter,(double)writes);
}
} else {
do {
@@ -224,14 +262,14 @@ int sdel_overwrite(int mode, int fd, lon
fflush(f);
if (fsync(fd) < 0)
FLUSH;
- if (verbose)
- printf("*");
}
(void) fclose(f);
/* Hard Flush -> Force cached data to be written to disk */
FLUSH;
+ if (verbose)
+ printf("\n");
return 0;
}
Index: secure-delete/sdel-lib.h
===================================================================
--- secure-delete.orig/sdel-lib.h
+++ secure-delete/sdel-lib.h
@@ -13,6 +13,7 @@
#include <time.h>
#include <sys/time.h>
#include <sys/resource.h>
+#include <math.h>
#include "config.h"
|
