mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-31 16:44:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

* man2hlp.c: Implement persistent fread and fwrite to make sure

Browse Source 
that all output is read and written.
This commit is contained in:
Pavel Roskin 2002-08-16 16:48:27 +00:00
parent 7b867c0d5c
commit 0707cb5278
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2002-08-16 Pavel Roskin <proski@gnu.org>
* man2hlp.c: Implement persistent fread and fwrite to make sure
that all output is read and written.
2002-08-16 Andrew V. Samoilov <sav@bcs.zp.ua>
* help.c (show): Cast *paint_start to unsigned char to display

67
src/man2hlp.c
View File

@ -48,6 +48,64 @@ static struct node {
struct node *next;
} nodes, *cnode;
#define MAX_STREAM_BLOCK 8192
/*
* Read in blocks of reasonable size and make sure we read everything.
* Failure to read everything is an error.
*/
static size_t
persistent_fread (void *data, size_t len, FILE * stream)
{
size_t count;
size_t bytes_done = 0;
char *ptr = (char *) data;
while (bytes_done < len) {
count = len - bytes_done;
if (count > MAX_STREAM_BLOCK)
count = MAX_STREAM_BLOCK;
count = fread (ptr, 1, count, stream);
if (count <= 0)
return -1;
bytes_done += count;
ptr += count;
}
return bytes_done;
}
/*
* Write in blocks of reasonable size and make sure we write everything.
* Failure to write everything is an error.
*/
static size_t
persistent_fwrite (const void *data, size_t len, FILE * stream)
{
size_t count;
size_t bytes_done = 0;
const char *ptr = (const char *) data;
while (bytes_done < len) {
count = len - bytes_done;
if (count > MAX_STREAM_BLOCK)
count = MAX_STREAM_BLOCK;
count = fwrite (ptr, 1, count, stream);
if (count <= 0)
return -1;
bytes_done += count;
ptr += count;
}
return bytes_done;
}
/* Report error in input */
static void
print_error (char *message)
@ -531,7 +589,7 @@ main (int argc, char **argv)
return 1;
}
if (fread (Topics, 1, file_end, fout) != file_end) {
if (persistent_fread (Topics, file_end, fout) < 0) {
perror (output);
return 1;
}
@ -547,13 +605,14 @@ main (int argc, char **argv)
return 1;
}
if (fwrite (Topics + cont_start, 1, file_end - cont_start, fout) !=
file_end - cont_start) {
if (persistent_fwrite
(Topics + cont_start, file_end - cont_start, fout)
< 0) {
perror (output);
return 1;
}
if (fwrite (Topics, 1, cont_start, fout) != cont_start) {
if (persistent_fwrite (Topics, cont_start, fout) < 0) {
perror (output);
return 1;
}