commit - 4e5deb9f17461c2e95db4dd577a66171654705d0
commit + 90af0b19bab6346d8472d5e126d8690192e36220
blob - aaec6c6f2344ccb7b65d19513a308db0c7b8c276
blob + 205cfc95c537fb5a7a99457d1abc1f8ffb106f3c
--- shreddisk.c
+++ shreddisk.c
double percent, total_bytes, time_remaining = 0;
uint8_t rnum[BYTES];
u_int64_t sectors, total;
- uint64_t start, seconds, now, elapsed = 0;
+ uint64_t start, seconds, now, elapsed = 0, passed_time;
struct disklabel lab;
size_t written;
time_t sh_time, now_time;
total += (written * BYTES);
now = seconds;
if (now - elapsed >= 1) {
- now_time = time(NULL);
- uint64_t passed_time = now_time - sh_time;
char *suffix;
+
+ now_time = time(NULL);
+ passed_time = now_time - sh_time;
if (passed_time > 0)
time_remaining = (total_bytes - total) /
(total / passed_time);
percent, time_remaining * (passes - i_pass),
suffix);
fflush(stdout);
+
free(suffix);
+
elapsed = now;
}
} while ((written * BYTES) == sizeof(rnum));
}
sh_time = time(NULL);
- printf("\n\nFinished shredding %s\n", ctime(&sh_time));
+ if (percent < 100)
+ printf("\n\nDisk appears to have been removed.\n"
+ "Finished shredding %s\n", ctime(&sh_time));
+ else
+ printf("\n\nFinished shredding %s\n", ctime(&sh_time));
fclose(dd);