lib/commonio.c: Use block I/O for backup copies#1565
Closed
cuiweixie wants to merge 1 commit intoshadow-maint:masterfrom
Closed
lib/commonio.c: Use block I/O for backup copies#1565cuiweixie wants to merge 1 commit intoshadow-maint:masterfrom
cuiweixie wants to merge 1 commit intoshadow-maint:masterfrom
Conversation
Replace byte-by-byte backup copying in create_backup() with fread/fwrite buffering. This removes the long-standing TODO and keeps explicit cleanup paths for seek/read/write failures before flushing and syncing.
Comment on lines
-262
to
+283
| /* TODO: faster copy, not one-char-at-a-time. --marekm */ | ||
| c = 0; | ||
| if (fseek (fp, 0, SEEK_SET) == 0) { | ||
| while ((c = getc (fp)) != EOF) { | ||
| if (putc (c, bkfp) == EOF) { | ||
| break; | ||
| if (fseek (fp, 0, SEEK_SET) != 0) { | ||
| (void) fclose (bkfp); | ||
| unlink(tmpf); | ||
| return -1; | ||
| } | ||
| { | ||
| char buf[BUFSIZ]; | ||
| size_t n; | ||
|
|
||
| while ((n = fread (buf, 1, sizeof buf, fp)) > 0) { | ||
| if (fwrite (buf, 1, n, bkfp) != n) { | ||
| (void) fclose (bkfp); | ||
| unlink(tmpf); | ||
| return -1; | ||
| } | ||
| } | ||
| if (ferror (fp) != 0) { | ||
| (void) fclose (bkfp); | ||
| unlink(tmpf); | ||
| return -1; | ||
| } | ||
| } | ||
| if ((c != EOF) || (ferror (fp) != 0) || (fflush (bkfp) != 0)) { | ||
| if (fflush (bkfp) != 0) { |
Collaborator
There was a problem hiding this comment.
Did you notice any performance issues or issues of other kind? Otherwise, I see this as a readability pessimization, which has a high chance of having bugs in there.
Collaborator
There was a problem hiding this comment.
You may be interested in this instead:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace byte-by-byte backup copying in create_backup() with fread/fwrite buffering. This removes the long-standing TODO and keeps explicit cleanup paths for seek/read/write failures before flushing and syncing.